MqttMessage now contains qos, retain, dup (#132)

- MqttMessage now contains `qos` and `retain` members. Stop using deprecated methods which passed these as separate params.

- use aws-crt-java v0.10.8

Author: graebm

README.md

@@ -50,7 +50,7 @@ mvn clean install
 ``` sh
 # NOTE: use the latest version of the CRT here
 
-git clone --branch v0.9.2 https://github.com/awslabs/aws-crt-java.git
+git clone --branch v0.10.8 https://github.com/awslabs/aws-crt-java.git
 
 git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git
 cd aws-crt-java
@@ -65,7 +65,7 @@ Supports API 26 or newer.
 NOTE: The shadow sample does not currently complete on android due to its dependence on stdin keyboard input.
 
 ``` sh
-git clone --recursive --branch v0.9.2 https://github.com/awslabs/aws-crt-java.git
+git clone --recursive --branch v0.10.8 https://github.com/awslabs/aws-crt-java.git
 git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git
 cd aws-crt-java/android
 ./gradlew connectedCheck # optional, will run the unit tests on any connected devices/emulators
@@ -86,7 +86,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'software.amazon.awssdk.crt:android:0.9.2'
+    implementation 'software.amazon.awssdk.crt:android:0.10.8'
 }
 ```
 

android/app/build.gradle

@@ -50,7 +50,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(":iotdevicesdk")
-    implementation 'software.amazon.awssdk.crt:android:0.9.2'
+    implementation 'software.amazon.awssdk.crt:android:0.10.8'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core:1.2.0'

android/iotdevicesdk/build.gradle

@@ -87,7 +87,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'software.amazon.awssdk.crt:android:0.9.2'
+    implementation 'software.amazon.awssdk.crt:android:0.10.8'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'

samples/BasicPubSub/src/main/java/pubsub/PubSub.java

@@ -305,7 +305,7 @@ public void onConnectionResumed(boolean sessionPresent) {
 
                 int count = 0;
                 while (count++ < messagesToPublish) {
-                    CompletableFuture<Integer> published = connection.publish(new MqttMessage(topic, message.getBytes()), QualityOfService.AT_LEAST_ONCE, false);
+                    CompletableFuture<Integer> published = connection.publish(new MqttMessage(topic, message.getBytes(), QualityOfService.AT_LEAST_ONCE, false));
                     published.get();
                     Thread.sleep(1000);
                 }

samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java

@@ -193,7 +193,7 @@ public static void main(String[] args) {
 
                     if ("publish".equals(mode) || "both".equals(mode)) {
                         final CompletableFuture<Integer> publishResult = connection.publish(new MqttMessage(topic,
-                                input.getBytes(StandardCharsets.UTF_8)), QualityOfService.AT_MOST_ONCE, false);
+                                input.getBytes(StandardCharsets.UTF_8), QualityOfService.AT_MOST_ONCE, false));
                         Integer result = publishResult.get();
                     }
                 }

samples/PubSubStress/src/main/java/pubsubstress/PubSubStress.java

@@ -372,7 +372,7 @@ public static void main(String[] args) {
                         String publishTopic = validTopics.get(Math.abs(rng.nextInt()) % validTopics.size());
 
                         try {
-                            publishFutures.add(connection.publish(new MqttMessage(publishTopic, messageContent.getBytes()), QualityOfService.AT_LEAST_ONCE, false));
+                            publishFutures.add(connection.publish(new MqttMessage(publishTopic, messageContent.getBytes(), QualityOfService.AT_LEAST_ONCE, false)));
                         } catch (Exception e) {
                             System.out.println(String.format("Publishing Exception: %s", e.getMessage()));
                         }

samples/RawPubSub/src/main/java/rawpubsub/RawPubSub.java

@@ -230,7 +230,7 @@ public void onConnectionResumed(boolean sessionPresent) {
 
                     int count = 0;
                     while (count++ < messagesToPublish) {
-                        CompletableFuture<Integer> published = connection.publish(new MqttMessage(topic, message.getBytes()), QualityOfService.AT_LEAST_ONCE, false);
+                        CompletableFuture<Integer> published = connection.publish(new MqttMessage(topic, message.getBytes(), QualityOfService.AT_LEAST_ONCE, false));
                         published.get();
                         Thread.sleep(1000);
                     }

sdk/pom.xml

@@ -42,7 +42,7 @@
     <dependency>
       <groupId>software.amazon.awssdk.crt</groupId>
       <artifactId>aws-crt</artifactId>
-      <version>0.10.3</version>
+      <version>0.10.8</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java

@@ -90,7 +90,7 @@ protected void releaseNativeHandle() {}
 
     /**
      * Create a new builder with mTLS file paths
-     * 
+     *
      * @param certPath       - Path to certificate, in PEM format
      * @param privateKeyPath - Path to private key, in PEM format
      */
@@ -102,7 +102,7 @@ public static AwsIotMqttConnectionBuilder newMtlsBuilderFromPath(String certPath
 
     /**
      * Create a new builder with mTLS cert pair in memory
-     * 
+     *
      * @param certificate - Certificate, in PEM format
      * @param privateKey  - Private key, in PEM format
      */
@@ -114,7 +114,7 @@ public static AwsIotMqttConnectionBuilder newMtlsBuilder(String certificate, Str
 
     /**
      * Create a new builder with mTLS cert pair in memory
-     * 
+     *
      * @param certificate - Certificate, in PEM format
      * @param privateKey  - Private key, in PEM format
      */
@@ -137,7 +137,7 @@ public static AwsIotMqttConnectionBuilder newDefaultBuilder()
 
     /**
      * Overrides the default system trust store.
-     * 
+     *
      * @param caDirPath  - Only used on Unix-style systems where all trust anchors
      *                    are stored in a directory (e.g. /etc/ssl/certs).
      * @param caFilePath - Single file containing all trust CAs, in PEM format
@@ -150,7 +150,7 @@ public AwsIotMqttConnectionBuilder withCertificateAuthorityFromPath(String caDir
 
     /**
      * Overrides the default system trust store.
-     * 
+     *
      * @param caRoot - Buffer containing all trust CAs, in PEM format
      */
     public AwsIotMqttConnectionBuilder withCertificateAuthority(String caRoot) {
@@ -161,7 +161,7 @@ public AwsIotMqttConnectionBuilder withCertificateAuthority(String caRoot) {
 
     /**
      * Configures the IoT endpoint for connections from this builder.
-     * 
+     *
      * @param endpoint The IoT endpoint to connect to
      */
     public AwsIotMqttConnectionBuilder withEndpoint(String endpoint) {
@@ -172,7 +172,7 @@ public AwsIotMqttConnectionBuilder withEndpoint(String endpoint) {
     /**
      * Configures the port to connect to for connections from this builder.  If not set, 443 will be used for
      * a websocket connection or where ALPN support is available.  Otherwise the default is 8883.
-     * 
+     *
      * @param port The port to connect to on the IoT endpoint. Usually 8883 for
      *             MQTT, or 443 for websockets
      */
@@ -183,7 +183,7 @@ public AwsIotMqttConnectionBuilder withPort(short port) {
 
     /**
      * Configures the client id to use to connect to the IoT Core service.
-     * 
+     *
      * @param clientId The client id for connections from this builder. Needs to be unique across
      *                  all devices/clients.
      */
@@ -195,7 +195,7 @@ public AwsIotMqttConnectionBuilder withClientId(String clientId) {
     /**
      * Configures whether or not the service should try to resume prior
      * subscriptions, if it has any
-     * 
+     *
      * @param cleanSession true if the session should drop prior subscriptions when
      *                     a connection from this builder is established, false to resume the session
      */
@@ -207,7 +207,7 @@ public AwsIotMqttConnectionBuilder withCleanSession(boolean cleanSession) {
     /**
      * Configures MQTT keep-alive via PING messages. Note that this is not TCP
      * keepalive.
-     * 
+     *
      * @param keepAliveMs How often in milliseconds to send an MQTT PING message to the
      *                   service to keep connections alive
      */
@@ -230,7 +230,7 @@ public AwsIotMqttConnectionBuilder withPingTimeoutMs(int pingTimeoutMs) {
 
     /**
      * Configures the TCP socket connect timeout (in milliseconds)
-     * 
+     *
      * @param timeoutMs TCP socket timeout
      */
     public AwsIotMqttConnectionBuilder withTimeoutMs(int timeoutMs) {
@@ -240,7 +240,7 @@ public AwsIotMqttConnectionBuilder withTimeoutMs(int timeoutMs) {
 
     /**
      * Configures the common settings for the socket to use for connections created by this builder
-     * 
+     *
      * @param socketOptions The socket settings
      */
     public AwsIotMqttConnectionBuilder withSocketOptions(SocketOptions socketOptions) {
@@ -283,19 +283,24 @@ public AwsIotMqttConnectionBuilder withConnectionEventCallbacks(MqttClientConnec
      * disconnects
      *
      * @param message The message to publish as the will. The message contains the
-     *                topic that the message will be published to on disconnect.
-     * @param qos     The {@link QualityOfService} of the will message
-     * @param retain  Whether or not the message should be retained by the mqtt broker to
-     *                be delivered to future subscribers
+     *                topic that the message will be published to on disconnect,
+     *                along with the {@link QualityOfService} that it will be
+     *                published with and whether it will be retained when it is published.
      */
-    public AwsIotMqttConnectionBuilder withWill(MqttMessage message, QualityOfService qos, boolean retain) throws MqttException {
+    public AwsIotMqttConnectionBuilder withWill(MqttMessage message) throws MqttException {
         this.config.setWillMessage(message);
-        this.config.setWillQos(qos);
-        this.config.setWillRetain(retain);
 
         return this;
     }
 
+    /**
+     * @deprecated Use alternate withWill(). QoS and retain are now set directly on the {@link MqttMessage}
+     */
+    @Deprecated
+    public AwsIotMqttConnectionBuilder withWill(MqttMessage message, QualityOfService qos, boolean retain) throws MqttException {
+        return withWill(new MqttMessage(message.getTopic(), message.getPayload(), qos, retain));
+    }
+
     /**
      * Configures the client bootstrap to use for connections created by this builder
      *