Updating CRR support

Author: spfink

codegen/src/main/java/software/amazon/awssdk/codegen/AddInputShapes.java

@@ -79,7 +79,7 @@ private ShapeModel generateInputShapeModel(Operation operation,
         shapeModel.setType(ShapeType.Request.getValue());
         shapeModel.setMarshaller(
                 createInputShapeMarshaller(getServiceModel().getMetadata(), operation));
-        shapeModel.setEndpointDiscovery(operation.getEndpointdiscovery());
+        shapeModel.setEndpointDiscovery(operation.getEndpointDiscovery());
 
         return shapeModel;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java

@@ -158,8 +158,8 @@ public Map<String, OperationModel> constructOperations() {
             operationModel.setDocumentation(op.getDocumentation());
             operationModel.setIsAuthenticated(isAuthenticated(op));
             operationModel.setPaginated(isPaginated(op));
-            operationModel.setEndpointOperation(op.isEndpointoperation());
-            operationModel.setEndpointDiscovery(op.getEndpointdiscovery());
+            operationModel.setEndpointOperation(op.isEndpointOperation());
+            operationModel.setEndpointDiscovery(op.getEndpointDiscovery());
             operationModel.setEndpointTrait(op.getEndpoint());
 
             Input input = op.getInput();

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

@@ -39,9 +39,11 @@ public class Operation {
 
     private boolean requiresApiKey;
 
-    private EndpointDiscovery endpointdiscovery;
+    @JsonProperty("endpointdiscovery")
+    private EndpointDiscovery endpointDiscovery;
 
-    private boolean endpointoperation;
+    @JsonProperty("endpointoperation")
+    private boolean endpointOperation;
 
     private EndpointTrait endpoint;
 
@@ -143,20 +145,20 @@ public void setRequiresApiKey(boolean requiresApiKey) {
         this.requiresApiKey = requiresApiKey;
     }
 
-    public EndpointDiscovery getEndpointdiscovery() {
-        return endpointdiscovery;
+    public EndpointDiscovery getEndpointDiscovery() {
+        return endpointDiscovery;
     }
 
-    public void setEndpointdiscovery(EndpointDiscovery endpointdiscovery) {
-        this.endpointdiscovery = endpointdiscovery;
+    public void setEndpointDiscovery(EndpointDiscovery endpointDiscovery) {
+        this.endpointDiscovery = endpointDiscovery;
     }
 
-    public boolean isEndpointoperation() {
-        return endpointoperation;
+    public boolean isEndpointOperation() {
+        return endpointOperation;
     }
 
-    public void setEndpointoperation(boolean endpointoperation) {
-        this.endpointoperation = endpointoperation;
+    public void setEndpointOperation(boolean endpointOperation) {
+        this.endpointOperation = endpointOperation;
     }
 
     public EndpointTrait getEndpoint() {

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

@@ -193,9 +193,11 @@ protected MethodSpec.Builder operationBody(MethodSpec.Builder builder, Operation
             builder.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER).resolveCredentials()" +
                                  ".accessKeyId()", AwsClientOption.class);
             builder.addStatement("$T cachedEndpoint = $L.get(key, $L.endpointDiscoveryRequest(), " +
-                                 "clientConfiguration.option(SdkClientOption.ENDPOINT))",
-                                 URI.class, "endpointDiscoveryCache", opModel.getInputShape().getVariable().getVariableName());
-            builder.addStatement("clientConfiguration.copy(o -> o.option($T.ENDPOINT, cachedEndpoint))", SdkClientOption.class);
+                                 "clientConfiguration.option($T.ENDPOINT))",
+                                 URI.class,
+                                 "endpointDiscoveryCache",
+                                 opModel.getInputShape().getVariable().getVariableName(),
+                                 SdkClientOption.class);
         }
 
         builder.addCode(protocolSpec.asyncExecutionHandler(model, opModel))

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

@@ -165,9 +165,11 @@ private List<MethodSpec> operationMethodSpecs(OperationModel opModel) {
             method.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER)." +
                                 "resolveCredentials().accessKeyId()", AwsClientOption.class);
             method.addStatement("$T cachedEndpoint = $L.get(key, $L.endpointDiscoveryRequest(), " +
-                                "clientConfiguration.option(SdkClientOption.ENDPOINT))",
-                                URI.class, "endpointDiscoveryCache", opModel.getInputShape().getVariable().getVariableName());
-            method.addStatement("clientConfiguration.copy(o -> o.option($T.ENDPOINT, cachedEndpoint))", SdkClientOption.class);
+                                "clientConfiguration.option($T.ENDPOINT))",
+                                URI.class,
+                                "endpointDiscoveryCache",
+                                opModel.getInputShape().getVariable().getVariableName(),
+                                SdkClientOption.class);
         }
 
         method.addCode(protocolSpec.executionHandler(opModel));

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java

@@ -167,6 +167,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
                  ".withResponseHandler($N)\n" +
                  ".withErrorResponseHandler($N)\n" +
                  hostPrefixExpression(opModel) +
+                 discoveredEndpoint(opModel) +
                  ".withInput($L)\n",
                  ClientExecutionParams.class,
                  requestType,

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java

@@ -85,4 +85,10 @@ default String hostPrefixExpression(OperationModel opModel) {
                ? ".hostPrefixExpression(resolvedHostExpression)\n"
                : "";
     }
+
+    default String discoveredEndpoint(OperationModel opModel) {
+        return opModel.getEndpointDiscovery() != null
+               ? ".discoveredEndpoint(cachedEndpoint)\n"
+               : "";
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java

@@ -100,6 +100,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
                  ".withResponseHandler($N)" +
                  ".withErrorResponseHandler($N)" +
                  hostPrefixExpression(opModel) +
+                 discoveredEndpoint(opModel) +
                  ".withInput($L)",
                  ClientExecutionParams.class,
                  requestType,