Merge pull request #3519 from aws/staging/4dd720f1-8e2c-4099-82bd-de1…

…05e4d3d67

Pull request: release <- staging/4dd720f1-8e2c-4099-82bd-de105e4d3d67

.changes/2.29.33.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.29.33",
+    "date": "2024-12-12",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Database Migration Service",
+            "contributor": "",
+            "description": "Add parameters to support for kerberos authentication. Add parameter for disabling the Unicode source filter with PostgreSQL settings. Add parameter to use large integer value with Kinesis/Kafka settings."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Glue",
+            "contributor": "",
+            "description": "To support customer-managed encryption in Data Quality to allow customers encrypt data with their own KMS key, we will add a DataQualityEncryption field to the SecurityConfiguration API where customers can provide their KMS keys."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Connect Service",
+            "contributor": "",
+            "description": "Configure holidays and other overrides to hours of operation in advance. During contact handling, Amazon Connect automatically checks for overrides and provides customers with an appropriate flow path. After an override period passes call center automatically reverts to standard hours of operation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon GuardDuty",
+            "contributor": "",
+            "description": "Improved descriptions for certain APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Route 53 Domains",
+            "contributor": "",
+            "description": "This release includes the following API updates: added the enumeration type RESTORE_DOMAIN to the OperationType; constrained the Price attribute to non-negative values; updated the LangCode to allow 2 or 3 alphabetical characters."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,4 +1,29 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.29.33__ __2024-12-12__
+## __AWS Database Migration Service__
+  - ### Features
+    - Add parameters to support for kerberos authentication. Add parameter for disabling the Unicode source filter with PostgreSQL settings. Add parameter to use large integer value with Kinesis/Kafka settings.
+
+## __AWS Glue__
+  - ### Features
+    - To support customer-managed encryption in Data Quality to allow customers encrypt data with their own KMS key, we will add a DataQualityEncryption field to the SecurityConfiguration API where customers can provide their KMS keys.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __Amazon Connect Service__
+  - ### Features
+    - Configure holidays and other overrides to hours of operation in advance. During contact handling, Amazon Connect automatically checks for overrides and provides customers with an appropriate flow path. After an override period passes call center automatically reverts to standard hours of operation.
+
+## __Amazon GuardDuty__
+  - ### Features
+    - Improved descriptions for certain APIs.
+
+## __Amazon Route 53 Domains__
+  - ### Features
+    - This release includes the following API updates: added the enumeration type RESTORE_DOMAIN to the OperationType; constrained the Price attribute to non-negative values; updated the LangCode to allow 2 or 3 alphabetical characters.
+
 # __2.29.32__ __2024-12-11__
 ## __AWS Artifact__
   - ### Features

README.md

@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.29.32</version>
+      <version>2.29.33</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.29.32</version>
+  <version>2.29.33</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.29.32</version>
+  <version>2.29.33</version>
 </dependency>
 ```
 
@@ -102,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.29.32</version>
+  <version>2.29.33</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle-logging-bridge/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

bundle-sdk/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.29.32</version>
+        <version>2.29.33</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java

@@ -113,6 +113,8 @@ public TypeSpec poetSpec() {
                                                .addMethod(addModifier(sdkFieldNameToFieldMethod(), FINAL))
                                                .addTypes(nestedModelClassTypes());
 
+        shapeModelSpec.additionalMethods().forEach(specBuilder::addMethod);
+
         if (shapeModel.isUnion()) {
             specBuilder.addField(unionTypeField());
         }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java

@@ -18,6 +18,7 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.WildcardTypeName;
 import java.util.ArrayList;
@@ -128,7 +129,7 @@ public Iterable<FieldSpec> staticFields(Modifier... modifiers) {
                                                                sdkFieldType),
                                      "SDK_NAME_TO_FIELD",
                                      Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
-                       .initializer(memberNameToFieldInitializer(nameToField))
+                       .initializer(memberNameToFieldInitializer())
                        .build());
         return fields;
     }
@@ -150,6 +151,22 @@ private CodeBlock sdkFieldInitializer(MemberModel m) {
                         .build();
     }
 
+    public List<MethodSpec> additionalMethods() {
+        return Collections.singletonList(memberNameToFieldInitializerMethod(nameToField()));
+    }
+
+    public Map<String, String> nameToField() {
+        Map<String, String> nameToField = new LinkedHashMap<>();
+        shapeModel.getNonStreamingMembers().stream()
+                  .filter(m -> m.getShape() == null || m.getShape().getShapeType() != ShapeType.Exception)
+                  .filter(m -> !m.isSynthetic())
+                  .forEach(m -> {
+                      String name = m.getHttp().getMarshallLocationName();
+                      nameToField.put(name, namingStrategy.getSdkFieldFieldName(m));
+                  });
+        return nameToField;
+    }
+
     private CodeBlock containerSdkFieldInitializer(MemberModel m) {
         ClassName sdkFieldType = ClassName.get(SdkField.class);
         return CodeBlock.builder()
@@ -392,18 +409,29 @@ private CodeBlock sdkFieldsInitializer(List<FieldSpec> fields) {
         return builder.build();
     }
 
-    private CodeBlock memberNameToFieldInitializer(Map<String, String> nameToField) {
-        CodeBlock.Builder builder = CodeBlock.builder();
+    private CodeBlock memberNameToFieldInitializer() {
+        return CodeBlock.builder()
+                        .add("memberNameToFieldInitializer()")
+                        .build();
+    }
+
+    private MethodSpec memberNameToFieldInitializerMethod(Map<String, String> nameToField) {
+        ParameterizedTypeName sdkFieldT = ParameterizedTypeName.get(ClassName.get(SdkField.class),
+                                                                    WildcardTypeName.subtypeOf(Object.class));
+        ParameterizedTypeName mapT = ParameterizedTypeName.get(ClassName.get(Map.class), ClassName.get(String.class),
+                                                               sdkFieldT);
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("memberNameToFieldInitializer")
+            .addModifiers(Modifier.PRIVATE, Modifier.STATIC)
+            .returns(mapT);
+
         if (nameToField.isEmpty()) {
-            builder.add("$T.emptyMap()", Collections.class);
-            return builder.build();
+            builder.addStatement("return $T.emptyMap()", Collections.class);
+        } else {
+            builder.addStatement("$T map = new $T<>()", mapT, HashMap.class);
+            nameToField.forEach((name, field) -> builder.addStatement("map.put($S, $L)", name, field));
+            builder.addStatement("return $T.unmodifiableMap(map)", Collections.class);
         }
-        builder.add("$T.unmodifiableMap(", Collections.class);
-        builder.add("new $T<$T, $T<?>>() {{\n", HashMap.class, String.class, SdkField.class);
-        nameToField.forEach((name, field) -> builder.add("put($S, $L);\n", name, field));
-        builder.add("}}");
-        builder.add(")");
+
         return builder.build();
     }
-
 }