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

Issue 69 #187

Merged
merged 2 commits into from
Sep 6, 2019
Merged

Issue 69 #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a4f0d5
Remove support for defer-init-phase, fixes #172
gnodet Sep 3, 2019
30b97e3
Cleanup following #172, fixes #69
gnodet Sep 3, 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
6 changes: 0 additions & 6 deletions extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ public static class BuildTime {
@ConfigItem
public List<String> routesUris;

/**
* Defer Camel context initialization phase until runtime.
*/
@ConfigItem(defaultValue = "false")
public boolean deferInitPhase;

/**
* Camel jaxb support is enabled by default, but in order to trim
* down the size of applications, it is possible to disable jaxb support
Expand Down
34 changes: 0 additions & 34 deletions ...he/camel/quarkus/core/runtime/graal/Target_org_apache_camel_reifier_ProcessorReifier.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ...rkus/core/runtime/graal/Target_org_apache_camel_reifier_dataformat_DataFormatReifier.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions .../core/runtime/graal/Target_org_apache_camel_reifier_loadbalancer_LoadBalancerReifier.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ...us/core/runtime/graal/Target_org_apache_camel_reifier_transformer_TransformerReifier.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions ...uarkus/core/runtime/graal/Target_org_apache_camel_reifier_validator_ValidatorReifier.java
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions ...runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/FastCamelRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ public void doInit() {
context.adapt(FastCamelContext.class).setModel(model);

fireEvent(InitializedEvent.class, new InitializedEvent());

if (!buildTimeConfig.deferInitPhase) {
loadRoutes(context);
}
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
Expand All @@ -116,9 +112,7 @@ public void doInit() {
public void doStart() throws Exception {
fireEvent(StartingEvent.class, new StartingEvent());

if (buildTimeConfig.deferInitPhase) {
loadRoutes(context);
}
loadRoutes(context);

context.start();
fireEvent(StartedEvent.class, new StartedEvent());
Expand Down Expand Up @@ -161,8 +155,6 @@ protected void loadRoutes(CamelContext context) throws Exception {
}

model.startRouteDefinitions();
// context.adapt(FastCamelContext.class).clearModel(); Disabled, see https://github.com/apache/camel-quarkus/issues/69
// builders.clear();
}

@SuppressWarnings("unchecked")
Expand Down
6 changes: 0 additions & 6 deletions ...sions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/Flags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,4 @@ public boolean getAsBoolean() {
}
}

public static final class InitAtBuildTime implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
return !ConfigProvider.getConfig().getOptionalValue("quarkus.camel.defer-init-phase", Boolean.class).orElse(Boolean.TRUE);
}
}
}
2 changes: 0 additions & 2 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 @@ -26,8 +26,6 @@ quarkus.log.file.enable = false
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=true

#
# Camel
#
Expand Down
2 changes: 0 additions & 2 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 @@ -26,8 +26,6 @@ quarkus.log.file.enable = false
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=true

#
# Camel
#
Expand Down
2 changes: 0 additions & 2 deletions integration-tests/core-cdi/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ quarkus.log.file.enable = false
quarkus.camel.disable-xml=false
quarkus.camel.disable-jaxb=false
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=true

#
# Camel
#
Expand Down
2 changes: 0 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 @@ -25,8 +25,6 @@ quarkus.log.file.enable = false
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=true

#
# Camel
#
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -25,7 +25,6 @@ quarkus.log.file.enable = false
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=true

#
# Camel
Expand Down
3 changes: 0 additions & 3 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 @@ -25,9 +25,6 @@ quarkus.log.file.enable = false
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=false


#
# Camel
#
Expand Down
2 changes: 0 additions & 2 deletions 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 @@ -22,8 +22,6 @@ quarkus.ssl.native=true
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=true

#
# Camel
#
Expand Down
2 changes: 0 additions & 2 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 @@ -26,8 +26,6 @@ quarkus.ssl.native=true
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=false

#
# Quarkus :: Camel :: Servlet
#
Expand Down
2 changes: 0 additions & 2 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 @@ -26,8 +26,6 @@ quarkus.log.file.enable = false
quarkus.camel.disable-xml=true
quarkus.camel.disable-jaxb=true
quarkus.camel.dump-routes=true
quarkus.camel.defer-init-phase=true

#
# Camel
#
Expand Down