Deep copy the new event shape

Author: alextwoods

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/EventStreamSharedEventProcessor.java

@@ -15,11 +15,14 @@
 
 package software.amazon.awssdk.codegen.customization.processors;
 
+import java.io.IOException;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
+import software.amazon.awssdk.codegen.internal.Jackson;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.model.service.Member;
@@ -80,14 +83,26 @@ public void preprocess(ServiceModel serviceModel) {
                                       + "customization config duplicateAndRenameSharedEvents.%s",
                                       newShapeName, eventStreamName));
                 }
-                serviceModel.getShapes().put(newShapeName, eventMemberShape);
+                serviceModel.getShapes().put(newShapeName, duplicateShape(eventMemberShape));
                 eventMemberToModify.setShape(newShapeName);
                 log.info("Duplicated and renamed event member on {} from {} -> {}",
                          eventStreamName, shapeToDuplicate, newShapeName);
             }
         }
     }
 
+    private Shape duplicateShape(Shape shape) {
+        StringWriter writer = new StringWriter();
+        try {
+            Jackson.writeWithObjectMapper(shape, writer);
+            Shape duplicated = Jackson.load(Shape.class, writer.toString());
+            duplicated.setSynthetic(true);
+            return duplicated;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static void validateIsEventStream(Shape shape, String name) {
         if (shape == null) {
             throw new IllegalStateException(

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.codegen.model.service;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -352,10 +353,12 @@ public void setRetryable(RetryableTrait retryable) {
         this.retryable = retryable;
     }
 
+    @JsonIgnore
     public boolean isRetryable() {
         return retryable != null;
     }
 
+    @JsonIgnore
     public boolean isThrottling() {
         return retryable != null && retryable.isThrottling();
     }

codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/EventStreamSharedEventProcessorTest.java

@@ -16,6 +16,8 @@
 package software.amazon.awssdk.codegen.customization.processors;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -56,7 +58,10 @@ public void duplicatesAndRenamesSharedEvent() {
 
         Shape newEventShape = serviceModel.getShape("PayloadB");
         assertNotNull(newEventShape);
-        assertEquals(serviceModel.getShape("Payload"), newEventShape);
+        assertNotEquals(serviceModel.getShape("Payload"), newEventShape); // shape is duplicated/deep copied
+        assertTrue(newEventShape.isSynthetic());
+        assertEquals(serviceModel.getShape("Payload").getType(), newEventShape.getType());
+        assertEquals(serviceModel.getShape("Payload").getMembers().keySet(), newEventShape.getMembers().keySet());
 
         Shape streamB = serviceModel.getShape("StreamB");
         assertEquals("PayloadB", streamB.getMembers().get("Payload").getShape());