This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 56bac57e8bccb59a8197bfff4d51b54e3065d1dc Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Feb 19 14:55:00 2020 +0100 Remove remaining RouteContext / CamelContext parameters in reifiers methods --- .../camel/component/hystrix/processor/HystrixReifier.java | 2 +- .../camel/spring/spi/TransactionErrorHandlerReifier.java | 2 +- .../main/java/org/apache/camel/reifier/AbstractReifier.java | 4 ++++ .../main/java/org/apache/camel/reifier/AggregateReifier.java | 4 ++-- .../src/main/java/org/apache/camel/reifier/CatchReifier.java | 7 +++---- .../org/apache/camel/reifier/IdempotentConsumerReifier.java | 5 ++--- .../apache/camel/reifier/InterceptSendToEndpointReifier.java | 6 ++---- .../java/org/apache/camel/reifier/OnCompletionReifier.java | 2 +- .../main/java/org/apache/camel/reifier/OnExceptionReifier.java | 6 +++--- .../main/java/org/apache/camel/reifier/ProcessorReifier.java | 6 +++--- .../main/java/org/apache/camel/reifier/ResequenceReifier.java | 10 ++++------ .../src/main/java/org/apache/camel/reifier/SagaReifier.java | 9 ++++----- .../org/apache/camel/reifier/SetExchangePatternReifier.java | 2 +- .../src/main/java/org/apache/camel/reifier/StepReifier.java | 2 +- .../src/main/java/org/apache/camel/reifier/ThreadsReifier.java | 4 ++-- .../main/java/org/apache/camel/reifier/ToDynamicReifier.java | 4 ++-- .../src/main/java/org/apache/camel/reifier/WireTapReifier.java | 4 ++-- .../org/apache/camel/reifier/dataformat/DataFormatReifier.java | 8 ++++---- .../camel/reifier/errorhandler/DeadLetterChannelReifier.java | 2 +- .../camel/reifier/errorhandler/DefaultErrorHandlerReifier.java | 2 +- .../apache/camel/reifier/errorhandler/ErrorHandlerReifier.java | 4 ++-- 21 files changed, 46 insertions(+), 49 deletions(-) diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java index 10d535a..1ea7251 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java @@ -54,7 +54,7 @@ public class HystrixReifier extends ProcessorReifier<CircuitBreakerDefinition> { } final HystrixConfigurationDefinition config = buildHystrixConfiguration(); - final String id = getId(definition, routeContext); + final String id = getId(definition); // group and thread pool keys to use they can be configured on configRef and config, so look there first, and if none then use default String groupKey = config.getGroupKey(); diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java index 29dc00b..1aa68ca 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java @@ -99,7 +99,7 @@ public class TransactionErrorHandlerReifier extends DefaultErrorHandlerReifier<T getExecutorService(camelContext), definition.getRollbackLoggingLevel(), definition.getOnExceptionOccurred()); // configure error handler before we can use it - configure(routeContext, answer); + configure(answer); return answer; } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java index 8e4d9b8..0d82b28 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AbstractReifier.java @@ -131,6 +131,10 @@ public abstract class AbstractReifier implements BeanRepository { return CamelContextHelper.mandatoryLookup(camelContext, name, beanType); } + public <T> T findSingleByType(Class<T> type) { + return CamelContextHelper.findByType(camelContext, type); + } + @Override public Object lookupByName(String name) { return getRegistry().lookupByName(name); diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java index 5f60275..16ea9d3 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/AggregateReifier.java @@ -70,7 +70,7 @@ public class AggregateReifier extends ProcessorReifier<AggregateDefinition> { AggregateProcessor answer = new AggregateProcessor(camelContext, internal, correlation, strategy, threadPool, shutdownThreadPool); - AggregationRepository repository = createAggregationRepository(routeContext); + AggregationRepository repository = createAggregationRepository(); if (repository != null) { answer.setAggregationRepository(repository); } @@ -243,7 +243,7 @@ public class AggregateReifier extends ProcessorReifier<AggregateDefinition> { return strategy; } - private AggregationRepository createAggregationRepository(RouteContext routeContext) { + private AggregationRepository createAggregationRepository() { AggregationRepository repository = definition.getAggregationRepository(); if (repository == null && definition.getAggregationRepositoryRef() != null) { repository = mandatoryLookup(definition.getAggregationRepositoryRef(), AggregationRepository.class); diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java index 82fbeb9..3a28fa3 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/CatchReifier.java @@ -19,7 +19,6 @@ package org.apache.camel.reifier; import java.util.ArrayList; import java.util.List; -import org.apache.camel.CamelContext; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.model.CatchDefinition; @@ -38,7 +37,7 @@ public class CatchReifier extends ProcessorReifier<CatchDefinition> { public CatchProcessor createProcessor() throws Exception { // create and load exceptions if not done if (definition.getExceptionClasses() == null) { - definition.setExceptionClasses(createExceptionClasses(camelContext)); + definition.setExceptionClasses(createExceptionClasses()); } // must have at least one exception @@ -62,7 +61,7 @@ public class CatchReifier extends ProcessorReifier<CatchDefinition> { return new CatchProcessor(definition.getExceptionClasses(), childProcessor, when, null); } - protected List<Class<? extends Throwable>> createExceptionClasses(CamelContext context) throws ClassNotFoundException { + protected List<Class<? extends Throwable>> createExceptionClasses() throws ClassNotFoundException { // must use the class resolver from CamelContext to load classes to // ensure it can // be loaded in all kind of environments such as JEE servers and OSGi @@ -70,7 +69,7 @@ public class CatchReifier extends ProcessorReifier<CatchDefinition> { List<String> list = definition.getExceptions(); List<Class<? extends Throwable>> answer = new ArrayList<>(list.size()); for (String name : list) { - Class<Throwable> type = context.getClassResolver().resolveMandatoryClass(name, Throwable.class); + Class<Throwable> type = camelContext.getClassResolver().resolveMandatoryClass(name, Throwable.class); answer.add(type); } return answer; diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java index ea01951..95e7620 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java @@ -35,7 +35,7 @@ public class IdempotentConsumerReifier extends ExpressionReifier<IdempotentConsu public Processor createProcessor() throws Exception { Processor childProcessor = this.createChildProcessor(true); - IdempotentRepository idempotentRepository = resolveMessageIdRepository(routeContext); + IdempotentRepository idempotentRepository = resolveMessageIdRepository(); ObjectHelper.notNull(idempotentRepository, "idempotentRepository", definition); Expression expression = createExpression(definition.getExpression()); @@ -55,10 +55,9 @@ public class IdempotentConsumerReifier extends ExpressionReifier<IdempotentConsu * Strategy method to resolve the * {@link org.apache.camel.spi.IdempotentRepository} to use * - * @param routeContext route context * @return the repository */ - protected <T> IdempotentRepository resolveMessageIdRepository(RouteContext routeContext) { + protected <T> IdempotentRepository resolveMessageIdRepository() { if (definition.getMessageIdRepositoryRef() != null) { definition.setMessageIdRepository(mandatoryLookup(parseString(definition.getMessageIdRepositoryRef()), IdempotentRepository.class)); } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java index 694f2ff..8f67c94 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java @@ -18,7 +18,6 @@ package org.apache.camel.reifier; import java.util.List; -import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.Processor; @@ -66,7 +65,7 @@ public class InterceptSendToEndpointReifier extends ProcessorReifier<InterceptSe if (endpoint instanceof DefaultInterceptSendToEndpoint) { // endpoint already decorated return endpoint; - } else if (matchURI == null || matchPattern(camelContext, uri, matchURI)) { + } else if (matchURI == null || matchPattern(uri, matchURI)) { // only proxy if the uri is matched decorate endpoint with // our proxy // should be false by default @@ -97,13 +96,12 @@ public class InterceptSendToEndpointReifier extends ProcessorReifier<InterceptSe /** * Does the uri match the pattern. * - * @param camelContext the CamelContext * @param uri the uri * @param pattern the pattern, which can be an endpoint uri as well * @return <tt>true</tt> if matched and we should intercept, <tt>false</tt> * if not matched, and not intercept. */ - protected boolean matchPattern(CamelContext camelContext, String uri, String pattern) { + protected boolean matchPattern(String uri, String pattern) { // match using the pattern as-is boolean match = EndpointHelper.matchEndpoint(camelContext, uri, pattern); if (!match) { diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java index c0ed578..e97f67e 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java @@ -68,7 +68,7 @@ public class OnCompletionReifier extends ProcessorReifier<OnCompletionDefinition CamelInternalProcessor internal = new CamelInternalProcessor(camelContext, childProcessor); internal.addAdvice(new CamelInternalProcessor.UnitOfWorkProcessorAdvice(routeContext, camelContext)); - routeContext.setOnCompletion(getId(definition, routeContext), internal); + routeContext.setOnCompletion(getId(definition), internal); Predicate when = null; if (definition.getOnWhen() != null) { diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java index 0797a09..99428ca 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java @@ -19,9 +19,9 @@ package org.apache.camel.reifier; import java.util.ArrayList; import java.util.List; +import org.apache.camel.ErrorHandlerFactory; import org.apache.camel.Predicate; import org.apache.camel.Processor; -import org.apache.camel.builder.ErrorHandlerBuilder; import org.apache.camel.model.OnExceptionDefinition; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.processor.CatchProcessor; @@ -63,11 +63,11 @@ public class OnExceptionReifier extends ProcessorReifier<OnExceptionDefinition> // wrap in our special safe fallback error handler if OnException // have child output Processor errorHandler = new FatalFallbackErrorHandler(child); - String id = getId(definition, routeContext); + String id = getId(definition); routeContext.setOnException(id, errorHandler); } // lookup the error handler builder - ErrorHandlerBuilder builder = (ErrorHandlerBuilder)routeContext.getErrorHandlerFactory(); + ErrorHandlerFactory builder = routeContext.getErrorHandlerFactory(); // and add this as error handlers routeContext.addErrorHandler(builder, definition); } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java index 68e6caf..c693938 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ProcessorReifier.java @@ -723,7 +723,7 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends // inject id if (processor instanceof IdAware) { - String id = getId(output, routeContext); + String id = getId(output); ((IdAware)processor).setId(id); } if (processor instanceof RouteIdAware) { @@ -788,7 +788,7 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends // inject id if (processor instanceof IdAware) { - String id = getId(definition, routeContext); + String id = getId(definition); ((IdAware)processor).setId(id); } if (processor instanceof RouteIdAware) { @@ -819,7 +819,7 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends // noop } - protected String getId(OptionalIdentifiedDefinition<?> def, RouteContext routeContext) { + protected String getId(OptionalIdentifiedDefinition<?> def) { return def.idOrCreate(camelContext.adapt(ExtendedCamelContext.class).getNodeIdFactory()); } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java index 2d8e4e5..74d92d9 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ResequenceReifier.java @@ -50,13 +50,13 @@ public class ResequenceReifier extends ProcessorReifier<ResequenceDefinition> { } if (stream != null) { - return createStreamResequencer(routeContext, stream); + return createStreamResequencer(stream); } else { // default as batch mode if (batch == null) { batch = BatchResequencerConfig.getDefault(); } - return createBatchResequencer(routeContext, batch); + return createBatchResequencer(batch); } } @@ -64,13 +64,12 @@ public class ResequenceReifier extends ProcessorReifier<ResequenceDefinition> { * Creates a batch {@link Resequencer} instance applying the given * <code>config</code>. * - * @param routeContext route context. * @param config batch resequencer configuration. * @return the configured batch resequencer. * @throws Exception can be thrown */ @SuppressWarnings("deprecation") - protected Resequencer createBatchResequencer(RouteContext routeContext, BatchResequencerConfig config) throws Exception { + protected Resequencer createBatchResequencer(BatchResequencerConfig config) throws Exception { Processor processor = this.createChildProcessor(true); Expression expression = createExpression(definition.getExpression()); @@ -99,12 +98,11 @@ public class ResequenceReifier extends ProcessorReifier<ResequenceDefinition> { * Creates a {@link StreamResequencer} instance applying the given * <code>config</code>. * - * @param routeContext route context. * @param config stream resequencer configuration. * @return the configured stream resequencer. * @throws Exception can be thrwon */ - protected StreamResequencer createStreamResequencer(RouteContext routeContext, StreamResequencerConfig config) throws Exception { + protected StreamResequencer createStreamResequencer(StreamResequencerConfig config) throws Exception { Processor processor = this.createChildProcessor(true); Expression expression = createExpression(definition.getExpression()); diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java index a6ce8b1..17f300d 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SagaReifier.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Optional; import java.util.TreeMap; -import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.Expression; import org.apache.camel.Processor; @@ -78,7 +77,7 @@ public class SagaReifier extends ProcessorReifier<SagaDefinition> { } Processor childProcessor = this.createChildProcessor(true); - CamelSagaService camelSagaService = findSagaService(camelContext); + CamelSagaService camelSagaService = findSagaService(); camelSagaService.registerStep(step); @@ -87,7 +86,7 @@ public class SagaReifier extends ProcessorReifier<SagaDefinition> { .propagation(propagation).completionMode(completionMode).build(); } - protected CamelSagaService findSagaService(CamelContext context) { + protected CamelSagaService findSagaService() { CamelSagaService sagaService = definition.getSagaService(); if (sagaService != null) { return sagaService; @@ -97,12 +96,12 @@ public class SagaReifier extends ProcessorReifier<SagaDefinition> { return mandatoryLookup(parseString(definition.getSagaServiceRef()), CamelSagaService.class); } - sagaService = context.hasService(CamelSagaService.class); + sagaService = camelContext.hasService(CamelSagaService.class); if (sagaService != null) { return sagaService; } - sagaService = CamelContextHelper.findByType(context, CamelSagaService.class); + sagaService = findSingleByType(CamelSagaService.class); if (sagaService != null) { return sagaService; } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java index 71ed650..af54620 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java @@ -25,7 +25,7 @@ import org.apache.camel.spi.RouteContext; public class SetExchangePatternReifier extends ProcessorReifier<SetExchangePatternDefinition> { - SetExchangePatternReifier(RouteContext routeContext, ProcessorDefinition<?> definition) { + public SetExchangePatternReifier(RouteContext routeContext, ProcessorDefinition<?> definition) { super(routeContext, (SetExchangePatternDefinition)definition); } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java index fcfb79a..40b2ebd 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/StepReifier.java @@ -37,7 +37,7 @@ public class StepReifier extends ProcessorReifier<StepDefinition> { @Override protected Processor createCompositeProcessor(List<Processor> list) throws Exception { - String stepId = getId(definition, routeContext); + String stepId = getId(definition); return StepProcessor.newInstance(camelContext, list, stepId); } } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java index 29b13db..cd7282b 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ThreadsReifier.java @@ -44,7 +44,7 @@ public class ThreadsReifier extends ProcessorReifier<ThreadsDefinition> { ExecutorService threadPool = getConfiguredExecutorService(name, definition, false); // resolve what rejected policy to use - ThreadPoolRejectedPolicy policy = resolveRejectedPolicy(routeContext); + ThreadPoolRejectedPolicy policy = resolveRejectedPolicy(); if (policy == null) { if (parseBoolean(definition.getCallerRunsWhenRejected(), true)) { // should use caller runs by default if not configured @@ -100,7 +100,7 @@ public class ThreadsReifier extends ProcessorReifier<ThreadsDefinition> { return new ThreadsProcessor(camelContext, threadPool, shutdownThreadPool, policy); } - protected ThreadPoolRejectedPolicy resolveRejectedPolicy(RouteContext routeContext) { + protected ThreadPoolRejectedPolicy resolveRejectedPolicy() { if (definition.getExecutorServiceRef() != null && definition.getRejectedPolicy() == null) { ThreadPoolProfile threadPoolProfile = camelContext.getExecutorServiceManager().getThreadPoolProfile(parseString(definition.getExecutorServiceRef())); if (threadPoolProfile != null) { diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java index bf3368a..a323fc3 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java @@ -48,7 +48,7 @@ public class ToDynamicReifier<T extends ToDynamicDefinition> extends ProcessorRe exp = definition.getEndpointProducerBuilder().expr(camelContext); } else { uri = StringHelper.notEmpty(definition.getUri(), "uri", this); - exp = createExpression(routeContext, uri); + exp = createExpression(uri); } SendDynamicProcessor processor = new SendDynamicProcessor(uri, exp); @@ -66,7 +66,7 @@ public class ToDynamicReifier<T extends ToDynamicDefinition> extends ProcessorRe return processor; } - protected Expression createExpression(RouteContext routeContext, String uri) { + protected Expression createExpression(String uri) { List<Expression> list = new ArrayList<>(); String[] parts = safeSplitRaw(uri); diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java index 8edaae7..9a69586 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java @@ -91,10 +91,10 @@ public class WireTapReifier extends ToDynamicReifier<WireTapDefinition<?>> { } @Override - protected Expression createExpression(RouteContext routeContext, String uri) { + protected Expression createExpression(String uri) { // whether to use dynamic or static uri if (parseBoolean(definition.getDynamicUri(), true)) { - return super.createExpression(routeContext, uri); + return super.createExpression(uri); } else { return ExpressionBuilder.constantExpression(uri); } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java index a3c2712..0707c79 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java @@ -207,7 +207,7 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends ((DataFormatContentTypeHeader) dataFormat).setContentTypeHeader(contentTypeHeader); } // configure the rest of the options - configureDataFormat(dataFormat, camelContext); + configureDataFormat(dataFormat); } else { throw new IllegalArgumentException("Data format '" + (definition.getDataFormatName() != null ? definition.getDataFormatName() : "<null>") + "' could not be created. " @@ -236,12 +236,12 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends /** * Allows derived classes to customize the data format */ - protected void configureDataFormat(DataFormat dataFormat, CamelContext camelContext) { + protected void configureDataFormat(DataFormat dataFormat) { Map<String, Object> properties = new LinkedHashMap<>(); prepareDataFormatConfig(properties); properties.entrySet().removeIf(e -> e.getValue() == null); - PropertyConfigurer configurer = findPropertyConfigurer(dataFormat, camelContext); + PropertyConfigurer configurer = findPropertyConfigurer(dataFormat); PropertyBindingSupport.build() .withCamelContext(camelContext) @@ -253,7 +253,7 @@ public abstract class DataFormatReifier<T extends DataFormatDefinition> extends .bind(); } - private PropertyConfigurer findPropertyConfigurer(DataFormat dataFormat, CamelContext camelContext) { + private PropertyConfigurer findPropertyConfigurer(DataFormat dataFormat) { PropertyConfigurer configurer = null; String name = getDataFormatName(); LOG.trace("Discovering optional dataformat property configurer class for dataformat: {}", name); diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java index 2a5c6a9..716a9bf 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java @@ -41,7 +41,7 @@ public class DeadLetterChannelReifier extends DefaultErrorHandlerReifier<DeadLet definition.isUseOriginalBody(), definition.getRetryWhilePolicy(camelContext), getExecutorService(camelContext), definition.getOnPrepareFailure(), definition.getOnExceptionOccurred()); // configure error handler before we can use it - configure(routeContext, answer); + configure(answer); return answer; } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java index 7235574..88a50ea 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java @@ -40,7 +40,7 @@ public class DefaultErrorHandlerReifier<T extends DefaultErrorHandlerBuilder> ex definition.getRetryWhilePolicy(camelContext), getExecutorService(camelContext), definition.getOnPrepareFailure(), definition.getOnExceptionOccurred()); // configure error handler before we can use it - configure(routeContext, answer); + configure(answer); return answer; } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java index 0d6f3d7..c769767 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java @@ -67,7 +67,7 @@ public abstract class ErrorHandlerReifier<T extends ErrorHandlerBuilderSupport> /** * Utility classes should not have a public constructor. */ - ErrorHandlerReifier(RouteContext routeContext, T definition) { + protected ErrorHandlerReifier(RouteContext routeContext, T definition) { super(routeContext); this.definition = definition; } @@ -271,7 +271,7 @@ public abstract class ErrorHandlerReifier<T extends ErrorHandlerBuilderSupport> */ public abstract Processor createErrorHandler(Processor processor) throws Exception; - public void configure(RouteContext routeContext, ErrorHandler handler) { + public void configure(ErrorHandler handler) { if (handler instanceof ErrorHandlerSupport) { ErrorHandlerSupport handlerSupport = (ErrorHandlerSupport)handler;
