From 9b2abab1860439e90847b86e625a41e1baadebe2 Mon Sep 17 00:00:00 2001
From: Henryk Konsek <hekonsek@gmail.com>
Date: Wed, 27 Apr 2016 14:26:51 +0200
Subject: [PATCH] Reverted camel-amqp version.

---
 bom/pom.xml                                                  | 5 +++++
 .../io/rhiot/cloudplatform/runtime/spring/CloudPlatform.java | 4 ++--
 .../rhiot/cloudplatform/service/binding/ServiceBinding.java  | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 3f33376ba..04cbf18fd 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -514,6 +514,11 @@
 				<!-- Camel Spark is available starting from Camel 2.17 -->
 				<version>2.17-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-amqp</artifactId>
+				<version>2.16.2</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-exec</artifactId>
diff --git a/cloudplatform/runtime/spring/src/main/java/io/rhiot/cloudplatform/runtime/spring/CloudPlatform.java b/cloudplatform/runtime/spring/src/main/java/io/rhiot/cloudplatform/runtime/spring/CloudPlatform.java
index ede4d631a..08b09f5af 100644
--- a/cloudplatform/runtime/spring/src/main/java/io/rhiot/cloudplatform/runtime/spring/CloudPlatform.java
+++ b/cloudplatform/runtime/spring/src/main/java/io/rhiot/cloudplatform/runtime/spring/CloudPlatform.java
@@ -20,7 +20,7 @@
 import static io.rhiot.cloudplatform.runtime.spring.RhiotConstants.CAMEL_SPRINGBOOT_TYPE_CONVERSION;
 import static io.rhiot.cloudplatform.runtime.spring.RhiotConstants.META_INF_RHIOT_BANNER_TXT;
 import static java.util.Arrays.asList;
-import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
+import static org.apache.camel.component.amqp.AMQPComponent.amqp10Component;
 
 import io.rhiot.cloudplatform.encoding.spi.PayloadEncoding;
 import io.rhiot.cloudplatform.connector.IoTConnector;
@@ -90,7 +90,7 @@ public static void main(String[] args) throws InterruptedException {
     AMQPComponent amqp(@Value("${AMQP_SERVICE_HOST:localhost}") String amqpBrokerUrl,
             @Value("${AMQP_SERVICE_PORT:5672}") int amqpBrokerPort) throws MalformedURLException {
         LOG.debug("About to create AMQP component {}:{}", amqpBrokerUrl, amqpBrokerPort);
-        return amqpComponent("amqp://" + amqpBrokerUrl + ":" + amqpBrokerPort);
+        return amqp10Component("amqp://" + amqpBrokerUrl + ":" + amqpBrokerPort);
     }
 
     @Bean
diff --git a/cloudplatform/service/binding/src/main/java/io/rhiot/cloudplatform/service/binding/ServiceBinding.java b/cloudplatform/service/binding/src/main/java/io/rhiot/cloudplatform/service/binding/ServiceBinding.java
index 942edba5c..eaff64ff8 100644
--- a/cloudplatform/service/binding/src/main/java/io/rhiot/cloudplatform/service/binding/ServiceBinding.java
+++ b/cloudplatform/service/binding/src/main/java/io/rhiot/cloudplatform/service/binding/ServiceBinding.java
@@ -19,6 +19,7 @@
 import io.rhiot.cloudplatform.encoding.spi.PayloadEncoding;
 import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +63,7 @@ public void configure() throws Exception {
 
             from(fromChannel).process(exchange -> {
                 Message message = exchange.getIn();
-                String channel = message.getHeader("JMSDestination", String.class);
+                String channel = message.getHeader("JMSDestination", QueueImpl.class).getQueueName();
                 byte[] incomingPayload = message.getBody(byte[].class);
                 OperationBinding operationBinding = operationBinding(payloadEncoding, channel, incomingPayload, message.getHeaders(), getContext().getRegistry());
                 exchange.setProperty(TARGET_PROPERTY, "bean:" + operationBinding.service() + "?method=" + operationBinding.operation() + "&multiParameterArray=true");