Backport union types for pre-smithy services from smithy models into codegen customizations. (#3135)

Author: millems

.changes/next-release/feature-AWSSDKforJavav2-6c20b9b.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "feature", 
+    "description": "Extend union type improvements to additional services: dynamodb, dynamodbstreams, iot, sagemaker, clouddirectory, iotanalytics, kendra, marketplaceentitlement, quicksight, s3, xray."
+}

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

@@ -204,6 +204,10 @@ private void preprocessModifyShapeMembers(ServiceModel serviceModel, Shape shape
                 shape.getMembers().putAll(injects);
             }
         }
+
+        if (modifier.isUnion() != null) {
+            shape.setUnion(modifier.isUnion());
+        }
     }
 
     private void doModifyShapeMembers(ServiceModel serviceModel, Shape shape, String memberToModify,

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeModifier.java

@@ -30,6 +30,7 @@ public class ShapeModifier {
     private List<Map<String, ModifyModelShapeModifier>> modify;
     private List<Map<String, Member>> inject;
     private Integer staxTargetDepthOffset;
+    private Boolean union;
 
     /**
      * @return true if the whole shape should be excluded.
@@ -87,4 +88,12 @@ public Integer getStaxTargetDepthOffset() {
     public void setStaxTargetDepthOffset(Integer staxTargetDepthOffset) {
         this.staxTargetDepthOffset = staxTargetDepthOffset;
     }
+
+    public Boolean isUnion() {
+        return union;
+    }
+
+    public void setUnion(Boolean union) {
+        this.union = union;
+    }
 }

services/clouddirectory/src/main/resources/codegen-resources/customization.config

@@ -4,5 +4,10 @@
         "listDirectories",
         "listManagedSchemaArns",
         "listPublishedSchemaArns"
-    ]
+    ],
+    "shapeModifiers": {
+        "TypedAttributeValue": {
+            "union": true
+        }
+    }
 }

services/dynamodb/src/main/resources/codegen-resources/dynamodb/customization.config

@@ -8,7 +8,8 @@
                     "emitPropertyName": "NUL"
                 }
             }
-        ]
+        ],
+        "union": true
     }
   },
   "verifiedSimpleMethods" : [

services/dynamodb/src/main/resources/codegen-resources/dynamodbstreams/customization.config

@@ -8,7 +8,8 @@
                       "emitPropertyName": "NUL"
                   }
               }
-          ]
+          ],
+          "union": true
       }
     },
     "sdkModeledExceptionBaseClassName": "DynamoDbException",

services/iot/src/main/resources/codegen-resources/customization.config

@@ -49,5 +49,10 @@
     "DetachPrincipalPolicy",
     "ListPolicyPrincipals",
     "ListPrincipalPolicies"
-  ]
+  ],
+  "shapeModifiers": {
+    "AssetPropertyVariant": {
+      "union": true
+    }
+  }
 }

services/iotanalytics/src/main/resources/codegen-resources/customization.config

@@ -7,5 +7,10 @@
   ],
   "blacklistedSimpleMethods": [
     "describeLoggingOptions"
-  ]
+  ],
+  "shapeModifiers": {
+    "DatastoreStorage": {
+      "union": true
+    }
+  }
 }

services/kendra/src/main/resources/codegen-resources/customization.config

@@ -0,0 +1,7 @@
+{
+  "shapeModifiers": {
+    "DocumentAttributeValue": {
+      "union": true
+    }
+  }
+}

services/marketplaceentitlement/src/main/resources/codegen-resources/customization.config

@@ -0,0 +1,7 @@
+{
+  "shapeModifiers": {
+    "EntitlementValue": {
+      "union": true
+    }
+  }
+}

services/quicksight/src/main/resources/codegen-resources/customization.config

@@ -134,6 +134,15 @@
                     }
                 }
             ]
+        },
+        "TransformOperation": {
+            "union": true
+        },
+        "PhysicalTable": {
+            "union": true
+        },
+        "DataSourceParameters": {
+            "union": true
         }
     }
 }

services/s3/src/main/resources/codegen-resources/customization.config

@@ -111,6 +111,18 @@
           "suffix": { "emitEnumValue": "Suffix" }
         }
       ]
+    },
+    "ReplicationRuleFilter": {
+      "union": true
+    },
+    "MetricsFilter": {
+      "union": true
+    },
+    "AnalyticsFilter": {
+      "union": true
+    },
+    "LifecycleRuleFilter": {
+      "union": true
     }
   },
   "serviceConfig": {

services/sagemaker/src/main/resources/codegen-resources/customization.config

@@ -15,5 +15,10 @@
         "listTrainingJobs",
         "listTransformJobs",
         "listWorkteams"
-    ]
+    ],
+    "shapeModifiers": {
+        "TrialComponentParameterValue": {
+            "union": true
+        }
+    }
 }

services/xray/src/main/resources/codegen-resources/customization.config

@@ -8,5 +8,10 @@
   "blacklistedSimpleMethods": [
     "deleteSamplingRule",
     "getGroup"
-  ]
+  ],
+  "shapeModifiers": {
+    "AnnotationValue": {
+      "union": true
+    }
+  }
 }