This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d00d1de54632be1f5915b39bc8e17496f2c85cf1 Author: Peter Palaga <[email protected]> AuthorDate: Wed Feb 12 17:35:10 2020 +0100 Upgarde to Camel 3.1.0 - WIP (ConfigurerResolver, reifiers) --- .../camel/quarkus/core/DisabledPredicateValidatorReifier.java | 6 +++--- .../org/apache/camel/quarkus/core/DisabledValidateReifier.java | 6 +++--- .../main/java/org/apache/camel/quarkus/core/FastCamelContext.java | 7 +++++++ .../src/main/java/org/apache/camel/quarkus/core/FastModel.java | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java index 29a9eae..ef4c206 100644 --- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java +++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java @@ -24,12 +24,12 @@ import org.apache.camel.spi.Validator; public class DisabledPredicateValidatorReifier extends ValidatorReifier<PredicateValidatorDefinition> { - public DisabledPredicateValidatorReifier(ValidatorDefinition definition) { - super((PredicateValidatorDefinition) definition); + public DisabledPredicateValidatorReifier(CamelContext camelContext, ValidatorDefinition definition) { + super(camelContext, (PredicateValidatorDefinition) definition); } @Override - protected Validator doCreateValidator(CamelContext context) { + protected Validator doCreateValidator() { throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml"); } diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java index 6eb8f75..4d796f8 100644 --- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java +++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java @@ -24,12 +24,12 @@ import org.apache.camel.spi.RouteContext; public class DisabledValidateReifier extends ProcessorReifier<ValidateDefinition> { - public DisabledValidateReifier(ProcessorDefinition<?> definition) { - super((ValidateDefinition) definition); + public DisabledValidateReifier(RouteContext routeContext, ProcessorDefinition<?> definition) { + super(routeContext, (ValidateDefinition) definition); } @Override - public Processor createProcessor(RouteContext routeContext) throws Exception { + public Processor createProcessor() throws Exception { throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-core-xml"); } } diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java index 576499e..35ebb10 100644 --- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java +++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java @@ -42,6 +42,7 @@ import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor; import org.apache.camel.impl.engine.DefaultCamelContextNameStrategy; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.impl.engine.DefaultComponentResolver; +import org.apache.camel.impl.engine.DefaultConfigurerResolver; import org.apache.camel.impl.engine.DefaultDataFormatResolver; import org.apache.camel.impl.engine.DefaultEndpointRegistry; import org.apache.camel.impl.engine.DefaultInflightRepository; @@ -76,6 +77,7 @@ import org.apache.camel.spi.CamelContextNameStrategy; import org.apache.camel.spi.ClassResolver; import org.apache.camel.spi.ComponentResolver; import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.ConfigurerResolver; import org.apache.camel.spi.DataFormatResolver; import org.apache.camel.spi.EndpointRegistry; import org.apache.camel.spi.ExecutorServiceManager; @@ -386,6 +388,11 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam } @Override + protected ConfigurerResolver createConfigurerResolver() { + return new DefaultConfigurerResolver(); + } + + @Override public void setTypeConverterRegistry(TypeConverterRegistry typeConverterRegistry) { super.setTypeConverterRegistry(typeConverterRegistry); diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java index c619f11..9be64bd 100644 --- a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java +++ b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java @@ -54,7 +54,7 @@ public class FastModel extends BaseModel { try { String id = routeDefinition.idOrCreate(camelContext.adapt(ExtendedCamelContext.class).getNodeIdFactory()); FastRouteContext routeContext = new FastRouteContext(camelContext, routeDefinition, id); - Route route = new RouteReifier(routeDefinition).createRoute(camelContext, routeContext); + Route route = new RouteReifier(routeContext, routeDefinition).createRoute(); FastRouteService routeService = createRouteService(route); mcc.startRouteService(routeService, true); } finally {
