Topic name format modifications (#39)

sabre1041 · Mar 26, 2017 · 9daf8b2 · 9daf8b2
1 parent 8cbbf42
commit 9daf8b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/iot-ocp-routing-service/src/main/java/com/redhat/examples/iot/routingService/Measure.java b/iot-ocp-routing-service/src/main/java/com/redhat/examples/iot/routingService/Measure.java
@@ -24,16 +24,16 @@ public class Measure implements Serializable {
 
 	@DataField(pos = 4, required = true) 
 	private String sensorType;
-
-	@DataField(pos = 5, required = true)
-	private String dataType;
 
-	@DataField(pos = 6, required = true) 
+	@DataField(pos = 5, required = true)
 	private String deviceId;
-
+
+	@DataField(pos = 6, required = true)
+	private String dataType;
+
 	@DataField(pos = 7, required = false) 
 	private int errorCode;
-	
+
 	@DataField(pos = 8, required = false) 
 	private String errorMessage;
 

diff --git a/iot-ocp-software-sensor/src/main/java/com/redhat/examples/iot/SensorRunner.java b/iot-ocp-software-sensor/src/main/java/com/redhat/examples/iot/SensorRunner.java
@@ -1,12 +1,7 @@
 package com.redhat.examples.iot;
 
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.util.Date;
-import java.util.TimeZone;
 
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
@@ -19,16 +14,6 @@
 public class SensorRunner implements Runnable {
 
     private static final Logger log = LoggerFactory.getLogger(SchedulerManager.class);
-
-    private static final ThreadLocal<SimpleDateFormat> dateFormat = new ThreadLocal<SimpleDateFormat>(){
-        @Override
-        protected SimpleDateFormat initialValue()
-        {
-        	SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd HHmm");
-            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-        	return sdf;
-        }
-    };
 
     private final Sensor sensor;
 
@@ -80,9 +65,9 @@ private void generateTopicName() {
 		sb.append(SLASH);
 		sb.append(SW_CODE);
 		sb.append(SLASH);
-		sb.append(sensor.getType());
-		sb.append(SLASH);
 		sb.append(deviceId);
+		sb.append(SLASH);
+		sb.append(sensor.getType());
 
 		topicName = sb.toString();
 	}