Add new constructors for MQTT5 packet builders (#745)

samples/mqtt5/src/main/java/com/example/mqtt5/Mqtt5Sample.java

@@ -171,10 +171,7 @@ public void accept(Mqtt5WebsocketHandshakeTransformArgs t) {
             ConnectPacketBuilder connectBuilder = new ConnectPacketBuilder();
             connectBuilder.withClientId(clientID);
             // Add a will
-            PublishPacketBuilder willBuilder = new PublishPacketBuilder();
-            willBuilder.withTopic("test/topic/will");
-            willBuilder.withPayload("Goodbye".getBytes());
-            willBuilder.withQOS(QOS.AT_MOST_ONCE);
+            PublishPacketBuilder willBuilder = new PublishPacketBuilder("test/topic/will", QOS.AT_MOST_ONCE, "Goodbye".getBytes());
             connectBuilder.withWill(willBuilder.build());
             // Add the connection options
             optionsBuilder.withConnectOptions(connectBuilder.build());
@@ -192,8 +189,7 @@ public void accept(Mqtt5WebsocketHandshakeTransformArgs t) {
                 }
 
                 // Subscribe
-                SubscribePacketBuilder subscribePacketBuilder = new SubscribePacketBuilder();
-                subscribePacketBuilder.withSubscription("test/topic", QOS.AT_LEAST_ONCE);
+                SubscribePacketBuilder subscribePacketBuilder = new SubscribePacketBuilder("test/topic", QOS.AT_LEAST_ONCE);
                 // Make sure it is successful
                 try {
                     SubAckPacket subAckPacket = client.subscribe(subscribePacketBuilder.build()).get(60, TimeUnit.SECONDS);
@@ -209,10 +205,7 @@ public void accept(Mqtt5WebsocketHandshakeTransformArgs t) {
                 }
 
                 // Publish
-                PublishPacketBuilder publishPacketBuilder = new PublishPacketBuilder();
-                publishPacketBuilder.withPayload("Hello World!".getBytes());
-                publishPacketBuilder.withQOS(QOS.AT_LEAST_ONCE);
-                publishPacketBuilder.withTopic("test/topic");
+                PublishPacketBuilder publishPacketBuilder = new PublishPacketBuilder("test/topic", QOS.AT_LEAST_ONCE, "Hello World!".getBytes());
                 // Add user properties
                 List<UserProperty> publishProperties = new ArrayList<UserProperty>();
                 publishProperties.add(new UserProperty("Red", "Blue"));
@@ -231,8 +224,7 @@ public void accept(Mqtt5WebsocketHandshakeTransformArgs t) {
                 }
 
                 // Unsubscribe
-                UnsubscribePacketBuilder unsubscribePacketBuilder = new UnsubscribePacketBuilder();
-                unsubscribePacketBuilder.withSubscription("test/topic");
+                UnsubscribePacketBuilder unsubscribePacketBuilder = new UnsubscribePacketBuilder("test/topic");
                 // Make sure it is successful
                 try {
                     client.unsubscribe(unsubscribePacketBuilder.build()).get(60, TimeUnit.SECONDS);

src/main/java/software/amazon/awssdk/crt/mqtt5/packets/PublishPacket.java

@@ -449,6 +449,19 @@ public PublishPacketBuilder withUserProperties(List<UserProperty> userProperties
          */
         public PublishPacketBuilder() {}
 
+        /**
+         * Creates a new PublishPacketBuilder with common parameters set.
+         *
+         * @param topic The topic this message should be published to.
+         * @param packetQOS The MQTT quality of service level the message should be delivered with.
+         * @param payload The payload for the publish message.
+         */
+        public PublishPacketBuilder(String topic, QOS packetQOS, byte[] payload) {
+            this.topic = topic;
+            this.packetQOS = packetQOS;
+            this.payload = payload;
+        }
+
         /**
          * Creates a new PublishPacket using the settings set in the builder.
          *

src/main/java/software/amazon/awssdk/crt/mqtt5/packets/SubscribePacket.java

@@ -307,6 +307,25 @@ public SubscribePacketBuilder withUserProperties(List<UserProperty> userProperti
          */
         public SubscribePacketBuilder() {}
 
+        /**
+         * Creates a new SubscribePacketBuilder with one subscription defined.
+         *
+         * @param subscription The subscription to add within the SubscribePacket.
+         */
+        public SubscribePacketBuilder(Subscription subscription) {
+            withSubscription(subscription);
+        }
+
+        /**
+         * Creates a new SubscribePacketBuilder with one subscription defined.
+         *
+         * @param topicFilter The topic filter to subscribe to.
+         * @param qos The maximum QoS on which the subscriber will accept publish messages.
+         */
+        public SubscribePacketBuilder(String topicFilter, QOS qos) {
+            withSubscription(new Subscription(topicFilter, qos));
+        }
+
         /**
          * Creates a new SUBSCRIBE packet using the settings set in the builder.
          * @return The SubscribePacket created from the builder

src/main/java/software/amazon/awssdk/crt/mqtt5/packets/UnsubscribePacket.java

@@ -51,14 +51,15 @@ static final public class UnsubscribePacketBuilder {
 
         /**
          * Sets a single topic filter that the client wishes to unsubscribe from.
-         * @param subscription A single topic filter that the client wishes to unsubscribe from
+         *
+         * @param topicFilter A single topic filter that the client wishes to unsubscribe from.
          * @return The UnsubscribePacketBuilder after setting the subscription.
          */
-        public UnsubscribePacketBuilder withSubscription(String subscription) {
+        public UnsubscribePacketBuilder withSubscription(String topicFilter) {
             if (this.subscriptions == null) {
                 this.subscriptions = new ArrayList<String>();
             }
-            this.subscriptions.add(subscription);
+            this.subscriptions.add(topicFilter);
             return this;
         }
 
@@ -80,6 +81,15 @@ public UnsubscribePacketBuilder withUserProperties(List<UserProperty> userProper
          */
         public UnsubscribePacketBuilder() {}
 
+        /**
+         * Creates a new UnsubscribePacketBuilder with one subscription defined.
+         *
+         * @param topicFilter A single topic filter that the client wishes to unsubscribe from.
+         */
+        public UnsubscribePacketBuilder(String topicFilter) {
+            withSubscription(topicFilter);
+        }
+
         /**
          * Creates a new UnsubscribePacket using the settings set in the builder.
          * @return The UnsubscribePacket created from the builder