Repository: camel Updated Branches: refs/heads/master 15a00115b -> de6f32fe3
[CAMEL-9381] Upgraded AMQP factory methods. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/de6f32fe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de6f32fe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de6f32fe Branch: refs/heads/master Commit: de6f32fe309b1c9515a18288f96b62c904e0bae4 Parents: 15a0011 Author: Henryk Konsek <hekon...@gmail.com> Authored: Tue Dec 1 17:14:21 2015 +0100 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Tue Dec 1 17:14:21 2015 +0100 ---------------------------------------------------------------------- .../camel/component/amqp/AMQPComponent.java | 23 ++++++++------------ .../camel/component/amqp/AMQPRouteTest.java | 4 ++-- 2 files changed, 11 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/de6f32fe/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java index 383b960..e326cf4 100644 --- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java +++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java @@ -47,22 +47,17 @@ public class AMQPComponent extends JmsComponent { setConnectionFactory(connectionFactory); } - public static Component amqpComponent(String uri, boolean old) throws MalformedURLException, URISyntaxException { - if (old) { - return amqpComponentOld(uri); - } - return new AMQPComponent(new JmsConnectionFactory(uri)); - } - - public static Component amqpComponentOld(String uri) throws URISyntaxException { - return new AMQPComponent(new JmsConnectionFactory(uri)); - } - - public static Component amqpComponent(String uri) throws MalformedURLException { - return new AMQPComponent(new JmsConnectionFactory(uri)); + /** + * Use {@code amqpComponent(String uri)} instead. + */ + @Deprecated + public static AMQPComponent amqp10Component(String uri) throws MalformedURLException { + JmsConnectionFactory connectionFactory = new JmsConnectionFactory(uri); + connectionFactory.setTopicPrefix("topic://"); + return new AMQPComponent(connectionFactory); } - public static AMQPComponent amqp10Component(String uri) throws MalformedURLException { + public static AMQPComponent amqpComponent(String uri) { JmsConnectionFactory connectionFactory = new JmsConnectionFactory(uri); connectionFactory.setTopicPrefix("topic://"); return new AMQPComponent(connectionFactory); http://git-wip-us.apache.org/repos/asf/camel/blob/de6f32fe/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java index e2a6f15..73ac9e0 100644 --- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java +++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java @@ -24,7 +24,7 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Before; import org.junit.Test; -import static org.apache.camel.component.amqp.AMQPComponent.amqp10Component; +import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent; public class AMQPRouteTest extends CamelTestSupport { @@ -69,7 +69,7 @@ public class AMQPRouteTest extends CamelTestSupport { protected CamelContext createCamelContext() throws Exception { CamelContext camelContext = super.createCamelContext(); - camelContext.addComponent("amqp1-0", amqp10Component("amqp://localhost:5672")); + camelContext.addComponent("amqp1-0", amqpComponent("amqp://localhost:5672")); return camelContext; }
