This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit e6b9188f449074c20fc8e9468eae05adc5ad5967 Author: Claus Ibsen <[email protected]> AuthorDate: Thu May 2 12:02:46 2019 +0200 camel3 - Move more classes from core to base --- .../org/apache/camel/impl/engine}/BeanProcessorFactoryResolver.java | 2 +- .../java/org/apache/camel/impl/engine}/SubscribeMethodProcessor.java | 4 ++-- .../src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java | 1 + .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/BeanProcessorFactoryResolver.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/BeanProcessorFactoryResolver.java similarity index 98% rename from core/camel-core/src/main/java/org/apache/camel/impl/BeanProcessorFactoryResolver.java rename to core/camel-base/src/main/java/org/apache/camel/impl/engine/BeanProcessorFactoryResolver.java index dfe9ca1..a57f5bb 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/BeanProcessorFactoryResolver.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/BeanProcessorFactoryResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.impl; +package org.apache.camel.impl.engine; import java.io.IOException; diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/SubscribeMethodProcessor.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java similarity index 96% rename from core/camel-core/src/main/java/org/apache/camel/impl/SubscribeMethodProcessor.java rename to core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java index e38f947..683efd3 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/SubscribeMethodProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SubscribeMethodProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.impl; +package org.apache.camel.impl.engine; import java.lang.reflect.Method; import java.util.ArrayList; @@ -52,7 +52,7 @@ public final class SubscribeMethodProcessor extends AsyncProcessorSupport implem return endpoint; } - protected void addMethod(final Object pojo, final Method method, final Endpoint endpoint, String predicate) throws Exception { + public void addMethod(final Object pojo, final Method method, final Endpoint endpoint, String predicate) throws Exception { Processor answer = endpoint.getCamelContext().getBeanProcessorFactory().createBeanProcessor(endpoint.getCamelContext(), pojo, method); // must ensure the consumer is being executed in an unit of work so synchronization callbacks etc is invoked CamelInternalProcessor internal = new CamelInternalProcessor(answer); diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java b/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java index 2e518f8..a4e9717 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java +++ b/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java @@ -41,6 +41,7 @@ import org.apache.camel.Service; import org.apache.camel.impl.engine.DefaultConsumerTemplate; import org.apache.camel.impl.engine.DefaultFluentProducerTemplate; import org.apache.camel.impl.engine.DefaultProducerTemplate; +import org.apache.camel.impl.engine.SubscribeMethodProcessor; import org.apache.camel.spi.BeanProxyFactory; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.IntrospectionSupport; diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index e0799a8..c35b01a 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -27,6 +27,7 @@ import org.apache.camel.Producer; import org.apache.camel.TypeConverter; import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.impl.converter.DefaultTypeConverter; +import org.apache.camel.impl.engine.BeanProcessorFactoryResolver; import org.apache.camel.impl.engine.BeanProxyFactoryResolver; import org.apache.camel.impl.engine.DefaultAsyncProcessorAwaitManager; import org.apache.camel.impl.engine.DefaultCamelContextNameStrategy;
