Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup and CamelConfig improvements #397

Merged
merged 4 commits into from
Nov 12, 2019
Merged

Cleanup and CamelConfig improvements #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee18342
config: remove unused configuration option dump-routes
lburgazzoli Nov 12, 2019
77e8256
Replace deprecated SubstrateTest with NativeImageTest
lburgazzoli Nov 12, 2019
53a6c75
config: simplify CamelConfig as runtime configuration happens trough …
lburgazzoli Nov 12, 2019
e09d801
config: switch to quarkus.camel..enabled pattern instead of quarkus.c…
lburgazzoli Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions examples/rest-json/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
quarkus.log.file.enable = false
quarkus.ssl.native=true

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true

#
# Camel
#
Expand Down
2 changes: 1 addition & 1 deletion ...ployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ protected void addReflectiveMethod(MethodInfo mi) {

/*
* NativeImage configuration steps related to camel main that are activated by default but can be
* disabled by setting quarkus.camel.enable-main = false
* disabled by setting quarkus.camel.main.enabled = false
*/
public static class Main {
@BuildStep(onlyIf = Flags.MainEnabled.class)
Expand Down
24 changes: 11 additions & 13 deletions extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,21 @@
*/
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.BUILD_AND_RUN_TIME_FIXED)
public class CamelConfig {
@ConfigRoot(name = "camel", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
public static class BuildTime {
/**
* Build time configuration options for {@code camel-main}.
*/
@ConfigItem
public MainConfig main;

@ConfigGroup
public static class MainConfig {
/**
* Enable {@code camel-main}. If {@code true}, routes are automatically
* loaded and started and the entire lifecycle of the Camel Context is
Expand All @@ -31,16 +39,6 @@ public static class BuildTime {
* tasks.
*/
@ConfigItem(defaultValue = "true")
public boolean enableMain;
}

@ConfigRoot(name = "camel", phase = ConfigPhase.RUN_TIME)
public static class Runtime {

/**
* Dump loaded routes when starting
*/
@ConfigItem(defaultValue = "false")
public boolean dumpRoutes;
public boolean enabled;
}
}
3 changes: 2 additions & 1 deletion extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ private Flags() {
public static final class MainEnabled implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
return ConfigProvider.getConfig().getOptionalValue("quarkus.camel.enable-main", Boolean.class).orElse(Boolean.TRUE);
return ConfigProvider.getConfig().getOptionalValue("quarkus.camel.main.enabled", Boolean.class)
.orElse(Boolean.TRUE);
}
}

Expand Down
4 changes: 0 additions & 4 deletions integration-tests/aws/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
quarkus.ssl.native=true
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true
#
# Camel
#
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/bean/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
quarkus.ssl.native=true
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true
#
# Camel
#
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/core-impl/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ quarkus.log.file.enable = false
#
# Quarkus :: Camel
#
quarkus.camel.enable-main=false
quarkus.camel.dump-routes=true
quarkus.camel.main.enabled=false

#
# Camel
#
Expand Down
14 changes: 0 additions & 14 deletions ...ration-tests/core-main/test/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,6 @@ public JsonObject exchangeFormatterConfig() {
return result;
}

@Path("/registry/produces-config-build")
@GET
@Produces(MediaType.TEXT_PLAIN)
public boolean producesBuildTimeConfig() {
return lookupSingleInstanceFromRegistry(CamelConfig.BuildTime.class) != null;
}

@Path("/registry/produces-config-runtime")
@GET
@Produces(MediaType.TEXT_PLAIN)
public boolean producesRuntimeConfig() {
return lookupSingleInstanceFromRegistry(CamelConfig.Runtime.class) != null;
}

private <T> T lookupSingleInstanceFromRegistry(Class<T> type) {
final Set<T> answer = context.getRegistry().findByType(type);

Expand Down
4 changes: 0 additions & 4 deletions integration-tests/core-main/test/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
#
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true
#
# Camel
#
Expand Down
3 changes: 1 addition & 2 deletions integration-tests/core/test/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ quarkus.log.file.enable = false
#
# Quarkus :: Camel
#
quarkus.camel.enable-main=false
quarkus.camel.dump-routes=true
quarkus.camel.main.enabled=false

#
# Camel
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/infinispan/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ quarkus.log.file.enable = false
quarkus.infinispan-client.server-list = localhost:11232
quarkus.infinispan-client.near-cache-max-entries = 3

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true

#
# Camel
#
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/jackson/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
quarkus.ssl.native=true
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true
#
# Camel
#
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/jdbc/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
#
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true

#
# Quarkus :: DS
#
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/mail/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
quarkus.ssl.native=true
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true

#
# Camel
#
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/netty-http/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
#
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true

#
# Camel
#
Expand Down
1 change: 0 additions & 1 deletion integration-tests/salesforce/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
# Quarkus
#
quarkus.ssl.native=true
quarkus.camel.dump-routes=true
#
# Camel
#
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/servlet/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
quarkus.log.file.enable = false
quarkus.ssl.native=true

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true
#
# Quarkus :: Camel :: Servlet
#
Expand Down
4 changes: 2 additions & 2 deletions .../snakeyaml/src/test/java/org/apache/camel/quarkus/component/snakeyaml/it/SnakeYAMLIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/
package org.apache.camel.quarkus.component.snakeyaml.it;

import io.quarkus.test.junit.SubstrateTest;
import io.quarkus.test.junit.NativeImageTest;

@SubstrateTest
@NativeImageTest
class SnakeYAMLIT extends SnakeYAMLTest {

}
4 changes: 0 additions & 4 deletions integration-tests/twitter/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
quarkus.ssl.native=true
quarkus.log.file.enable = false

#
# Quarkus :: Camel
#
quarkus.camel.dump-routes=true
#
# Camel
#
Expand Down