Rename PresignedUrlManager to PresignedUrlExtension following API review (#6286)

* surface api name changes

* rename files, remove consumer builder from downloadrequest

* some nitpicks

* renamed variables

Author: jencymaryjoseph

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

@@ -346,9 +346,9 @@ public class CustomizationConfig {
     private boolean batchManagerSupported;
 
     /**
-     * A boolean flag to indicate if Presigned URL Manager is supported.
+     * A boolean flag to indicate if Presigned URL Extension is supported.
      */
-    private boolean presignedUrlManagerSupported;
+    private boolean presignedUrlExtensionSupported;
 
     /**
      * A boolean flag to indicate if the fast unmarshaller code path is enabled.
@@ -929,12 +929,12 @@ public void setBatchManagerSupported(boolean batchManagerSupported) {
         this.batchManagerSupported = batchManagerSupported;
     }
 
-    public boolean getPresignedUrlManagerSupported() {
-        return presignedUrlManagerSupported;
+    public boolean getPresignedUrlExtensionSupported() {
+        return presignedUrlExtensionSupported;
     }
 
-    public void setPresignedUrlManagerSupported(boolean presignedUrlManagerSupported) {
-        this.presignedUrlManagerSupported = presignedUrlManagerSupported;
+    public void setPresignedUrlExtensionSupported(boolean presignedUrlExtensionSupported) {
+        this.presignedUrlExtensionSupported = presignedUrlExtensionSupported;
     }
 
     public boolean getEnableFastUnmarshaller() {

codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtension.java

@@ -210,7 +210,7 @@ public ClassName getBatchManagerAsyncInterface() {
                              model.getMetadata().getServiceName() + "AsyncBatchManager");
     }
 
-    public ClassName getPresignedUrlManagerAsyncInterface() {
-        return ClassName.get(model.getMetadata().getFullPresignedUrlPackageName(), "AsyncPresignedUrlManager");
+    public ClassName getPresignedUrlExtensionAsyncInterface() {
+        return ClassName.get(model.getMetadata().getFullPresignedUrlPackageName(), "AsyncPresignedUrlExtension");
     }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java

@@ -586,12 +586,12 @@ protected void addBatchManagerMethod(Builder type) {
     }
 
     @Override
-    protected void addPresignedUrlManagerMethod(Builder type) {
-        ClassName returnType = poetExtensions.getPresignedUrlManagerAsyncInterface();
+    protected void addPresignedUrlExtensionMethod(Builder type) {
+        ClassName returnType = poetExtensions.getPresignedUrlExtensionAsyncInterface();
         String internalPresignedUrlPackage = model.getMetadata().getFullInternalPackageName() + ".presignedurl";
-        ClassName implClass = ClassName.get(internalPresignedUrlPackage, "DefaultAsyncPresignedUrlManager");
+        ClassName implClass = ClassName.get(internalPresignedUrlPackage, "DefaultAsyncPresignedUrlExtension");
 
-        MethodSpec presignedUrlManager = MethodSpec.methodBuilder("presignedUrlManager")
+        MethodSpec presignedUrlExtension = MethodSpec.methodBuilder("presignedUrlExtension")
                                                   .addModifiers(PUBLIC)
                                                   .addAnnotation(Override.class)
                                                   .returns(returnType)
@@ -602,7 +602,7 @@ protected void addPresignedUrlManagerMethod(Builder type) {
                                                                 implClass)
                                                   .build();
 
-        type.addMethod(presignedUrlManager);
+        type.addMethod(presignedUrlExtension);
     }
 
     private MethodSpec resolveMetricPublishersMethod() {

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java

@@ -99,8 +99,8 @@ public TypeSpec poetSpec() {
         if (model.getCustomizationConfig().getBatchManagerSupported()) {
             addBatchManagerMethod(result);
         }
-        if (model.getCustomizationConfig().getPresignedUrlManagerSupported()) {
-            addPresignedUrlManagerMethod(result);
+        if (model.getCustomizationConfig().getPresignedUrlExtensionSupported()) {
+            addPresignedUrlExtensionMethod(result);
         }
         result.addMethod(serviceClientConfigMethod());
         addAdditionalMethods(result);
@@ -178,14 +178,14 @@ protected void addBatchManagerMethod(TypeSpec.Builder type) {
         type.addMethod(batchManagerOperationBody(builder).build());
     }
 
-    protected void addPresignedUrlManagerMethod(TypeSpec.Builder type) {
-        ClassName returnType = poetExtensions.getPresignedUrlManagerAsyncInterface();
-        MethodSpec.Builder builder = MethodSpec.methodBuilder("presignedUrlManager")
+    protected void addPresignedUrlExtensionMethod(TypeSpec.Builder type) {
+        ClassName returnType = poetExtensions.getPresignedUrlExtensionAsyncInterface();
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("presignedUrlExtension")
                                                .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());
+        type.addMethod(presignedUrlExtensionOperationBody(builder).build());
     }
 
     @Override
@@ -564,7 +564,7 @@ protected MethodSpec.Builder batchManagerOperationBody(MethodSpec.Builder builde
                       .addStatement("throw new $T()", UnsupportedOperationException.class);
     }
 
-    protected MethodSpec.Builder presignedUrlManagerOperationBody(MethodSpec.Builder builder) {
+    protected MethodSpec.Builder presignedUrlExtensionOperationBody(MethodSpec.Builder builder) {
         return builder.addModifiers(DEFAULT, PUBLIC)
                       .addStatement("throw new $T()", UnsupportedOperationException.class);
     }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/DelegatingAsyncClientClass.java

@@ -224,7 +224,7 @@ protected MethodSpec.Builder batchManagerOperationBody(MethodSpec.Builder builde
     }
 
     @Override
-    protected MethodSpec.Builder presignedUrlManagerOperationBody(MethodSpec.Builder builder) {
-        return builder.addAnnotation(Override.class).addStatement("return delegate.presignedUrlManager()");
+    protected MethodSpec.Builder presignedUrlExtensionOperationBody(MethodSpec.Builder builder) {
+        return builder.addAnnotation(Override.class).addStatement("return delegate.presignedUrlExtension()");
     }
 }

codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java

@@ -526,7 +526,7 @@ public static IntermediateModel batchManagerModels() {
         return new IntermediateModelBuilder(models).build();
     }
 
-    public static IntermediateModel presignedUrlManagerModels() {
+    public static IntermediateModel presignedUrlExtensionModels() {
         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());
 

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClassTest.java

@@ -24,7 +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.presignedUrlExtensionModels;
 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;
@@ -119,9 +119,9 @@ public void asyncClientBatchManager() {
     }
 
     @Test
-    public void asyncClientPresignedUrlManager() {
-        ClassSpec asyncClientPresignedUrlManager = createAsyncClientClass(presignedUrlManagerModels());
-        assertThat(asyncClientPresignedUrlManager, generatesTo("test-presignedurl-async.java"));
+    public void asyncClientPresignedUrlExtension() {
+        ClassSpec asyncClientPresignedUrlExtension = createAsyncClientClass(presignedUrlExtensionModels());
+        assertThat(asyncClientPresignedUrlExtension, generatesTo("test-presignedurl-async.java"));
     }
 
     @Test

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterfaceTest.java

@@ -17,7 +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.presignedUrlExtensionModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.restJsonServiceModels;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
@@ -38,8 +38,8 @@ public void asyncClientInterfaceWithBatchManager() {
     }
 
     @Test
-    public void asyncClientInterfaceWithPresignedUrlManager() {
-        ClassSpec asyncClientInterface = new AsyncClientInterface(presignedUrlManagerModels());
+    public void asyncClientInterfaceWithPresignedUrlExtension() {
+        ClassSpec asyncClientInterface = new AsyncClientInterface(presignedUrlExtensionModels());
         assertThat(asyncClientInterface, generatesTo("test-json-async-client-interface-presignedurl.java"));
     }
 }

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/DelegatingAsyncClientClassTest.java

@@ -16,7 +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.presignedUrlExtensionModels;
 import static software.amazon.awssdk.codegen.poet.ClientTestModels.restJsonServiceModels;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
@@ -31,9 +31,9 @@ public void delegatingAsyncClientClass() {
     }
 
     @Test
-    public void delegatingAsyncClientClassWithPresignedUrlManager() {
+    public void delegatingAsyncClientClassWithPresignedUrlExtension() {
         DelegatingAsyncClientClass asyncClientDecoratorAbstractClass =
-            new DelegatingAsyncClientClass(presignedUrlManagerModels());
+            new DelegatingAsyncClientClass(presignedUrlExtensionModels());
         assertThat(asyncClientDecoratorAbstractClass, generatesTo("test-abstract-async-client-class-presignedurl.java"));
     }
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/presignedurl/customization.config

@@ -1,3 +1,3 @@
 {
-  "presignedUrlManagerSupported": true
+  "presignedUrlExtensionSupported": true
 }