template fix.

README.md

@@ -132,22 +132,22 @@ The below device configuration **devices.json** defines complex json payload usi
 where the **template.json** file is:
 ```sh
 {
-        "sn": {$sdid},
+        "sn": "{$sdid}",
         "data": {
                 "light": {
-                        "value": {$light_value},
+                        "value": "{$light_value}",
                         "unit": "mLux"
                 },
                 "temp": {
-                        "value": {$temp_value},
+                        "value": "{$temp_value}",
                         "unit": "mCelsius"
                 },
                 "pressure": {
-                        "value": {$pressure_value},
+                        "value": "{$pressure_value}",
                         "unit": "Pascal"
                 },
                 "humidity": {
-                        "value": {$humidity_value},
+                        "value": "{$humidity_value}",
                         "unit": "%rh"
                 }
         }

src/main/java/net/iosynth/device/Device.java

@@ -78,8 +78,8 @@ public SDID getSDID() {
 	/**
 	 * @param sdid 
 	 */
-	public void setSDID(SDID uuid) {
-		this.sdid = uuid;
+	public void setSDID(SDID sdid) {
+		this.sdid = sdid;
 	}
 
 	/**

src/main/java/net/iosynth/device/DeviceTemplate.java

@@ -49,7 +49,7 @@ public DeviceTemplate(String jsonFileName, Sensor sensors[]) {
 	 * @param jsonIn
 	 */
 	public void parseJson(String jsonIn){
-		template = jsonIn.split("\\{\\$");  // "{$variable}"
+		template = jsonIn.split("\"\\{\\$");  // "{$variable}"
 	}
 
 	/**
@@ -58,7 +58,7 @@ public void parseJson(String jsonIn){
 	public void matchVariables(Sensor sensors[]){
 		String tmp[];
 		for (int i = 1; i < template.length; i++) {
-			tmp = template[i].split("}", 2);
+			tmp = template[i].split("}\"", 2);
 			if (tmp.length < 2) {
 				logger.severe("Parser error: " + template[i]);
 				System.exit(1);

src/main/java/net/iosynth/device/DevicesFromJson.java

@@ -21,7 +21,6 @@
 import net.iosynth.sensor.SensorStringRandom;
 import net.iosynth.sensor.SensorTimestamp;
 import net.iosynth.sensor.SensorSdid;
-import net.iosynth.util.GeneratorDevCount;
 import net.iosynth.util.GeneratorMAC;
 import net.iosynth.util.RuntimeTypeAdapterFactory;
 import net.iosynth.util.Xoroshiro128;

src/main/java/net/iosynth/device/SDID.java

@@ -8,13 +8,13 @@
  *
  */
 public abstract class SDID {
-	protected String uuid;
+	protected String sdid;
 
 	/**
 	 * 
 	 */
 	public SDID() {
-		uuid = new String("sdid");
+		sdid = new String("sdid");
 	}
 
 	/**
@@ -30,14 +30,14 @@ public SDID() {
 	 * @return the sdid
 	 */
 	public String getUUID() {
-		return uuid;
+		return sdid;
 	}
 
 	/**
-	 * @param sdid the sdid to set
+	 * @param sdid 
 	 */
-	public void setUUID(String uuid) {
-		this.uuid = uuid;
+	public void setUUID(String sdid) {
+		this.sdid = sdid;
 	}
 
 }

src/main/java/net/iosynth/device/SDIDMac48.java

@@ -31,7 +31,7 @@ public void checkParameters() {
 	 */
 	@Override
 	public void replicate() {
-		uuid = GeneratorMAC.getNext48();
+		sdid = GeneratorMAC.getNext48();
 	}
 
 }

src/main/java/net/iosynth/device/SDIDMac64.java

@@ -31,7 +31,7 @@ public void checkParameters() {
 	 */
 	@Override
 	public void replicate() {
-		uuid = GeneratorMAC.getNext64();
+		sdid = GeneratorMAC.getNext64();
 	}
 
 }

src/main/java/net/iosynth/device/SDIDString.java

@@ -33,7 +33,7 @@ public void checkParameters() {
 	 */
 	@Override
 	public void replicate() {
-		uuid = value + String.format(format, GeneratorDevCount.getNext());
+		sdid = value + String.format(format, GeneratorDevCount.getNext());
 	}
 
 }

src/main/java/net/iosynth/device/SDIDUuid.java

@@ -31,7 +31,7 @@ public void checkParameters() {
 	 */
 	@Override
 	public void replicate() {
-		uuid = UUID.randomUUID().toString();
+		sdid = UUID.randomUUID().toString();
 	}
 
 }

src/main/java/net/iosynth/sensor/SensorSdid.java

@@ -44,8 +44,8 @@ public String getValue(){
 	/**
 	 * @param sdid
 	 */
-	public void SetValue(String uuid){
-		value = uuid;
+	public void SetValue(String sdid){
+		value = sdid;
 	}
 
 	@Override