0.22.0

Status changs.
Fix handshake with token.
Fix max string size in msgpack.

Author: a-hansen

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group 'org.iot.dsa'
-version '0.21.0'
+version '0.22.0'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackWriter.java

@@ -65,8 +65,8 @@ private CharBuffer getCharBuffer(CharSequence arg) {
                 tmp += 1024;
             }
             charBuffer = CharBuffer.allocate(tmp);
-        } else if (charBuffer.length() < len) {
-            int tmp = charBuffer.length();
+        } else if (charBuffer.capacity() < len) {
+            int tmp = charBuffer.capacity();
             while (tmp < len) {
                 tmp += 1024;
             }
@@ -298,7 +298,8 @@ protected void writeNull() throws IOException {
 
     private void writeString(CharSequence arg) throws IOException {
         CharBuffer chars = getCharBuffer(arg);
-        ByteBuffer strBuffer = getStringBuffer(chars.position() * (int) encoder.maxBytesPerChar());
+        ByteBuffer strBuffer = getStringBuffer(
+                chars.length() * (int) encoder.maxBytesPerChar());
         encoder.encode(chars, strBuffer, false);
         int len = strBuffer.position();
         if (len < (1 << 5)) {

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java

@@ -98,6 +98,7 @@ void initializeConnection() throws Exception {
             if (in != null) {
                 in.close();
             }
+
         }
     }
 

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageReader.java

@@ -82,7 +82,7 @@ public int getBodyLength() {
      * reuse the same char buffer.
      */
     private CharBuffer getCharBuffer(int size) {
-        if ((charBuffer == null) || (charBuffer.length() < size)) {
+        if ((charBuffer == null) || (charBuffer.capacity() < size)) {
             int tmp = 1024;
             while (tmp < size) {
                 tmp += 1024;

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageWriter.java

@@ -117,8 +117,8 @@ private CharBuffer getCharBuffer(CharSequence arg) {
                 tmp += 1024;
             }
             charBuffer = CharBuffer.allocate(tmp);
-        } else if (charBuffer.length() < len) {
-            int tmp = charBuffer.length();
+        } else if (charBuffer.capacity() < len) {
+            int tmp = charBuffer.capacity();
             while (tmp < len) {
                 tmp += 1024;
             }
@@ -245,7 +245,7 @@ public DS2MessageWriter write(DSBinaryTransport out) {
     public void writeString(CharSequence str) {
         CharBuffer chars = getCharBuffer(str);
         ByteBuffer strBuffer = getStringBuffer(
-                chars.position() * (int) utf8encoder.maxBytesPerChar());
+                chars.length() * (int) utf8encoder.maxBytesPerChar());
         utf8encoder.encode(chars, strBuffer, false);
         body.putShort((short) strBuffer.position(), false);
         body.put(strBuffer);
@@ -257,7 +257,7 @@ public void writeString(CharSequence str) {
     public void writeString(CharSequence str, DSByteBuffer buf) {
         CharBuffer chars = getCharBuffer(str);
         ByteBuffer strBuffer = getStringBuffer(
-                chars.position() * (int) utf8encoder.maxBytesPerChar());
+                chars.length() * (int) utf8encoder.maxBytesPerChar());
         utf8encoder.encode(chars, strBuffer, false);
         buf.putShort((short) strBuffer.position(), false);
         buf.put(strBuffer);

dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConfig.java

@@ -168,24 +168,23 @@ private DSMap getConfigMap(String name, boolean create) {
             map = new DSMap();
             setDslinkJson(map);
         }
-        map = map.getMap("configs");
-        if (map == null) {
+        DSMap configs = map.getMap("configs");
+        if (configs == null) {
             if (!create) {
                 return null;
             }
-            DSMap tmp = new DSMap();
-            map.put("configs", tmp);
-            map = tmp;
+            configs = new DSMap();
+            map.put("configs", configs);
         }
-        DSMap tmp = map.getMap(name);
-        if (tmp == null) {
+        DSMap config = configs.getMap(name);
+        if (config == null) {
             if (!create) {
                 return null;
             }
-            tmp = new DSMap();
-            map.put(name, tmp);
+            config = new DSMap();
+            configs.put(name, config);
         }
-        return tmp;
+        return config;
     }
 
     public String getDsaVersion() {
@@ -531,6 +530,7 @@ public DSLinkConfig setMainType(Class clazz) {
      * Overrides dslink.json.
      */
     public DSLinkConfig setToken(String arg) {
+        token = arg;
         return setConfig(CFG_AUTH_TOKEN, arg);
     }