0.49.1

JSON API refactor.
Event model refactor.
Misc fixes.
DSISetAction.
DSTimezone.

Author: a-hansen

README.md

@@ -3,7 +3,7 @@
 
 * [Documentation](https://github.com/iot-dsa-v2/sdk-dslink-java-v2/wiki)
 * [Javadoc](https://jitpack.io/com/github/iot-dsa-v2/sdk-dslink-java-v2/dslink-v2/master-SNAPSHOT/javadoc/)
-* JDK 1.6+
+* JDK 1.8+
 
 
 ## Overview

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.49.0'
+    version '0.49.1'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/io/DSBase64.java

@@ -110,6 +110,14 @@ public static String encode(byte[] buf, int linelen) {
         return encode(buf, 0, buf.length, linelen, true);
     }
 
+    /**
+     * Encodes to a URL safe base64 string.  Replaces / with _ and + with -.
+     */
+    public static String encodeUrl(byte[] bytes) {
+        String enc = encode(bytes);
+        return enc.replace('+', '-').replace('/', '_');
+    }
+
     /**
      * Encodes a buffer into a base 64 string.
      *
@@ -172,14 +180,6 @@ private static String encode(byte[] bytes,
         return buf.toString();
     }
 
-    /**
-     * Encodes to a URL safe base64 string.  Replaces / with _ and + with -.
-     */
-    public static String encodeUrl(byte[] bytes) {
-        String enc = encode(bytes);
-        return enc.replace('+', '-').replace('/', '_');
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // Initialization
     ///////////////////////////////////////////////////////////////////////////

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/io/DSByteBuffer.java

@@ -53,20 +53,6 @@ public DSByteBuffer clear() {
         return this;
     }
 
-    /**
-     * Increases the childCount of the buffer to at least the given.
-     */
-    private void growBuffer(int minSize) {
-        int size = buffer.length;
-        while (size < minSize) {
-            size *= 2;
-        }
-        byte[] tmp = new byte[size];
-        System.arraycopy(buffer, offset, tmp, 0, length);
-        buffer = tmp;
-        offset = 0;
-    }
-
     /**
      * Number of bytes available for reading.
      */
@@ -634,4 +620,18 @@ public byte[] toByteArray() {
         return ret;
     }
 
+    /**
+     * Increases the childCount of the buffer to at least the given.
+     */
+    private void growBuffer(int minSize) {
+        int size = buffer.length;
+        while (size < minSize) {
+            size *= 2;
+        }
+        byte[] tmp = new byte[size];
+        System.arraycopy(buffer, offset, tmp, 0, length);
+        buffer = tmp;
+        offset = 0;
+    }
+
 }

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/io/DSCharBuffer.java

@@ -80,20 +80,6 @@ public long getTimeout() {
         return timeout;
     }
 
-    /**
-     * Increases the childCount of the buffer to at least the given.
-     */
-    private void growBuffer(int minSize) {
-        int size = buffer.length;
-        while (size < minSize) {
-            size *= 2;
-        }
-        char[] tmp = new char[size];
-        System.arraycopy(buffer, offset, tmp, 0, length);
-        buffer = tmp;
-        offset = 0;
-    }
-
     public boolean isOpen() {
         return open;
     }
@@ -273,4 +259,18 @@ public DSCharBuffer setTimeout(long timeout) {
         return this;
     }
 
+    /**
+     * Increases the childCount of the buffer to at least the given.
+     */
+    private void growBuffer(int minSize) {
+        int size = buffer.length;
+        while (size < minSize) {
+            size *= 2;
+        }
+        char[] tmp = new char[size];
+        System.arraycopy(buffer, offset, tmp, 0, length);
+        buffer = tmp;
+        offset = 0;
+    }
+
 }

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackReader.java

@@ -23,12 +23,12 @@ public class MsgpackReader extends AbstractReader implements DSIReader, MsgpackC
     // Fields
     // ---------
 
-    private byte[] bytes;
     private ByteBuffer byteBuffer;
+    private byte[] bytes;
     private CharBuffer charBuffer;
     private CharsetDecoder decoder = DSString.UTF8.newDecoder();
-    private InputStream in;
     private Frame frame;
+    private InputStream in;
     private boolean wasValue = true;
 
     // Constructors
@@ -53,42 +53,6 @@ public void close() {
         }
     }
 
-    /**
-     * Returns a byte buffer wrapping the given bytes and ready for reading (getting).  Attempts to
-     * reuse the same buffer.
-     */
-    private ByteBuffer getByteBuffer(byte[] bytes, int off, int len) {
-        if ((byteBuffer == null) || (byteBuffer.capacity() < len)) {
-            int tmp = 1024;
-            while (tmp < len) {
-                tmp += 1024;
-            }
-            byteBuffer = ByteBuffer.allocate(tmp);
-        } else {
-            byteBuffer.clear();
-        }
-        byteBuffer.put(bytes, 0, len);
-        byteBuffer.flip();
-        return byteBuffer;
-    }
-
-    /**
-     * Returns a char buffer with the given capacity, ready for writing (putting).  Attempts to
-     * reuse the same char buffer.
-     */
-    private CharBuffer getCharBuffer(int size) {
-        if ((charBuffer == null) || (charBuffer.length() < size)) {
-            int tmp = 1024;
-            while (tmp < size) {
-                tmp += 1024;
-            }
-            charBuffer = CharBuffer.allocate(tmp);
-        } else {
-            charBuffer.clear();
-        }
-        return charBuffer;
-    }
-
     public static final boolean isFixInt(byte b) {
         int v = b & 0xff;
         return v <= 0x7f || v >= 0xe0;
@@ -184,6 +148,65 @@ public Token next() {
         throw new IllegalStateException("Unknown type: " + b);
     }
 
+    public String readUTF(int len) throws IOException {
+        byte[] bytes = readBytes(len);
+        ByteBuffer byteBuf = getByteBuffer(bytes, 0, len);
+        CharBuffer charBuf = getCharBuffer(len);
+        decoder.decode(byteBuf, charBuf, false);
+        charBuf.flip();
+        return charBuf.toString();
+    }
+
+    @Override
+    public MsgpackReader reset() {
+        super.reset();
+        return this;
+    }
+
+    /**
+     * Sets the input source, resets to ROOT, and returns this.
+     */
+    public MsgpackReader setInput(InputStream inputStream) {
+        this.in = inputStream;
+        return reset();
+    }
+
+    /**
+     * Returns a byte buffer wrapping the given bytes and ready for reading (getting).  Attempts to
+     * reuse the same buffer.
+     */
+    private ByteBuffer getByteBuffer(byte[] bytes, int off, int len) {
+        if ((byteBuffer == null) || (byteBuffer.capacity() < len)) {
+            int tmp = 1024;
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            byteBuffer = ByteBuffer.allocate(tmp);
+        } else {
+            byteBuffer.clear();
+        }
+        byteBuffer.put(bytes, 0, len);
+        byteBuffer.flip();
+        return byteBuffer;
+    }
+
+    /**
+     * Returns a char buffer with the given capacity, ready for writing (putting).  Attempts to
+     * reuse the same char buffer.
+     */
+    private CharBuffer getCharBuffer(int size) {
+        if ((charBuffer == null) || (charBuffer.length() < size)) {
+            int tmp = 1024;
+            while (tmp < size) {
+                tmp += 1024;
+            }
+            charBuffer = CharBuffer.allocate(tmp);
+        } else {
+            charBuffer.clear();
+        }
+        return charBuffer;
+    }
+
     /**
      * Reads bytes into an array that is guaranteed to be at least the given size but will probably
      * be longer.
@@ -202,20 +225,6 @@ private byte[] readBytes(int size) throws IOException {
         return bytes;
     }
 
-    @Override
-    public MsgpackReader reset() {
-        super.reset();
-        return this;
-    }
-
-    /**
-     * Sets the input source, resets to ROOT, and returns this.
-     */
-    public MsgpackReader setInput(InputStream inputStream) {
-        this.in = inputStream;
-        return reset();
-    }
-
     private Token readBytes(byte b) throws IOException {
         int size = 0;
         switch (b) {
@@ -321,23 +330,14 @@ private Token readString(byte b) throws IOException {
         return last();
     }
 
-    public String readUTF(int len) throws IOException {
-        byte[] bytes = readBytes(len);
-        ByteBuffer byteBuf = getByteBuffer(bytes, 0, len);
-        CharBuffer charBuf = getCharBuffer(len);
-        decoder.decode(byteBuf, charBuf, false);
-        charBuf.flip();
-        return charBuf.toString();
-    }
-
     // Inner Classes
     // -------------
 
     private class Frame {
 
         boolean map = true;
-        int size;
         Frame parent;
+        int size;
 
         Frame(int size, boolean map) {
             this.map = map;