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 389442b018909b7cdda3e754cd3e6a51fdf0be18 Author: Guillaume Nodet <[email protected]> AuthorDate: Tue Mar 3 14:26:42 2020 +0100 Use proper generics on Model --- .../java/org/apache/camel/impl/AbstractModelCamelContext.java | 4 ++-- .../src/main/java/org/apache/camel/impl/DefaultModel.java | 9 +++++---- .../src/main/java/org/apache/camel/model/Model.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java index 41f1339..b2f10f3 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java @@ -157,12 +157,12 @@ public abstract class AbstractModelCamelContext extends AbstractCamelContext imp } @Override - public ProcessorDefinition getProcessorDefinition(String id) { + public ProcessorDefinition<?> getProcessorDefinition(String id) { return model.getProcessorDefinition(id); } @Override - public <T extends ProcessorDefinition> T getProcessorDefinition(String id, Class<T> type) { + public <T extends ProcessorDefinition<T>> T getProcessorDefinition(String id, Class<T> type) { return model.getProcessorDefinition(id, type); } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java index cb349cc..f78b865 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModel.java @@ -242,12 +242,13 @@ public class DefaultModel implements Model { return type; } + @SuppressWarnings("rawtypes") @Override - public ProcessorDefinition getProcessorDefinition(String id) { + public ProcessorDefinition<?> getProcessorDefinition(String id) { for (RouteDefinition route : getRouteDefinitions()) { Iterator<ProcessorDefinition> it = ProcessorDefinitionHelper.filterTypeInOutputs(route.getOutputs(), ProcessorDefinition.class); while (it.hasNext()) { - ProcessorDefinition proc = it.next(); + ProcessorDefinition<?> proc = it.next(); if (id.equals(proc.getId())) { return proc; } @@ -257,8 +258,8 @@ public class DefaultModel implements Model { } @Override - public <T extends ProcessorDefinition> T getProcessorDefinition(String id, Class<T> type) { - ProcessorDefinition answer = getProcessorDefinition(id); + public <T extends ProcessorDefinition<T>> T getProcessorDefinition(String id, Class<T> type) { + ProcessorDefinition<?> answer = getProcessorDefinition(id); if (answer != null) { return type.cast(answer); } diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java index c8bdac7..e03f1d2 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/Model.java @@ -147,7 +147,7 @@ public interface Model { * @param id id of the processor definition * @return the processor definition or <tt>null</tt> if not found */ - ProcessorDefinition getProcessorDefinition(String id); + ProcessorDefinition<?> getProcessorDefinition(String id); /** * Gets the processor definition from any of the routes which with the given @@ -158,7 +158,7 @@ public interface Model { * @return the processor definition or <tt>null</tt> if not found * @throws ClassCastException is thrown if the type is not correct type */ - <T extends ProcessorDefinition> T getProcessorDefinition(String id, Class<T> type); + <T extends ProcessorDefinition<T>> T getProcessorDefinition(String id, Class<T> type); /** * Sets the validators that can be referenced in the routes.
