Boxed types in SDK structures (#6)

* Imported SDK from generator with boxed integral types

* Fixed long literals that upset boxed Long

* PR Feedback, removed version finagling from shadow sample

Author: justinboswell

samples/Jobs/src/main/java/jobs/JobsSample.java

@@ -252,7 +252,7 @@ public void onConnectionResumed(boolean sessionPresent) {
                 publishRequest.thingName = thingName;
                 publishRequest.jobId = jobId;
                 publishRequest.includeJobDocument = true;
-                publishRequest.executionNumber = 1;
+                publishRequest.executionNumber = 1L;
                 jobs.PublishDescribeJobExecution(publishRequest);
                 gotResponse.get();
             }
@@ -270,7 +270,7 @@ public void onConnectionResumed(boolean sessionPresent) {
 
                     StartNextPendingJobExecutionRequest publishRequest = new StartNextPendingJobExecutionRequest();
                     publishRequest.thingName = thingName;
-                    publishRequest.stepTimeoutInMinutes = 15;
+                    publishRequest.stepTimeoutInMinutes = 15L;
                     jobs.PublishStartNextPendingJobExecution(publishRequest);
 
                     gotResponse.get();

samples/Shadow/src/main/java/jobs/ShadowSample.java

@@ -56,7 +56,6 @@ public class ShadowSample {
     static MqttConnection connection;
     static IotShadowClient shadow;
     static String localValue = null;
-    static int shadowVersion = 1;
     static CompletableFuture<Void> gotResponse;
 
     static void printUsage() {
@@ -124,7 +123,6 @@ static void parseCommandLine(String[] args) {
     static void onGetShadowAccepted(GetShadowResponse response) {
         System.out.println("Received initial shadow state");
 
-        shadowVersion = response.version;
         if (response.state != null && localValue == null) {
             gotResponse.complete(null);
             if (response.state.delta != null) {
@@ -158,7 +156,6 @@ static void onGetShadowRejected(ErrorResponse response) {
 
     static void onShadowDeltaUpdated(ShadowDeltaUpdatedEvent response) {
         System.out.println("Shadow delta updated");
-        shadowVersion = response.version;
         if (response.state != null && response.state.containsKey(SHADOW_PROPERTY)) {
             String value = response.state.get(SHADOW_PROPERTY).toString();
             System.out.println("  Delta wants to change value to '" + value + "'. Changing local value...");
@@ -171,7 +168,6 @@ static void onShadowDeltaUpdated(ShadowDeltaUpdatedEvent response) {
     static void onUpdateShadowAccepted(UpdateShadowResponse response) {
         String value = response.state.reported.get(SHADOW_PROPERTY).toString();
         System.out.println("Shadow updated, value is " + value);
-        shadowVersion = response.version;
         gotResponse.complete(null);
     }
 
@@ -195,7 +191,6 @@ static CompletableFuture<Void> changeShadowValue(String value) {
         // build a request to let the service know our current value and desired value, and that we only want
         // to update if the version matches the version we know about
         UpdateShadowRequest request = new UpdateShadowRequest();
-        request.version = shadowVersion;
         request.thingName = thingName;
         request.state = new ShadowState();
         request.state.reported = new HashMap<String, Object>() {{
@@ -295,7 +290,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             String newValue = "";
             Scanner scanner = new Scanner(System.in);
             while (true) {
-                System.out.print(SHADOW_PROPERTY + "(" + shadowVersion + ")> ");
+                System.out.print(SHADOW_PROPERTY + "> ");
                 System.out.flush();
                 newValue = scanner.next();
                 if (newValue.compareToIgnoreCase("quit") == 0) {

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

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

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

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

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

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

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

@@ -21,8 +21,8 @@
 
 public class JobExecutionSummary {
     public Timestamp lastUpdatedAt;
-    public long executionNumber;
-    public int versionNumber;
+    public Long executionNumber;
+    public Integer versionNumber;
     public String jobId;
     public Timestamp startedAt;
     public Timestamp queuedAt;

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

@@ -23,5 +23,5 @@ public class StartNextPendingJobExecutionRequest {
     public String clientToken;
     public String thingName;
     public HashMap<String, String> statusDetails;
-    public long stepTimeoutInMinutes;
+    public Long stepTimeoutInMinutes;
 }

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

@@ -22,11 +22,11 @@
 
 public class UpdateJobExecutionRequest {
     public String thingName;
-    public int expectedVersion;
-    public long executionNumber;
-    public boolean includeJobDocument;
+    public Integer expectedVersion;
+    public Long executionNumber;
+    public Boolean includeJobDocument;
     public HashMap<String, String> statusDetails;
-    public boolean includeJobExecutionState;
+    public Boolean includeJobExecutionState;
     public JobStatus status;
     public String jobId;
     public String clientToken;

sdk/src/main/java/software/amazon/awssdk/iot/iotshadow/model/DeleteShadowResponse.java

@@ -21,5 +21,5 @@
 
 public class DeleteShadowResponse {
     public Timestamp timestamp;
-    public int version;
+    public Integer version;
 }

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

@@ -23,5 +23,5 @@ public class ErrorResponse {
     public String message;
     public String clientToken;
     public Timestamp timestamp;
-    public int code;
+    public Integer code;
 }