Apply changes to existing clients

Author: sfodagain

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

@@ -83,6 +83,16 @@ public void close() {
         this.rrClient = null;
     }
 
+    private NextJobExecutionChangedEvent createNextJobExecutionChangedEvent(IncomingPublishEvent publishEvent) {
+        String payload = new String(publishEvent.getPayload(), StandardCharsets.UTF_8);
+        return this.gson.fromJson(payload, NextJobExecutionChangedEvent.class);
+    }
+
+    private JobExecutionsChangedEvent createJobExecutionsChangedEvent(IncomingPublishEvent publishEvent) {
+        String payload = new String(publishEvent.getPayload(), StandardCharsets.UTF_8);
+        return this.gson.fromJson(payload, JobExecutionsChangedEvent.class);
+    }
+
     /**
      * Gets detailed information about a job execution.
      *
@@ -364,8 +374,7 @@ public StreamingOperation createJobExecutionsChangedStream(JobExecutionsChangedS
             .withSubscriptionStatusEventCallback(options.subscriptionEventHandler())
             .withIncomingPublishEventCallback((event) -> {
                 try {
-                    String payload = new String(event.getPayload(), StandardCharsets.UTF_8);
-                    JobExecutionsChangedEvent response = this.gson.fromJson(payload, JobExecutionsChangedEvent.class);
+                    JobExecutionsChangedEvent response = createJobExecutionsChangedEvent(event);
                     options.streamEventHandler().accept(response);
                 } catch (Exception e) {
                     V2DeserializationFailureEvent failureEvent = V2DeserializationFailureEvent.builder()
@@ -406,8 +415,7 @@ public StreamingOperation createNextJobExecutionChangedStream(NextJobExecutionCh
             .withSubscriptionStatusEventCallback(options.subscriptionEventHandler())
             .withIncomingPublishEventCallback((event) -> {
                 try {
-                    String payload = new String(event.getPayload(), StandardCharsets.UTF_8);
-                    NextJobExecutionChangedEvent response = this.gson.fromJson(payload, NextJobExecutionChangedEvent.class);
+                    NextJobExecutionChangedEvent response = createNextJobExecutionChangedEvent(event);
                     options.streamEventHandler().accept(response);
                 } catch (Exception e) {
                     V2DeserializationFailureEvent failureEvent = V2DeserializationFailureEvent.builder()

sdk/src/main/java/software/amazon/awssdk/iot/iotshadow/IotShadowV2Client.java

@@ -83,6 +83,16 @@ public void close() {
         this.rrClient = null;
     }
 
+    private ShadowUpdatedEvent createShadowUpdatedEvent(IncomingPublishEvent publishEvent) {
+        String payload = new String(publishEvent.getPayload(), StandardCharsets.UTF_8);
+        return this.gson.fromJson(payload, ShadowUpdatedEvent.class);
+    }
+
+    private ShadowDeltaUpdatedEvent createShadowDeltaUpdatedEvent(IncomingPublishEvent publishEvent) {
+        String payload = new String(publishEvent.getPayload(), StandardCharsets.UTF_8);
+        return this.gson.fromJson(payload, ShadowDeltaUpdatedEvent.class);
+    }
+
     /**
      * Deletes a named shadow for an AWS IoT thing.
      *
@@ -504,8 +514,7 @@ public StreamingOperation createNamedShadowDeltaUpdatedStream(NamedShadowDeltaUp
             .withSubscriptionStatusEventCallback(options.subscriptionEventHandler())
             .withIncomingPublishEventCallback((event) -> {
                 try {
-                    String payload = new String(event.getPayload(), StandardCharsets.UTF_8);
-                    ShadowDeltaUpdatedEvent response = this.gson.fromJson(payload, ShadowDeltaUpdatedEvent.class);
+                    ShadowDeltaUpdatedEvent response = createShadowDeltaUpdatedEvent(event);
                     options.streamEventHandler().accept(response);
                 } catch (Exception e) {
                     V2DeserializationFailureEvent failureEvent = V2DeserializationFailureEvent.builder()
@@ -551,8 +560,7 @@ public StreamingOperation createNamedShadowUpdatedStream(NamedShadowUpdatedSubsc
             .withSubscriptionStatusEventCallback(options.subscriptionEventHandler())
             .withIncomingPublishEventCallback((event) -> {
                 try {
-                    String payload = new String(event.getPayload(), StandardCharsets.UTF_8);
-                    ShadowUpdatedEvent response = this.gson.fromJson(payload, ShadowUpdatedEvent.class);
+                    ShadowUpdatedEvent response = createShadowUpdatedEvent(event);
                     options.streamEventHandler().accept(response);
                 } catch (Exception e) {
                     V2DeserializationFailureEvent failureEvent = V2DeserializationFailureEvent.builder()
@@ -593,8 +601,7 @@ public StreamingOperation createShadowDeltaUpdatedStream(ShadowDeltaUpdatedSubsc
             .withSubscriptionStatusEventCallback(options.subscriptionEventHandler())
             .withIncomingPublishEventCallback((event) -> {
                 try {
-                    String payload = new String(event.getPayload(), StandardCharsets.UTF_8);
-                    ShadowDeltaUpdatedEvent response = this.gson.fromJson(payload, ShadowDeltaUpdatedEvent.class);
+                    ShadowDeltaUpdatedEvent response = createShadowDeltaUpdatedEvent(event);
                     options.streamEventHandler().accept(response);
                 } catch (Exception e) {
                     V2DeserializationFailureEvent failureEvent = V2DeserializationFailureEvent.builder()
@@ -635,8 +642,7 @@ public StreamingOperation createShadowUpdatedStream(ShadowUpdatedSubscriptionReq
             .withSubscriptionStatusEventCallback(options.subscriptionEventHandler())
             .withIncomingPublishEventCallback((event) -> {
                 try {
-                    String payload = new String(event.getPayload(), StandardCharsets.UTF_8);
-                    ShadowUpdatedEvent response = this.gson.fromJson(payload, ShadowUpdatedEvent.class);
+                    ShadowUpdatedEvent response = createShadowUpdatedEvent(event);
                     options.streamEventHandler().accept(response);
                 } catch (Exception e) {
                     V2DeserializationFailureEvent failureEvent = V2DeserializationFailureEvent.builder()