0.43.0

- Handle redirects between http and https.
- Make connection constants available to subclasses.

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.42.1'
+    version '0.43.0'
 
     sourceCompatibility = 1.6
     targetCompatibility = 1.6

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

@@ -61,6 +61,43 @@ protected void onStarted() {
     // Package / Private Methods
     ///////////////////////////////////////////////////////////////////////////
 
+    /**
+     * Opens an http/s connection and handles redirects that switch protocols.
+     */
+    InputStream connect(URL url, int redirects) throws Exception {
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setDoInput(true);
+        conn.setDoOutput(true);
+        conn.setInstanceFollowRedirects(true);
+        conn.setUseCaches(false);
+        conn.setRequestMethod("POST");
+        conn.setRequestProperty("Content-Type", "application/json");
+        //write the request map
+        writeConnectionRequest(conn);
+        //read response
+        int rc = conn.getResponseCode();
+        debug(debug() ? "Connection initialization response code " + rc : null);
+        if ((rc >= 300) && (rc <= 307) && (rc != 306) &&
+                (rc != HttpURLConnection.HTTP_NOT_MODIFIED)) {
+            conn.disconnect();
+            if (++redirects > 5) {
+                throw new IllegalStateException("Too many redirects");
+            }
+            String location = conn.getHeaderField("Location");
+            if (location == null) {
+                throw new IllegalStateException("Redirect missing location header");
+            }
+            url = new URL(url, location);
+            debug(debug() ? "Following redirect to " + url : null);
+            return connect(url, redirects);
+        }
+        if ((rc < 200) || (rc >= 300)) {
+            conn.disconnect();
+            throwConnectionException(conn, rc);
+        }
+        return conn.getInputStream();
+    }
+
     DSLink getLink() {
         return connection.getLink();
     }
@@ -81,24 +118,9 @@ DSMap getResponse() {
     void initializeConnection() throws Exception {
         String uri = makeBrokerUrl();
         debug(debug() ? "Broker URI " + uri : null);
-        HttpURLConnection conn = (HttpURLConnection) new URL(uri).openConnection();
-        conn.setDoInput(true);
-        conn.setDoOutput(true);
-        conn.setInstanceFollowRedirects(true);
-        conn.setUseCaches(false);
-        conn.setRequestMethod("POST");
-        conn.setRequestProperty("Content-Type", "application/json");
-        //write the request map
-        writeConnectionRequest(conn);
-        //read response
-        int rc = conn.getResponseCode();
-        debug(debug() ? "Connection initialization response code " + rc : null);
-        if ((rc < 200) || (rc >= 300)) {
-            throwConnectionException(conn, rc);
-        }
         JsonReader in = null;
         try {
-            in = new JsonReader(conn.getInputStream(), "UTF-8");
+            in = new JsonReader(connect(new URL(uri), 0), "UTF-8");
             response = in.getMap();
             put(BROKER_RES, response).setReadOnly(true);
             trace(trace() ? response : null);

dslink-v2/src/main/java/org/iot/dsa/conn/DSBaseConnection.java

@@ -24,10 +24,10 @@ public abstract class DSBaseConnection extends DSNode implements DSIStatus {
     // Class Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    static final String LAST_OK = "Last Ok";
-    static final String LAST_FAIL = "Last Fail";
-    static final String STATUS = "Status";
-    static final String STATUS_TEXT = "Status Text";
+    protected static final String LAST_OK = "Last Ok";
+    protected static final String LAST_FAIL = "Last Fail";
+    protected static final String STATUS = "Status";
+    protected static final String STATUS_TEXT = "Status Text";
 
     ///////////////////////////////////////////////////////////////////////////
     // Instance Fields

dslink-v2/src/main/java/org/iot/dsa/conn/DSConnection.java

@@ -38,8 +38,8 @@ public abstract class DSConnection extends DSBaseConnection implements Runnable
     // Class Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    static final String STATE = "State";
-    static final String STATE_TIME = "State Time";
+    protected static final String STATE = "State";
+    protected static final String STATE_TIME = "State Time";
 
     /**
      * The topic to subscribe to for connected events.
@@ -55,8 +55,8 @@ public abstract class DSConnection extends DSBaseConnection implements Runnable
     // Instance Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private DSInfo state = getInfo(STATE);
-    private DSInfo stateTime = getInfo(STATE_TIME);
+    protected DSInfo state = getInfo(STATE);
+    protected DSInfo stateTime = getInfo(STATE_TIME);
 
     ///////////////////////////////////////////////////////////////////////////
     // Public Methods
@@ -266,7 +266,7 @@ protected void declareDefaults() {
     protected abstract void doDisconnect();
 
     /**
-     * Override point, called by the run method.  Implementations should call verify the connection
+     * Override point, called by the run method.  Implementations should verify the connection
      * is still valid and call connOk or connDown, but those can be async and after this method
      * returns.  Throwing an exception will be treated as a connDown.  By default, this does
      * nothing.
@@ -302,7 +302,7 @@ protected void onConnected() {
     protected void onDisconnected() {
     }
 
-   ///////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////
     // Package / Private Methods
     ///////////////////////////////////////////////////////////////////////////