Add PresignedUrlManager support to code generated S3AsyncClient (#6269)

jencymaryjoseph · web-flow · commit 76ac03e9ba19 · 2025-07-17T13:23:25.000-07:00
* async s3 client codegen changes

* minimised service-2.json
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddMetadata.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddMetadata.java
@@ -62,6 +62,7 @@ public static Metadata constructMetadata(ServiceModel serviceModel,
                 .withDocumentation(serviceModel.getDocumentation())
                 .withServiceAbbreviation(serviceMetadata.getServiceAbbreviation())
                 .withBatchmanagerPackageName(namingStrategy.getBatchManagerPackageName(serviceName))
+                .withPresignedUrlPackageName(namingStrategy.getPresignedUrlPackageName(serviceName))
                 .withServiceFullName(serviceMetadata.getServiceFullName())
                 .withServiceName(serviceName)
                 .withSyncClient(String.format(Constant.SYNC_CLIENT_CLASS_NAME_PATTERN, serviceName))
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java
@@ -78,6 +78,8 @@ public final class Constant {
 
     public static final String PACKAGE_NAME_BATCHMANAGER_PATTERN = "%s.batchmanager";
 
+    public static final String PACKAGE_NAME_PRESIGNEDURL_PATTERN = "%s.presignedurl";
+
     public static final String PACKAGE_NAME_CUSTOM_AUTH_PATTERN = "%s.auth";
 
     public static final String AUTH_POLICY_ENUM_CLASS_DIR = "software/amazon/awssdk/auth/policy/actions";
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
@@ -345,6 +345,11 @@ public class CustomizationConfig {
      */
     private boolean batchManagerSupported;
 
+    /**
+     * A boolean flag to indicate if Presigned URL Manager is supported.
+     */
+    private boolean presignedUrlManagerSupported;
+
     /**
      * A boolean flag to indicate if the fast unmarshaller code path is enabled.
      */
@@ -924,6 +929,14 @@ public void setBatchManagerSupported(boolean batchManagerSupported) {
         this.batchManagerSupported = batchManagerSupported;
     }
 
+    public boolean getPresignedUrlManagerSupported() {
+        return presignedUrlManagerSupported;
+    }
+
+    public void setPresignedUrlManagerSupported(boolean presignedUrlManagerSupported) {
+        this.presignedUrlManagerSupported = presignedUrlManagerSupported;
+    }
+
     public boolean getEnableFastUnmarshaller() {
         return enableFastUnmarshaller;
     }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java
@@ -73,6 +73,8 @@ public class Metadata {
 
     private String batchManagerPackageName;
 
+    private String presignedUrlPackageName;
+
     private String endpointRulesPackageName;
 
     private String authSchemePackageName;
@@ -815,4 +817,20 @@ public String getFullBatchManagerPackageName() {
         return joinPackageNames(rootPackageName, getBatchManagerPackageName());
     }
 
+    public Metadata withPresignedUrlPackageName(String presignedUrlPackageName) {
+        setPresignedUrlPackageName(presignedUrlPackageName);
+        return this;
+    }
+
+    public String getPresignedUrlPackageName() {
+        return presignedUrlPackageName;
+    }
+
+    public void setPresignedUrlPackageName(String presignedUrlPackageName) {
+        this.presignedUrlPackageName = presignedUrlPackageName;
+    }
+
+    public String getFullPresignedUrlPackageName() {
+        return joinPackageNames(rootPackageName, getPresignedUrlPackageName());
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java
@@ -216,6 +216,11 @@ public String getJmesPathPackageName(String serviceName) {
     public String getBatchManagerPackageName(String serviceName) {
         return getCustomizedPackageName(concatServiceNameIfShareModel(serviceName), Constant.PACKAGE_NAME_BATCHMANAGER_PATTERN);
     }
+    
+    @Override
+    public String getPresignedUrlPackageName(String serviceName) {
+        return getCustomizedPackageName(concatServiceNameIfShareModel(serviceName), Constant.PACKAGE_NAME_PRESIGNEDURL_PATTERN);
+    }
 
     @Override
     public String getSmokeTestPackageName(String serviceName) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java
@@ -93,6 +93,11 @@ public interface NamingStrategy {
      * Retrieve the batchManager package name that should be used based on the service name.
      */
     String getBatchManagerPackageName(String serviceName);
+    
+    /**
+     * Retrieve the presignedUrl package name that should be used based on the service name.
+     */
+    String getPresignedUrlPackageName(String serviceName);
 
     /**
      * Retrieve the smote test package name that should be used based on the service name.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtension.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtension.java
@@ -209,4 +209,8 @@ public ClassName getBatchManagerAsyncInterface() {
         return ClassName.get(model.getMetadata().getFullBatchManagerPackageName(),
                              model.getMetadata().getServiceName() + "AsyncBatchManager");
     }
+    
+    public ClassName getPresignedUrlManagerAsyncInterface() {
+        return ClassName.get(model.getMetadata().getFullPresignedUrlPackageName(), "AsyncPresignedUrlManager");
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
@@ -584,6 +584,26 @@ protected void addBatchManagerMethod(Builder type) {
 
         type.addMethod(batchManager);
     }
+    
+    @Override
+    protected void addPresignedUrlManagerMethod(Builder type) {
+        ClassName returnType = poetExtensions.getPresignedUrlManagerAsyncInterface();
+        String internalPresignedUrlPackage = model.getMetadata().getFullInternalPackageName() + ".presignedurl";
+        ClassName implClass = ClassName.get(internalPresignedUrlPackage, "DefaultAsyncPresignedUrlManager");
+        
+        MethodSpec presignedUrlManager = MethodSpec.methodBuilder("presignedUrlManager")
+                                                  .addModifiers(PUBLIC)
+                                                  .addAnnotation(Override.class)
+                                                  .returns(returnType)
+                                                  .addStatement("return new $T(clientHandler,"
+                                                                + " protocolFactory, "
+                                                                + "clientConfiguration,"
+                                                                + " protocolMetadata)",
+                                                                implClass)
+                                                  .build();
+        
+        type.addMethod(presignedUrlManager);
+    }
 
     private MethodSpec resolveMetricPublishersMethod() {
         String clientConfigName = "clientConfiguration";
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java
@@ -99,6 +99,9 @@ public TypeSpec poetSpec() {
         if (model.getCustomizationConfig().getBatchManagerSupported()) {
             addBatchManagerMethod(result);
         }
+        if (model.getCustomizationConfig().getPresignedUrlManagerSupported()) {
+            addPresignedUrlManagerMethod(result);
+        }
         result.addMethod(serviceClientConfigMethod());
         addAdditionalMethods(result);
         addCloseMethod(result);
@@ -174,6 +177,16 @@ protected void addBatchManagerMethod(TypeSpec.Builder type) {
                                                            + "configuration set on this client.", returnType);
         type.addMethod(batchManagerOperationBody(builder).build());
     }
+    
+    protected void addPresignedUrlManagerMethod(TypeSpec.Builder type) {
+        ClassName returnType = poetExtensions.getPresignedUrlManagerAsyncInterface();
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("presignedUrlManager")
+                                               .addModifiers(PUBLIC)
+                                               .returns(returnType)
+                                               .addJavadoc("Creates an instance of {@link $T} object with the "
+                                                           + "configuration set on this client.", returnType);
+        type.addMethod(presignedUrlManagerOperationBody(builder).build());
+    }
 
     @Override
     public ClassName className() {
@@ -550,5 +563,10 @@ protected MethodSpec.Builder batchManagerOperationBody(MethodSpec.Builder builde
         return builder.addModifiers(DEFAULT, PUBLIC)
                       .addStatement("throw new $T()", UnsupportedOperationException.class);
     }
+    
+    protected MethodSpec.Builder presignedUrlManagerOperationBody(MethodSpec.Builder builder) {
+        return builder.addModifiers(DEFAULT, PUBLIC)
+                      .addStatement("throw new $T()", UnsupportedOperationException.class);
+    }
 
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/DelegatingAsyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/DelegatingAsyncClientClass.java
@@ -222,4 +222,9 @@ protected MethodSpec.Builder waiterOperationBody(MethodSpec.Builder builder) {
     protected MethodSpec.Builder batchManagerOperationBody(MethodSpec.Builder builder) {
         return builder.addAnnotation(Override.class).addStatement("return delegate.batchManager()");
     }
+    
+    @Override
+    protected MethodSpec.Builder presignedUrlManagerOperationBody(MethodSpec.Builder builder) {
+        return builder.addAnnotation(Override.class).addStatement("return delegate.presignedUrlManager()");
+    }
 }
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java
@@ -525,6 +525,18 @@ public static IntermediateModel batchManagerModels() {
 
         return new IntermediateModelBuilder(models).build();
     }
+    
+    public static IntermediateModel presignedUrlManagerModels() {
+        File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/presignedurl/service-2.json").getFile());
+        File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/presignedurl/customization.config").getFile());
+
+        C2jModels models = C2jModels.builder()
+                                    .serviceModel(getServiceModel(serviceModel))
+                                    .customizationConfig(getCustomizationConfig(customizationModel))
+                                    .build();
+
+        return new IntermediateModelBuilder(models).build();
+    }
 
     private static ServiceModel getServiceModel(File file) {
         return ModelLoaderUtils.loadModel(ServiceModel.class, file);
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java
@@ -24,6 +24,7 @@
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.customPackageModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.endpointDiscoveryModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.opsWithSigv4a;
+import static software.amazon.awssdk.codegen.poet.ClientTestModels.presignedUrlManagerModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.queryServiceModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.restJsonServiceModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.rpcv2ServiceModels;
@@ -116,6 +117,12 @@ public void asyncClientBatchManager() {
         ClassSpec aSyncClientBatchManager = createAsyncClientClass(batchManagerModels());
         assertThat(aSyncClientBatchManager, generatesTo("test-batchmanager-async.java"));
     }
+    
+    @Test
+    public void asyncClientPresignedUrlManager() {
+        ClassSpec asyncClientPresignedUrlManager = createAsyncClientClass(presignedUrlManagerModels());
+        assertThat(asyncClientPresignedUrlManager, generatesTo("test-presignedurl-async.java"));
+    }
 
     @Test
     public void asyncClientWithStreamingUnsignedPayload() {
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterfaceTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterfaceTest.java
@@ -17,6 +17,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.batchManagerModels;
+import static software.amazon.awssdk.codegen.poet.ClientTestModels.presignedUrlManagerModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.restJsonServiceModels;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
@@ -35,4 +36,10 @@ public void asyncClientInterfaceWithBatchManager() {
         ClassSpec asyncClientInterface = new AsyncClientInterface(batchManagerModels());
         assertThat(asyncClientInterface, generatesTo("test-json-async-client-interface-batchmanager.java"));
     }
+    
+    @Test
+    public void asyncClientInterfaceWithPresignedUrlManager() {
+        ClassSpec asyncClientInterface = new AsyncClientInterface(presignedUrlManagerModels());
+        assertThat(asyncClientInterface, generatesTo("test-json-async-client-interface-presignedurl.java"));
+    }
 }
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/DelegatingAsyncClientClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/DelegatingAsyncClientClassTest.java
@@ -16,6 +16,7 @@
 package software.amazon.awssdk.codegen.poet.client;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static software.amazon.awssdk.codegen.poet.ClientTestModels.presignedUrlManagerModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.restJsonServiceModels;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
@@ -28,4 +29,11 @@ public void delegatingAsyncClientClass() {
             new DelegatingAsyncClientClass(restJsonServiceModels());
         assertThat(asyncClientDecoratorAbstractClass, generatesTo("test-abstract-async-client-class.java"));
     }
+    
+    @Test
+    public void delegatingAsyncClientClassWithPresignedUrlManager() {
+        DelegatingAsyncClientClass asyncClientDecoratorAbstractClass =
+            new DelegatingAsyncClientClass(presignedUrlManagerModels());
+        assertThat(asyncClientDecoratorAbstractClass, generatesTo("test-abstract-async-client-class-presignedurl.java"));
+    }
 }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/presignedurl/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/presignedurl/customization.config
@@ -0,0 +1,3 @@
+{
+  "presignedUrlManagerSupported": true
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/presignedurl/service-2.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/presignedurl/service-2.json
@@ -0,0 +1,62 @@
+{
+  "version": "2.0",
+  "metadata": {
+    "apiVersion": "2010-05-08",
+    "endpointPrefix": "json-service-endpoint",
+    "globalEndpoint": "json-service.amazonaws.com",
+    "protocol": "json",
+    "serviceAbbreviation": "Json Service",
+    "serviceFullName": "Some Service That Uses AWS Json Protocol",
+    "serviceId": "Json Service",
+    "signingName": "json-service",
+    "signatureVersion": "v4",
+    "uid": "json-service-2010-05-08",
+    "xmlNamespace": "https://json-service.amazonaws.com/doc/2010-05-08/"
+  },
+  "operations": {
+    "APostOperation": {
+      "name": "APostOperation",
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      },
+      "input": {
+        "shape": "APostOperationRequest"
+      },
+      "errors": [
+        {
+          "shape": "InvalidInputException"
+        }
+      ],
+      "documentation": "<p>Performs a post operation to the query service and has no output</p>"
+    }
+  },
+  "shapes": {
+    "APostOperationRequest": {
+      "type": "structure",
+      "required": [
+        "StringMember"
+      ],
+      "members": {
+        "StringMember": {
+          "shape": "String",
+          "documentation": "<p>String member</p>"
+        }
+      }
+    },
+    "InvalidInputException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "String"
+        }
+      },
+      "documentation": "<p>The request was rejected because an invalid or out-of-range value was supplied for an input parameter.</p>",
+      "exception": true
+    },
+    "String": {
+      "type": "string"
+    }
+  },
+  "documentation": "A service that is implemented using the json protocol"
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-abstract-async-client-class-presignedurl.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-abstract-async-client-class-presignedurl.java
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface-presignedurl.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface-presignedurl.java
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-presignedurl-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-presignedurl-async.java
diff --git a/services/s3/src/main/resources/codegen-resources/customization.config b/services/s3/src/main/resources/codegen-resources/customization.config

Original file line number	Diff line number	Diff line change
`@@ -209,4 +209,8 @@ public ClassName getBatchManagerAsyncInterface() {`
`209`	`209`	`return ClassName.get(model.getMetadata().getFullBatchManagerPackageName(),`
`210`	`210`	`model.getMetadata().getServiceName() + "AsyncBatchManager");`
`211`	`211`	`}`
	`212`	`+`
	`213`	`+ public ClassName getPresignedUrlManagerAsyncInterface() {`
	`214`	`+ return ClassName.get(model.getMetadata().getFullPresignedUrlPackageName(), "AsyncPresignedUrlManager");`
	`215`	`+ }`
`212`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,4 +222,9 @@ protected MethodSpec.Builder waiterOperationBody(MethodSpec.Builder builder) {`
`222`	`222`	`protected MethodSpec.Builder batchManagerOperationBody(MethodSpec.Builder builder) {`
`223`	`223`	`return builder.addAnnotation(Override.class).addStatement("return delegate.batchManager()");`
`224`	`224`	`}`
	`225`	`+`
	`226`	`+ @Override`
	`227`	`+ protected MethodSpec.Builder presignedUrlManagerOperationBody(MethodSpec.Builder builder) {`
	`228`	`+ return builder.addAnnotation(Override.class).addStatement("return delegate.presignedUrlManager()");`
	`229`	`+ }`
`225`	`230`	`}`