This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0a462827f8a6e362020189920b0c27968aa3d279 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed Dec 5 09:54:29 2018 +0100 Camel-corda fixed backport from 2.x and regen --- .../src/main/java/org/apache/camel/component/corda/CordaComponent.java | 3 ++- .../src/main/java/org/apache/camel/component/corda/CordaConsumer.java | 2 +- .../src/main/java/org/apache/camel/component/corda/CordaEndpoint.java | 3 ++- .../test/java/org/apache/camel/component/corda/CordaTestSupport.java | 3 ++- .../component/corda/springboot/CordaComponentAutoConfiguration.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java index 04cf6d5..13d3fa4 100644 --- a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java +++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java @@ -19,8 +19,9 @@ package org.apache.camel.component.corda; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.DefaultComponent; + import org.apache.camel.spi.Metadata; +import org.apache.camel.support.DefaultComponent; /** * Represents the component that manages {@link CordaComponent}. diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java index 3c1f617..34d08c2 100644 --- a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java +++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java @@ -32,7 +32,7 @@ import net.corda.core.node.services.vault.QueryCriteria; import net.corda.core.node.services.vault.Sort; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.impl.DefaultConsumer; +import org.apache.camel.support.DefaultConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java index 4ba221a..afc82b6 100644 --- a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java +++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java @@ -25,10 +25,11 @@ import net.corda.core.utilities.NetworkHostAndPort; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.impl.DefaultEndpoint; + import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; /** * The corda component uses the corda-rpc to interact with corda nodes. diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java index 7586e3f..48ee323 100755 --- a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java +++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java @@ -19,8 +19,9 @@ package org.apache.camel.component.corda; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.impl.DefaultExchange; + import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.AfterClass; import org.junit.Before; diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java index a3ed689..ebe903f 100644 --- a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java @@ -30,7 +30,7 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; -import org.apache.camel.util.IntrospectionSupport; +import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory;