Named shadow (#62)

* Updated CRT dependency to v0.5.9

* NamedShadow import

Author: Justin Boswell

sdk/pom.xml

@@ -41,7 +41,7 @@
     <dependency>
       <groupId>software.amazon.awssdk.crt</groupId>
       <artifactId>aws-crt</artifactId>
-      <version>0.5.7</version>
+      <version>0.5.9</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

sdk/src/main/java/software/amazon/awssdk/iot/iotidentity/model/CreateKeysAndCertificateResponse.java

@@ -19,7 +19,7 @@
 
 public class CreateKeysAndCertificateResponse {
     public String certificateId;
-    public String privateKey;
     public String certificateOwnershipToken;
     public String certificatePem;
+    public String privateKey;
 }

sdk/src/main/java/software/amazon/awssdk/iot/iotidentity/model/ErrorResponse.java

@@ -18,7 +18,7 @@
 
 
 public class ErrorResponse {
-    public String errorCode;
     public Integer statusCode;
     public String errorMessage;
+    public String errorCode;
 }

sdk/src/main/java/software/amazon/awssdk/iot/iotidentity/model/RegisterThingRequest.java

@@ -19,7 +19,7 @@
 import java.util.HashMap;
 
 public class RegisterThingRequest {
-    public HashMap<String, String> parameters;
     public String templateName;
+    public HashMap<String, String> parameters;
     public String certificateOwnershipToken;
 }

sdk/src/main/java/software/amazon/awssdk/iot/iotidentity/model/RegisterThingResponse.java

@@ -19,6 +19,6 @@
 import java.util.HashMap;
 
 public class RegisterThingResponse {
-    public HashMap<String, String> deviceConfiguration;
     public String thingName;
+    public HashMap<String, String> deviceConfiguration;
 }

sdk/src/main/java/software/amazon/awssdk/iot/iotjobs/IotJobsClient.java

@@ -224,18 +224,18 @@ public CompletableFuture<Integer> SubscribeToUpdateJobExecutionRejected(
         Consumer<RejectedError> handler,
         Consumer<Exception> exceptionHandler) {
         String topic = "$aws/things/{thingName}/jobs/{jobId}/update/rejected";
-        if (request.thingName == null) {
-            CompletableFuture<Integer> result = new CompletableFuture<Integer>();
-            result.completeExceptionally(new MqttException("UpdateJobExecutionSubscriptionRequest must have a non-null thingName"));
-            return result;
-        }
-        topic = topic.replace("{thingName}", request.thingName);
         if (request.jobId == null) {
             CompletableFuture<Integer> result = new CompletableFuture<Integer>();
             result.completeExceptionally(new MqttException("UpdateJobExecutionSubscriptionRequest must have a non-null jobId"));
             return result;
         }
         topic = topic.replace("{jobId}", request.jobId);
+        if (request.thingName == null) {
+            CompletableFuture<Integer> result = new CompletableFuture<Integer>();
+            result.completeExceptionally(new MqttException("UpdateJobExecutionSubscriptionRequest must have a non-null thingName"));
+            return result;
+        }
+        topic = topic.replace("{thingName}", request.thingName);
         Consumer<MqttMessage> messageHandler = (message) -> {
             try {
                 String payload = new String(message.getPayload(), StandardCharsets.UTF_8);
@@ -263,18 +263,18 @@ public CompletableFuture<Integer> SubscribeToUpdateJobExecutionAccepted(
         Consumer<UpdateJobExecutionResponse> handler,
         Consumer<Exception> exceptionHandler) {
         String topic = "$aws/things/{thingName}/jobs/{jobId}/update/accepted";
-        if (request.thingName == null) {
-            CompletableFuture<Integer> result = new CompletableFuture<Integer>();
-            result.completeExceptionally(new MqttException("UpdateJobExecutionSubscriptionRequest must have a non-null thingName"));
-            return result;
-        }
-        topic = topic.replace("{thingName}", request.thingName);
         if (request.jobId == null) {
             CompletableFuture<Integer> result = new CompletableFuture<Integer>();
             result.completeExceptionally(new MqttException("UpdateJobExecutionSubscriptionRequest must have a non-null jobId"));
             return result;
         }
         topic = topic.replace("{jobId}", request.jobId);
+        if (request.thingName == null) {
+            CompletableFuture<Integer> result = new CompletableFuture<Integer>();
+            result.completeExceptionally(new MqttException("UpdateJobExecutionSubscriptionRequest must have a non-null thingName"));
+            return result;
+        }
+        topic = topic.replace("{thingName}", request.thingName);
         Consumer<MqttMessage> messageHandler = (message) -> {
             try {
                 String payload = new String(message.getPayload(), StandardCharsets.UTF_8);
@@ -489,18 +489,18 @@ public CompletableFuture<Integer> PublishDescribeJobExecution(
         DescribeJobExecutionRequest request,
         QualityOfService qos) {
         String topic = "$aws/things/{thingName}/jobs/{jobId}/get";
-        if (request.jobId == null) {
-            CompletableFuture<Integer> result = new CompletableFuture<Integer>();
-            result.completeExceptionally(new MqttException("DescribeJobExecutionRequest must have a non-null jobId"));
-            return result;
-        }
-        topic = topic.replace("{jobId}", request.jobId);
         if (request.thingName == null) {
             CompletableFuture<Integer> result = new CompletableFuture<Integer>();
             result.completeExceptionally(new MqttException("DescribeJobExecutionRequest must have a non-null thingName"));
             return result;
         }
         topic = topic.replace("{thingName}", request.thingName);
+        if (request.jobId == null) {
+            CompletableFuture<Integer> result = new CompletableFuture<Integer>();
+            result.completeExceptionally(new MqttException("DescribeJobExecutionRequest must have a non-null jobId"));
+            return result;
+        }
+        topic = topic.replace("{jobId}", request.jobId);
         String payloadJson = gson.toJson(request);
         MqttMessage message = new MqttMessage(topic, payloadJson.getBytes(StandardCharsets.UTF_8));
         return connection.publish(message, qos, false);

sdk/src/main/java/software/amazon/awssdk/iot/iotjobs/model/DescribeJobExecutionRequest.java

@@ -18,9 +18,9 @@
 
 
 public class DescribeJobExecutionRequest {
+    public Long executionNumber;
+    public String thingName;
     public Boolean includeJobDocument;
     public String jobId;
     public String clientToken;
-    public Long executionNumber;
-    public String thingName;
 }

sdk/src/main/java/software/amazon/awssdk/iot/iotjobs/model/GetPendingJobExecutionsResponse.java

@@ -21,8 +21,8 @@
 import software.amazon.awssdk.iot.iotjobs.model.JobExecutionSummary;
 
 public class GetPendingJobExecutionsResponse {
-    public String clientToken;
     public List<software.amazon.awssdk.iot.iotjobs.model.JobExecutionSummary> queuedJobs;
     public Timestamp timestamp;
+    public String clientToken;
     public List<software.amazon.awssdk.iot.iotjobs.model.JobExecutionSummary> inProgressJobs;
 }

sdk/src/main/java/software/amazon/awssdk/iot/iotjobs/model/JobExecutionData.java

@@ -22,13 +22,13 @@
 
 public class JobExecutionData {
     public String jobId;
-    public String thingName;
     public HashMap<String, Object> jobDocument;
-    public Long executionNumber;
-    public HashMap<String, String> statusDetails;
     public JobStatus status;
     public Integer versionNumber;
     public Timestamp queuedAt;
+    public String thingName;
+    public Long executionNumber;
+    public HashMap<String, String> statusDetails;
     public Timestamp lastUpdatedAt;
     public Timestamp startedAt;
 }

sdk/src/main/java/software/amazon/awssdk/iot/iotjobs/model/JobExecutionState.java

@@ -20,7 +20,7 @@
 import software.amazon.awssdk.iot.iotjobs.model.JobStatus;
 
 public class JobExecutionState {
-    public Integer versionNumber;
     public HashMap<String, String> statusDetails;
+    public Integer versionNumber;
     public JobStatus status;
 }