Bug fixes

sabre1041 · Apr 1, 2017 · d42831b · d42831b
1 parent 9daf8b2
commit d42831b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/iot-ocp-routing-service/src/main/resources/META-INF/spring/camel-context.xml b/iot-ocp-routing-service/src/main/resources/META-INF/spring/camel-context.xml
@@ -43,7 +43,7 @@
     <bindy type="Csv" classType="com.redhat.examples.iot.routingService.Measure" id="bindyDataFormat"/>
   </dataFormats>
   <route id="messagesFromSensor">
-  <from uri="mqtt:mqtt.temp.receiver?host=tcp://{{env:BROKER_AMQ_MQTT_SERVICE_HOST}}:{{env:BROKER_AMQ_MQTT_SERVICE_PORT}}&amp;subscribeTopicNames=iot-ocp/#/#/#&amp;userName={{env:BROKER_AMQ_USERNAME}}&amp;password={{env:BROKER_AMQ_PASSWORD}}"/>
+  <from uri="mqtt:mqtt.temp.receiver?host=tcp://{{env:BROKER_AMQ_MQTT_SERVICE_HOST}}:{{env:BROKER_AMQ_MQTT_SERVICE_PORT}}&amp;subscribeTopicNames=iot-ocp/#/#/#&amp;userName={{env:BROKER_AMQ_USERNAME}}&amp;password={{env:BROKER_AMQ_PASSWORD}}&amp;clientId={{env:APP_ID}}"/>
     <bean ref="myHelper" method="enhanceMessage" beanType="com.redhat.examples.iot.routingService.MyHelper"/>
     <unmarshal ref="bindyDataFormat"/>
     <log message="Mesaure of type ${body.dataType} received with value ${body.payload}"/>

diff --git a/iot-ocp-software-sensor/src/main/java/com/redhat/examples/iot/Config.java b/iot-ocp-software-sensor/src/main/java/com/redhat/examples/iot/Config.java
@@ -54,7 +54,7 @@ public MqttProducer mqttProducer() {
 
 		String brokerURL = String.format("tcp://%s:%s", mqttServiceName, mqttServicePort);
 
-		return new MqttProducer(brokerURL, mqttUsername, mqttPassword, appName);
+		return new MqttProducer(brokerURL, mqttUsername, mqttPassword, deviceId);
 	}
 
 	public String getDeviceId() {

diff --git a/iot-ocp-software-sensor/src/main/java/com/redhat/examples/iot/mqtt/MqttProducer.java b/iot-ocp-software-sensor/src/main/java/com/redhat/examples/iot/mqtt/MqttProducer.java
@@ -21,19 +21,19 @@ public class MqttProducer {
 	private final String brokerURL;
 	private final String user;
 	private final String password;
-	private final String appName;
+	private final String deviceId;
 
 	private static final int QOS = 2;
 
     private static final Logger log = LoggerFactory.getLogger(MqttProducer.class);
 
 
-	public MqttProducer(String brokerURL, String user, String password, String appName) {
+	public MqttProducer(String brokerURL, String user, String password, String deviceId) {
 
 		this.brokerURL = brokerURL;
 		this.user = user;
 		this.password = password;
-		this.appName = appName;
+		this.deviceId = deviceId;
 
 	}
 
@@ -44,7 +44,7 @@ public synchronized void connect() {
 		}
 
 		try {
-			client = new MqttClient(brokerURL, appName);
+			client = new MqttClient(brokerURL, deviceId);
 			options = new MqttConnectOptions ();
 			options.setUserName(user);
 			options.setPassword(password.toCharArray());