CRR support for DynamoDB

Author: spfink

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

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

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

@@ -158,6 +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.setEndpointTrait(op.getEndpoint());
 
             Input input = op.getInput();

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

@@ -177,6 +177,7 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
         memberModel.setIdempotencyToken(c2jMemberDefinition.isIdempotencyToken());
         memberModel.setEventPayload(c2jMemberDefinition.isEventPayload());
         memberModel.setEventHeader(c2jMemberDefinition.isEventHeader());
+        memberModel.setEndpointDiscoveryId(c2jMemberDefinition.isEndpointDiscoveryId());
 
         // Pass the xmlNameSpace from the member reference
         if (c2jMemberDefinition.getXmlNamespace() != null) {

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

@@ -106,6 +106,15 @@ public IntermediateModel build() {
         operations.putAll(new AddOperations(this).constructOperations());
         authorizers.putAll(new AddCustomAuthorizers(this.service, getNamingStrategy()).constructAuthorizers());
 
+        OperationModel endpointOperation = null;
+
+        for (OperationModel o : operations.values()) {
+            if (o.isEndpointOperation()) {
+                endpointOperation = o;
+                break;
+            }
+        }
+
         for (IntermediateModelShapeProcessor processor : shapeProcessors) {
             shapes.putAll(processor.process(Collections.unmodifiableMap(operations),
                                             Collections.unmodifiableMap(shapes)));
@@ -119,7 +128,7 @@ public IntermediateModel build() {
 
         IntermediateModel fullModel = new IntermediateModel(
             constructMetadata(service, customConfig), operations, shapes,
-            customConfig, examples, authorizers, paginators.getPaginators(), namingStrategy);
+            customConfig, examples, endpointOperation, authorizers, paginators.getPaginators(), namingStrategy);
 
         customization.postprocess(fullModel);
 
@@ -136,6 +145,7 @@ public IntermediateModel build() {
                                                                trimmedShapes,
                                                                fullModel.getCustomizationConfig(),
                                                                fullModel.getExamples(),
+                                                               endpointOperation,
                                                                fullModel.getCustomAuthorizers(),
                                                                fullModel.getPaginators(),
                                                                namingStrategy);

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AsyncClientGeneratorTasks.java

@@ -16,14 +16,15 @@
 package software.amazon.awssdk.codegen.emitters.tasks;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 import software.amazon.awssdk.codegen.emitters.GeneratorTask;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.poet.builder.AsyncClientBuilderClass;
 import software.amazon.awssdk.codegen.poet.builder.AsyncClientBuilderInterface;
 import software.amazon.awssdk.codegen.poet.client.AsyncClientClass;
 import software.amazon.awssdk.codegen.poet.client.AsyncClientInterface;
+import software.amazon.awssdk.codegen.poet.endpointdiscovery.EndpointDiscoveryAsyncCacheLoaderGenerator;
 
 public class AsyncClientGeneratorTasks extends BaseGeneratorTasks {
 
@@ -37,10 +38,16 @@ public AsyncClientGeneratorTasks(GeneratorTaskParams dependencies) {
     @Override
     protected List<GeneratorTask> createTasks() throws Exception {
         info("Emitting Async client classes");
-        return Arrays.asList(createClientClassTask(),
-                             createClientBuilderTask(),
-                             createClientBuilderInterfaceTask(),
-                             createClientInterfaceTask());
+        List<GeneratorTask> generatorTasks = new ArrayList<>();
+        generatorTasks.add(createClientClassTask());
+        generatorTasks.add(createClientBuilderTask());
+        generatorTasks.add(createClientBuilderInterfaceTask());
+        generatorTasks.add(createClientInterfaceTask());
+        if (model.getEndpointOperation().isPresent()) {
+            generatorTasks.add(createEndpointDiscoveryCacheLoaderTask());
+        }
+
+        return generatorTasks;
     }
 
     private GeneratorTask createClientClassTask() throws IOException {
@@ -58,4 +65,8 @@ private GeneratorTask createClientBuilderInterfaceTask() throws IOException {
     private GeneratorTask createClientInterfaceTask() throws IOException {
         return createPoetGeneratorTask(new AsyncClientInterface(model));
     }
+
+    private GeneratorTask createEndpointDiscoveryCacheLoaderTask() throws IOException {
+        return createPoetGeneratorTask(new EndpointDiscoveryAsyncCacheLoaderGenerator(generatorTaskParams));
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SyncClientGeneratorTasks.java

@@ -25,6 +25,7 @@
 import software.amazon.awssdk.codegen.poet.client.ClientSimpleMethodsIntegrationTests;
 import software.amazon.awssdk.codegen.poet.client.SyncClientClass;
 import software.amazon.awssdk.codegen.poet.client.SyncClientInterface;
+import software.amazon.awssdk.codegen.poet.endpointdiscovery.EndpointDiscoveryCacheLoaderGenerator;
 
 public class SyncClientGeneratorTasks extends BaseGeneratorTasks {
     private final GeneratorTaskParams generatorTaskParams;
@@ -50,6 +51,9 @@ protected List<GeneratorTask> createTasks() throws Exception {
         if (!model.simpleMethodsRequiringTesting().isEmpty()) {
             tasks.add(createClientSimpleMethodsTest());
         }
+        if (model.getEndpointOperation().isPresent()) {
+            tasks.add(createEndpointDiscoveryCacheLoaderTask());
+        }
         return tasks;
     }
 
@@ -72,4 +76,8 @@ private GeneratorTask createClientBuilderInterfaceTask() throws IOException {
     private GeneratorTask createClientSimpleMethodsTest() throws IOException {
         return createPoetGeneratorTestTask(new ClientSimpleMethodsIntegrationTests(model));
     }
+
+    private GeneratorTask createEndpointDiscoveryCacheLoaderTask() throws IOException {
+        return createPoetGeneratorTask(new EndpointDiscoveryCacheLoaderGenerator(generatorTaskParams));
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EndpointDiscovery.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.codegen.model.intermediate;
+
+public class EndpointDiscovery {
+
+    private boolean required;
+
+    public boolean isRequired() {
+        return required;
+    }
+
+    public void setRequired(boolean required) {
+        this.required = required;
+    }
+}

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java

@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import software.amazon.awssdk.awscore.AwsResponse;
 import software.amazon.awssdk.awscore.AwsResponseMetadata;
@@ -54,6 +55,9 @@ public final class IntermediateModel {
 
     private final Map<String, AuthorizerModel> customAuthorizers;
 
+    @JsonIgnore
+    private final Optional<OperationModel> endpointOperation;
+
     @JsonIgnore
     private final Map<String, PaginatorDefinition> paginators;
 
@@ -68,7 +72,8 @@ public IntermediateModel(
         @JsonProperty("customizationConfig") CustomizationConfig customizationConfig,
         @JsonProperty("serviceExamples") ServiceExamples examples) {
 
-        this(metadata, operations, shapes, customizationConfig, examples, Collections.emptyMap(), Collections.emptyMap(), null);
+        this(metadata, operations, shapes, customizationConfig, examples, null,
+             Collections.emptyMap(), Collections.emptyMap(), null);
     }
 
     public IntermediateModel(
@@ -77,6 +82,7 @@ public IntermediateModel(
         Map<String, ShapeModel> shapes,
         CustomizationConfig customizationConfig,
         ServiceExamples examples,
+        OperationModel endpointOperation,
         Map<String, AuthorizerModel> customAuthorizers,
         Map<String, PaginatorDefinition> paginators,
         NamingStrategy namingStrategy) {
@@ -85,6 +91,7 @@ public IntermediateModel(
         this.shapes = shapes;
         this.customizationConfig = customizationConfig;
         this.examples = examples;
+        this.endpointOperation = Optional.ofNullable(endpointOperation);
         this.customAuthorizers = customAuthorizers;
         this.paginators = paginators;
         this.namingStrategy = namingStrategy;
@@ -205,6 +212,10 @@ public Map<String, AuthorizerModel> getCustomAuthorizers() {
         return customAuthorizers;
     }
 
+    public Optional<OperationModel> getEndpointOperation() {
+        return endpointOperation;
+    }
+
     public boolean hasPaginators() {
         return paginators.size() > 0;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java

@@ -81,6 +81,8 @@ public class MemberModel extends DocumentationModel {
 
     private boolean eventHeader;
 
+    private boolean endpointDiscoveryId;
+
     public String getName() {
         return name;
     }
@@ -297,6 +299,15 @@ public void setEventHeader(boolean eventHeader) {
         this.eventHeader = eventHeader;
     }
 
+
+    public boolean isEndpointDiscoveryId() {
+        return endpointDiscoveryId;
+    }
+
+    public void setEndpointDiscoveryId(boolean endpointDiscoveryId) {
+        this.endpointDiscoveryId = endpointDiscoveryId;
+    }
+
     public ListModel getListModel() {
         return listModel;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java

@@ -45,6 +45,10 @@ public class OperationModel extends DocumentationModel {
 
     private boolean isPaginated;
 
+    private boolean endpointOperation;
+
+    private EndpointDiscovery endpointDiscovery;
+
     @JsonIgnore
     private ShapeModel inputShape;
 
@@ -184,6 +188,14 @@ public boolean isStreaming() {
         return hasStreamingInput() || hasStreamingOutput();
     }
 
+    public boolean isEndpointOperation() {
+        return endpointOperation;
+    }
+
+    public void setEndpointOperation(boolean endpointOperation) {
+        this.endpointOperation = endpointOperation;
+    }
+
     public boolean isPaginated() {
         return isPaginated;
     }
@@ -192,6 +204,14 @@ public void setPaginated(boolean paginated) {
         isPaginated = paginated;
     }
 
+    public EndpointDiscovery getEndpointDiscovery() {
+        return endpointDiscovery;
+    }
+
+    public void setEndpointDiscovery(EndpointDiscovery endpointDiscovery) {
+        this.endpointDiscovery = endpointDiscovery;
+    }
+
     /**
      * Returns the endpoint trait that will be used to resolve the endpoint of an API.
      */

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java

@@ -46,6 +46,7 @@ public class ShapeModel extends DocumentationModel implements HasDeprecation {
     private boolean wrapper;
     private boolean simpleMethod;
     private String requestSignerClassFqcn;
+    private EndpointDiscovery endpointDiscovery;
 
     private List<MemberModel> members;
     private List<EnumModel> enums;
@@ -510,6 +511,14 @@ public void setRequestSignerClassFqcn(String authorizerClass) {
         this.requestSignerClassFqcn = authorizerClass;
     }
 
+    public EndpointDiscovery getEndpointDiscovery() {
+        return endpointDiscovery;
+    }
+
+    public void setEndpointDiscovery(EndpointDiscovery endpointDiscovery) {
+        this.endpointDiscovery = endpointDiscovery;
+    }
+
     /**
      * @return True if the shape is an 'eventstream' shape. The eventstream shape is the tagged union like
      * container that holds individual 'events'.

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

@@ -52,6 +52,9 @@ public class Member {
     @JsonProperty(value = "eventheader")
     private boolean eventHeader;
 
+    @JsonProperty(value = "endpointdiscoveryid")
+    private boolean endpointDiscoveryId;
+
     public String getShape() {
         return shape;
     }
@@ -171,4 +174,12 @@ public boolean isEventHeader() {
     public void setEventHeader(boolean eventHeader) {
         this.eventHeader = eventHeader;
     }
+
+    public boolean isEndpointDiscoveryId() {
+        return endpointDiscoveryId;
+    }
+
+    public void setEndpointDiscoveryId(boolean endpointDiscoveryId) {
+        this.endpointDiscoveryId = endpointDiscoveryId;
+    }
 }

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

@@ -17,6 +17,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
+import software.amazon.awssdk.codegen.model.intermediate.EndpointDiscovery;
 
 public class Operation {
 
@@ -38,6 +39,12 @@ public class Operation {
 
     private boolean requiresApiKey;
 
+    @JsonProperty("endpointdiscovery")
+    private EndpointDiscovery endpointDiscovery;
+
+    @JsonProperty("endpointoperation")
+    private boolean endpointOperation;
+
     private EndpointTrait endpoint;
 
     @JsonProperty("authtype")
@@ -138,6 +145,22 @@ public void setRequiresApiKey(boolean requiresApiKey) {
         this.requiresApiKey = requiresApiKey;
     }
 
+    public EndpointDiscovery getEndpointDiscovery() {
+        return endpointDiscovery;
+    }
+
+    public void setEndpointDiscovery(EndpointDiscovery endpointDiscovery) {
+        this.endpointDiscovery = endpointDiscovery;
+    }
+
+    public boolean isEndpointOperation() {
+        return endpointOperation;
+    }
+
+    public void setEndpointOperation(boolean endpointOperation) {
+        this.endpointOperation = endpointOperation;
+    }
+
     public EndpointTrait getEndpoint() {
         return endpoint;
     }