Release of version 1.0.1

kpeng2016 · Jul 8, 2016 · e14223a · e14223a
1 parent 683ad63
commit e14223a
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ of your Maven project.
   <dependency>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-iot-device-sdk-java</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </dependency>
 </dependencies>
 ```
@@ -88,7 +88,7 @@ The sample applications included with the SDK can also be installed using the fo
   <dependency>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-iot-device-sdk-java-samples</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </dependency>
 </dependencies>
 ```
@@ -101,9 +101,7 @@ include them to your library build path.
 You will also need to add two libraries the SDK depends on:
 
  * Jackson 2.x, including Jackson-core and Jackson-databind. [download instructions][jackson-download]
- * Paho MQTT client for Java 1.0.x. [download instructions][paho-mqtt-java-download]
-   (Note: If you plan to use MQTT over WebSocket connections, use its development branch or snapshot builds here 
-   https://repo.eclipse.org/content/repositories/paho-snapshots/.)
+ * Paho MQTT client for Java 1.1.x. [download instructions][paho-mqtt-java-download]
 
 ### Build the SDK from the GitHub Source
 You can build both the SDK and its sample applications from the source 

diff --git a/aws-iot-device-sdk-java-samples/pom.xml b/aws-iot-device-sdk-java-samples/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-iot-device-sdk-java-pom</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>aws-iot-device-sdk-java-samples</artifactId>
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-iot-device-sdk-java</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.1</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/aws-iot-device-sdk-java-samples/samples-pom.xml b/aws-iot-device-sdk-java-samples/samples-pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-iot-device-sdk-java-samples</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-iot-device-sdk-java</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -24,11 +24,6 @@
       <artifactId>jackson-databind</artifactId>
       <version>2.7.4</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.paho</groupId>
-      <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-      <version>[1.0.2,)</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/aws-iot-device-sdk-java/pom.xml b/aws-iot-device-sdk-java/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-iot-device-sdk-java-pom</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </parent>
   <artifactId>aws-iot-device-sdk-java</artifactId>
   <dependencies>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.eclipse.paho</groupId>
       <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-      <version>[1.0.2,)</version>
+      <version>[1.1.0,)</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/...e-sdk-java/src/main/java/com/amazonaws/services/iot/client/core/AbstractAwsIotClient.java b/...e-sdk-java/src/main/java/com/amazonaws/services/iot/client/core/AbstractAwsIotClient.java
@@ -279,12 +279,49 @@ public void unsubscribe(AWSIotTopic topic, long timeout) throws AWSIotException
         }
     }
 
-    public void dispatch(AWSIotMessage message) {
-        AWSIotTopic topic = subscriptions.get(message.getTopic());
-        if (topic != null) {
-            topic.onMessage(message);
-        } else {
-        	LOGGER.warning("Unexpected message received from topic " + message.getTopic());
+    public boolean topicFilterMatch(String topicFilter, String topic) {
+        if (topicFilter == null || topic == null) {
+            return false;
+        }
+
+        String[] filterTokens = topicFilter.split("/");
+        String[] topicTokens = topic.split("/");
+        if (filterTokens.length > topicTokens.length) {
+            return false;
+        }
+
+        for (int i = 0; i < filterTokens.length; i++) {
+            if (filterTokens[i].equals("#")) {
+                // '#' must be the last character
+                return ((i + 1) == filterTokens.length);
+            }
+
+            if (!(filterTokens[i].equals(topicTokens[i]) || filterTokens[i].equals("+"))) {
+                return false;
+            }
+        }
+
+        return (filterTokens.length == topicTokens.length);
+    }
+
+    public void dispatch(final AWSIotMessage message) {
+        boolean matches = false;
+
+        for (String topicFilter : subscriptions.keySet()) {
+            if (topicFilterMatch(topicFilter, message.getTopic())) {
+                final AWSIotTopic topic = subscriptions.get(topicFilter);
+                scheduleTask(new Runnable() {
+                    @Override
+                    public void run() {
+                        topic.onMessage(message);
+                    }
+                });
+                matches = true;
+            }
+        }
+
+        if (!matches) {
+            LOGGER.warning("Unexpected message received from topic " + message.getTopic());
         }
     }
 

diff --git a/...k-java/src/main/java/com/amazonaws/services/iot/client/mqtt/AwsIotMqttClientListener.java b/...k-java/src/main/java/com/amazonaws/services/iot/client/mqtt/AwsIotMqttClientListener.java
@@ -52,14 +52,8 @@ public void deliveryComplete(IMqttDeliveryToken arg0) {
 
     @Override
     public void messageArrived(String topic, MqttMessage arg1) throws Exception {
-        final AWSIotMessage message = new AWSIotMessage(topic, AWSIotQos.valueOf(arg1.getQos()), arg1.getPayload());
-
-        client.scheduleTask(new Runnable() {
-            @Override
-            public void run() {
-                client.dispatch(message);
-            }
-        });
+        AWSIotMessage message = new AWSIotMessage(topic, AWSIotQos.valueOf(arg1.getQos()), arg1.getPayload());
+        client.dispatch(message);
     }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-iot-device-sdk-java-pom</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <packaging>pom</packaging>
   <name>AWS IoT Device SDK for Java</name>
   <description>The AWS IoT Device SDK for Java provides Java APIs for devices to connect to AWS IoT service using the MQTT protocol. The SDK also provides support for AWS IoT specific features, such as Thing Shadow and Thing Shadow abstraction.</description>