-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Restore capability to disable automatic startup of the Camel Quarkus …
…runtime Fixes #6067
- Loading branch information
1 parent
ee4a102
commit cd28856
Showing
10 changed files
with
172 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...ons-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.quarkus.core; | ||
|
|
||
| import io.quarkus.runtime.annotations.ConfigGroup; | ||
| import io.quarkus.runtime.annotations.ConfigItem; | ||
| import io.quarkus.runtime.annotations.ConfigPhase; | ||
| import io.quarkus.runtime.annotations.ConfigRoot; | ||
|
|
||
| @ConfigRoot(name = "camel", phase = ConfigPhase.RUN_TIME) | ||
| public class CamelRuntimeConfig { | ||
| /** | ||
| * Runtime configuration options for {@link CamelRuntime} bootstrap. | ||
| * | ||
| * @asciidoclet | ||
| */ | ||
| @ConfigItem | ||
| public BootstrapConfig bootstrap; | ||
|
|
||
| @ConfigGroup | ||
| public static class BootstrapConfig { | ||
| /** | ||
| * When set to true, the {@link CamelRuntime} will be started automatically. | ||
| * | ||
| * @asciidoclet | ||
| */ | ||
| @ConfigItem(defaultValue = "true") | ||
| public boolean enabled; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
integration-tests/main/src/test/java/org/apache/camel/quarkus/main/BootstrapDisabledIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.quarkus.main; | ||
|
|
||
| import io.quarkus.test.junit.QuarkusIntegrationTest; | ||
|
|
||
| @QuarkusIntegrationTest | ||
| class BootstrapDisabledIT extends BootstrapDisabledTest { | ||
| } |
62 changes: 62 additions & 0 deletions
62
...gration-tests/main/src/test/java/org/apache/camel/quarkus/main/BootstrapDisabledTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.camel.quarkus.main; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.Map; | ||
|
|
||
| import io.quarkus.test.junit.QuarkusTest; | ||
| import io.quarkus.test.junit.QuarkusTestProfile; | ||
| import io.quarkus.test.junit.TestProfile; | ||
| import io.restassured.RestAssured; | ||
| import org.apache.camel.ServiceStatus; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.awaitility.Awaitility.await; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| @QuarkusTest | ||
| @TestProfile(BootstrapDisabledTest.BootstrapDisabledTestProfile.class) | ||
| class BootstrapDisabledTest { | ||
| @Test | ||
| void initializeManualRuntimeBootstrap() { | ||
| // Initial runtime state should be stopped | ||
| RestAssured.get("/test/runtime/status") | ||
| .then() | ||
| .statusCode(200) | ||
| .body(is(ServiceStatus.Stopped.name())); | ||
|
|
||
| // Ensure the runtime can be started manually | ||
| RestAssured.post("/test/runtime/start") | ||
| .then() | ||
| .statusCode(204); | ||
|
|
||
| await().atMost(Duration.ofSeconds(10)).pollDelay(Duration.ofMillis(100)).untilAsserted(() -> { | ||
| RestAssured.get("/test/runtime/status") | ||
| .then() | ||
| .statusCode(200) | ||
| .body(is(ServiceStatus.Started.name())); | ||
| }); | ||
| } | ||
|
|
||
| public static final class BootstrapDisabledTestProfile implements QuarkusTestProfile { | ||
| @Override | ||
| public Map<String, String> getConfigOverrides() { | ||
| return Map.of("quarkus.camel.bootstrap.enabled", "false"); | ||
| } | ||
| } | ||
| } |