entry : model.getShapes().entrySet()) {
if (entry.getValue().getMembers() != null) {
for (MemberModel member : entry.getValue().getMembers()) {
- member.setShape(
- Utils.findShapeModelByC2jNameIfExists(model, member.getC2jShape()));
+ member.setShape(Utils.findMemberShapeModelByC2jNameIfExists(model, member.getC2jShape()));
}
}
}
@@ -186,7 +197,9 @@ private void linkOperationsToInputOutputShapes(IntermediateModel model) {
if (operation.getOutput() != null) {
String outputShapeName = operation.getOutput().getShape();
- entry.getValue().setOutputShape(model.getShapeByC2jName(outputShapeName));
+ ShapeModel outputShape =
+ model.getShapeByNameAndC2jName(entry.getValue().getReturnType().getReturnType(), outputShapeName);
+ entry.getValue().setOutputShape(outputShape);
}
}
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java
index f99859b8a019..65dc3346fdda 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java
@@ -25,6 +25,7 @@
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
+import software.amazon.awssdk.codegen.model.service.PaginatorDefinition;
import software.amazon.awssdk.utils.Pair;
import software.amazon.awssdk.utils.StringUtils;
@@ -58,7 +59,7 @@ abstract class OperationDocProvider {
this.model = model;
this.opModel = opModel;
this.config = config;
- this.paginationDocs = new PaginationDocs(model, opModel);
+ this.paginationDocs = new PaginationDocs(model, opModel, getPaginatorDefinition());
}
/**
@@ -180,6 +181,10 @@ final void emitRequestParm(DocumentationBuilder docBuilder) {
}
}
+ private PaginatorDefinition getPaginatorDefinition() {
+ return model.getPaginators().get(opModel.getOperationName());
+ }
+
/**
* @return The interface name of the client. Will differ per {@link ClientType}.
*/
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java
index 67738c7ba8b7..485b034fbe32 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java
@@ -23,6 +23,7 @@
import org.reactivestreams.Subscription;
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
+import software.amazon.awssdk.codegen.model.service.PaginatorDefinition;
import software.amazon.awssdk.codegen.poet.PoetExtensions;
import software.amazon.awssdk.codegen.utils.PaginatorUtils;
import software.amazon.awssdk.utils.async.SequentialSubscriber;
@@ -33,10 +34,13 @@ public class PaginationDocs {
private final OperationModel operationModel;
private final PoetExtensions poetExtensions;
+ private final PaginatorDefinition paginatorDefinition;
- public PaginationDocs(IntermediateModel intermediateModel, OperationModel operationModel) {
+ public PaginationDocs(IntermediateModel intermediateModel, OperationModel operationModel,
+ PaginatorDefinition paginatorDefinition) {
this.operationModel = operationModel;
this.poetExtensions = new PoetExtensions(intermediateModel);
+ this.paginatorDefinition = paginatorDefinition;
}
/**
@@ -149,6 +153,7 @@ private String getSyncCodeSnippets() {
.add(callOperationOnClient)
.addStatement("responses.iterator().forEachRemaining(....)")
.build()))
+ .add(noteAboutLimitConfigurationMethod())
.add(noteAboutSyncNonPaginatedMethod())
.build()
.toString();
@@ -186,6 +191,7 @@ private String getAsyncCodeSnippets() {
.build()))
.add("As the response is a publisher, it can work well with third party reactive streams implementations "
+ "like RxJava2.")
+ .add(noteAboutLimitConfigurationMethod())
.add(noteAboutSyncNonPaginatedMethod())
.build()
.toString();
@@ -238,6 +244,18 @@ private ClassName asyncPaginatedResponseType() {
return poetExtensions.getResponseClassForPaginatedAsyncOperation(operationModel.getOperationName());
}
+ private String getPaginatorLimitKeyName() {
+ return paginatorDefinition != null ? paginatorDefinition.getLimitKey() : "";
+ }
+
+ private CodeBlock noteAboutLimitConfigurationMethod() {
+ return CodeBlock.builder()
+ .add("\nPlease notice that the configuration of $L won't limit the number of results "
+ + "you get with the paginator. It only limits the number of results in each page.
",
+ getPaginatorLimitKeyName())
+ .build();
+ }
+
private CodeBlock noteAboutSyncNonPaginatedMethod() {
return CodeBlock.builder()
.add("\nNote: If you prefer to have control on service calls, use the {@link #$L($T)} operation."
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java
index a4288ae7fd05..5f92b8757083 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java
@@ -29,6 +29,7 @@
import software.amazon.awssdk.codegen.model.intermediate.Metadata;
import software.amazon.awssdk.codegen.model.intermediate.ShapeMarshaller;
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
+import software.amazon.awssdk.codegen.model.intermediate.ShapeType;
import software.amazon.awssdk.codegen.model.service.Input;
import software.amazon.awssdk.codegen.model.service.Operation;
import software.amazon.awssdk.codegen.model.service.ServiceMetadata;
@@ -289,6 +290,28 @@ public static ShapeModel findShapeModelByC2jNameIfExists(IntermediateModel inter
return null;
}
+ /**
+ * Search for a shape model by its C2J name, excluding request and response shapes, which are not candidates to be members
+ * of another shape.
+ *
+ * @return ShapeModel or null if the shape doesn't exist (if it's primitive or container type for example)
+ */
+ public static ShapeModel findMemberShapeModelByC2jNameIfExists(IntermediateModel intermediateModel, String shapeC2jName) {
+ ShapeModel candidate = null;
+ for (ShapeModel shape : intermediateModel.getShapes().values()) {
+ if (shape.getShapeType() != ShapeType.Request
+ && shape.getShapeType() != ShapeType.Response
+ && shape.getC2jName().equals(shapeC2jName)) {
+ if (candidate != null) {
+ throw new IllegalStateException("Conflicting candidates for member model with C2J name " + shapeC2jName + ": "
+ + candidate + " and " + shape);
+ }
+ candidate = shape;
+ }
+ }
+ return candidate;
+ }
+
public static List findShapesByC2jName(IntermediateModel intermediateModel, String shapeC2jName) {
return intermediateModel.getShapes().values().stream().filter(s -> s.getC2jName().equals(shapeC2jName)).collect(toList());
}
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
index a56e74414697..8b2230310c46 100644
--- 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
@@ -159,6 +159,12 @@ public class CustomizationConfig {
*/
private UtilitiesMethod utilitiesMethod;
+ /**
+ * Force generation of deprecated client builder method 'enableEndpointDiscovery'. Only services that already had
+ * this method when it was deprecated require this flag to be set.
+ */
+ private boolean enableEndpointDiscoveryMethodRequired = false;
+
private CustomizationConfig() {
}
@@ -406,4 +412,12 @@ public UtilitiesMethod getUtilitiesMethod() {
public void setUtilitiesMethod(UtilitiesMethod utilitiesMethod) {
this.utilitiesMethod = utilitiesMethod;
}
+
+ public boolean isEnableEndpointDiscoveryMethodRequired() {
+ return enableEndpointDiscoveryMethodRequired;
+ }
+
+ public void setEnableEndpointDiscoveryMethodRequired(boolean enableEndpointDiscoveryMethodRequired) {
+ this.enableEndpointDiscoveryMethodRequired = enableEndpointDiscoveryMethodRequired;
+ }
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java
index 1b04bf63fda2..a365465db74f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java
@@ -27,7 +27,6 @@
import java.util.stream.Collectors;
import software.amazon.awssdk.awscore.AwsResponse;
import software.amazon.awssdk.awscore.AwsResponseMetadata;
-import software.amazon.awssdk.codegen.internal.Utils;
import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
import software.amazon.awssdk.codegen.model.service.PaginatorDefinition;
import software.amazon.awssdk.codegen.naming.NamingStrategy;
@@ -104,8 +103,21 @@ public Map getShapes() {
return shapes;
}
- public ShapeModel getShapeByC2jName(String c2jName) {
- return Utils.findShapeModelByC2jName(this, c2jName);
+ /**
+ * Looks up a shape by name and verifies that the expected C2J name matches
+ * @param shapeName the name of the shape in the intermediate model
+ * @param shapeC2jName C2J's name for the shape
+ * @return the ShapeModel
+ * @throws IllegalArgumentException if no matching shape is found
+ */
+ public ShapeModel getShapeByNameAndC2jName(String shapeName, String shapeC2jName) {
+ for (ShapeModel sm : getShapes().values()) {
+ if (shapeName.equals(sm.getShapeName()) && shapeC2jName.equals(sm.getC2jName())) {
+ return sm;
+ }
+ }
+ throw new IllegalArgumentException("C2J shape " + shapeC2jName + " with shape name " + shapeName + " does not exist in "
+ + "the intermediate model.");
}
public CustomizationConfig getCustomizationConfig() {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java
index de862f089813..aa1b55f8a906 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java
@@ -50,6 +50,8 @@ public class OperationModel extends DocumentationModel {
private boolean endpointOperation;
+ private boolean endpointCacheRequired;
+
private EndpointDiscovery endpointDiscovery;
@JsonIgnore
@@ -207,6 +209,14 @@ public void setEndpointOperation(boolean endpointOperation) {
this.endpointOperation = endpointOperation;
}
+ public boolean isEndpointCacheRequired() {
+ return endpointCacheRequired;
+ }
+
+ public void setEndpointCacheRequired(boolean endpointCacheRequired) {
+ this.endpointCacheRequired = endpointCacheRequired;
+ }
+
public boolean isPaginated() {
return isPaginated;
}
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
index 1367f5428f85..02d1e85636ac 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java
@@ -50,6 +50,8 @@ public class DefaultNamingStrategy implements NamingStrategy {
private static Logger log = Logger.loggerFor(DefaultNamingStrategy.class);
+ private static final String COLLISION_DISAMBIGUATION_PREFIX = "Default";
+
private static final Set RESERVED_KEYWORDS;
private static final Set RESERVED_EXCEPTION_METHOD_NAMES;
@@ -191,23 +193,39 @@ private String getCustomizedPackageName(String serviceName, String defaultPatter
@Override
public String getExceptionName(String errorShapeName) {
+ String baseName;
if (errorShapeName.endsWith(FAULT_CLASS_SUFFIX)) {
- return pascalCase(errorShapeName.substring(0, errorShapeName.length() - FAULT_CLASS_SUFFIX.length())) +
+ baseName = pascalCase(errorShapeName.substring(0, errorShapeName.length() - FAULT_CLASS_SUFFIX.length())) +
EXCEPTION_CLASS_SUFFIX;
} else if (errorShapeName.endsWith(EXCEPTION_CLASS_SUFFIX)) {
- return pascalCase(errorShapeName);
+ baseName = pascalCase(errorShapeName);
+ } else {
+ baseName = pascalCase(errorShapeName) + EXCEPTION_CLASS_SUFFIX;
+ }
+ if (baseName.equals(getServiceName() + EXCEPTION_CLASS_SUFFIX)) {
+ return COLLISION_DISAMBIGUATION_PREFIX + baseName;
}
- return pascalCase(errorShapeName) + EXCEPTION_CLASS_SUFFIX;
+ return baseName;
}
@Override
public String getRequestClassName(String operationName) {
- return pascalCase(operationName) + REQUEST_CLASS_SUFFIX;
+ String baseName = pascalCase(operationName) + REQUEST_CLASS_SUFFIX;
+ if (!operationName.equals(getServiceName())) {
+ return baseName;
+ }
+
+ return COLLISION_DISAMBIGUATION_PREFIX + baseName;
}
@Override
public String getResponseClassName(String operationName) {
- return pascalCase(operationName) + RESPONSE_CLASS_SUFFIX;
+ String baseName = pascalCase(operationName) + RESPONSE_CLASS_SUFFIX;
+ if (!operationName.equals(getServiceName())) {
+ return baseName;
+ }
+
+ return COLLISION_DISAMBIGUATION_PREFIX + baseName;
}
@Override
@@ -299,14 +317,20 @@ public String getExistenceCheckMethodName(String memberName, Shape parentShape)
@Override
public String getBeanStyleGetterMethodName(String memberName, Shape parentShape, Shape c2jShape) {
- String fluentGetterMethodName = getFluentGetterMethodName(memberName, parentShape, c2jShape);
+ String fluentGetterMethodName;
+ if (Utils.isOrContainsEnumShape(c2jShape, serviceModel.getShapes())) {
+ // Use the enum (modeled) name for bean-style getters
+ fluentGetterMethodName = getFluentEnumGetterMethodName(memberName, parentShape, c2jShape);
+ } else {
+ fluentGetterMethodName = getFluentGetterMethodName(memberName, parentShape, c2jShape);
+ }
return String.format("get%s", Utils.capitalize(fluentGetterMethodName));
}
@Override
public String getBeanStyleSetterMethodName(String memberName, Shape parentShape, Shape c2jShape) {
- String fluentSetterMethodName = getFluentSetterMethodName(memberName, parentShape, c2jShape);
- return String.format("set%s", Utils.capitalize(fluentSetterMethodName));
+ String beanStyleGetter = getBeanStyleGetterMethodName(memberName, parentShape, c2jShape);
+ return String.format("set%s", beanStyleGetter.substring("get".length()));
}
@Override
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
index 4686ea235649..626e176481b7 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
@@ -54,15 +54,32 @@ public TypeSpec poetSpec() {
.addJavadoc("Internal implementation of {@link $T}.", builderInterfaceName);
if (model.getEndpointOperation().isPresent()) {
- builder.addMethod(enableEndpointDiscovery());
+ builder.addMethod(endpointDiscoveryEnabled());
+
+ if (model.getCustomizationConfig().isEnableEndpointDiscoveryMethodRequired()) {
+ builder.addMethod(enableEndpointDiscovery());
+ }
}
return builder.addMethod(buildClientMethod()).build();
}
+ private MethodSpec endpointDiscoveryEnabled() {
+ return MethodSpec.methodBuilder("endpointDiscoveryEnabled")
+ .addAnnotation(Override.class)
+ .addModifiers(Modifier.PUBLIC)
+ .returns(builderClassName)
+ .addParameter(boolean.class, "endpointDiscoveryEnabled")
+ .addStatement("this.endpointDiscoveryEnabled = endpointDiscoveryEnabled")
+ .addStatement("return this")
+ .build();
+ }
+
private MethodSpec enableEndpointDiscovery() {
return MethodSpec.methodBuilder("enableEndpointDiscovery")
.addAnnotation(Override.class)
+ .addAnnotation(Deprecated.class)
+ .addJavadoc("@deprecated Use {@link #endpointDiscoveryEnabled($T)} instead.", boolean.class)
.addModifiers(Modifier.PUBLIC)
.returns(builderClassName)
.addStatement("endpointDiscoveryEnabled = true")
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
index c94af0736de7..8d7a13e9291e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
@@ -35,6 +35,7 @@
import software.amazon.awssdk.awscore.client.builder.AwsDefaultClientBuilder;
import software.amazon.awssdk.codegen.internal.Utils;
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
import software.amazon.awssdk.codegen.model.service.AuthType;
import software.amazon.awssdk.codegen.poet.ClassSpec;
import software.amazon.awssdk.codegen.poet.PoetUtils;
@@ -78,10 +79,12 @@ public TypeSpec poetSpec() {
ClassName.get(basePackage, model.getMetadata().getSyncBuilder()),
ClassName.get(basePackage, model.getMetadata().getAsyncBuilder()));
+ // Only services that require endpoint discovery for at least one of their operations get a default value of
+ // 'true'
if (model.getEndpointOperation().isPresent()) {
builder.addField(FieldSpec.builder(boolean.class, "endpointDiscoveryEnabled")
.addModifiers(PROTECTED)
- .initializer("false")
+ .initializer(resolveDefaultEndpointDiscovery() ? "true" : "false")
.build());
}
@@ -102,6 +105,12 @@ public TypeSpec poetSpec() {
return builder.build();
}
+ private boolean resolveDefaultEndpointDiscovery() {
+ return model.getEndpointOperation()
+ .map(OperationModel::isEndpointCacheRequired)
+ .orElse(false);
+ }
+
private MethodSpec signingNameMethod() {
return MethodSpec.methodBuilder("signingName")
.addAnnotation(Override.class)
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
index eca3edac13b0..f9e59dcfdb11 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
@@ -50,7 +50,11 @@ public TypeSpec poetSpec() {
.addJavadoc(getJavadoc());
if (model.getEndpointOperation().isPresent()) {
- builder.addMethod(enableEndpointDiscovery());
+ if (model.getCustomizationConfig().isEnableEndpointDiscoveryMethodRequired()) {
+ builder.addMethod(enableEndpointDiscovery());
+ }
+
+ builder.addMethod(endpointDiscovery());
}
if (model.getCustomizationConfig().getServiceSpecificClientConfigClass() != null) {
@@ -72,6 +76,16 @@ private MethodSpec enableEndpointDiscovery() {
return MethodSpec.methodBuilder("enableEndpointDiscovery")
.addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
.returns(TypeVariableName.get("B"))
+ .addAnnotation(Deprecated.class)
+ .addJavadoc("@deprecated Use {@link #endpointDiscoveryEnabled($T)} instead.", boolean.class)
+ .build();
+ }
+
+ private MethodSpec endpointDiscovery() {
+ return MethodSpec.methodBuilder("endpointDiscoveryEnabled")
+ .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
+ .returns(TypeVariableName.get("B"))
+ .addParameter(boolean.class, "endpointDiscovery")
.build();
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
index 323415e20241..aa9b89d450c9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
@@ -54,15 +54,32 @@ public TypeSpec poetSpec() {
.addJavadoc("Internal implementation of {@link $T}.", builderInterfaceName);
if (model.getEndpointOperation().isPresent()) {
- builder.addMethod(enableEndpointDiscovery());
+ builder.addMethod(endpointDiscoveryEnabled());
+
+ if (model.getCustomizationConfig().isEnableEndpointDiscoveryMethodRequired()) {
+ builder.addMethod(enableEndpointDiscovery());
+ }
}
return builder.addMethod(buildClientMethod()).build();
}
+ private MethodSpec endpointDiscoveryEnabled() {
+ return MethodSpec.methodBuilder("endpointDiscoveryEnabled")
+ .addAnnotation(Override.class)
+ .addModifiers(Modifier.PUBLIC)
+ .returns(builderClassName)
+ .addParameter(boolean.class, "endpointDiscoveryEnabled")
+ .addStatement("this.endpointDiscoveryEnabled = endpointDiscoveryEnabled")
+ .addStatement("return this")
+ .build();
+ }
+
private MethodSpec enableEndpointDiscovery() {
return MethodSpec.methodBuilder("enableEndpointDiscovery")
.addAnnotation(Override.class)
+ .addAnnotation(Deprecated.class)
+ .addJavadoc("@deprecated Use {@link #endpointDiscoveryEnabled($T)} instead.", boolean.class)
.addModifiers(Modifier.PUBLIC)
.returns(builderClassName)
.addStatement("endpointDiscoveryEnabled = true")
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
index b7045285fd95..cdb25d0f3016 100644
--- 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
@@ -18,6 +18,7 @@
import static com.squareup.javapoet.TypeSpec.Builder;
import static java.util.Collections.singletonList;
import static javax.lang.model.element.Modifier.PRIVATE;
+import static javax.lang.model.element.Modifier.STATIC;
import static software.amazon.awssdk.codegen.poet.client.ClientClassUtils.applyPaginatorUserAgentMethod;
import static software.amazon.awssdk.codegen.poet.client.ClientClassUtils.applySignerOverrideMethod;
import static software.amazon.awssdk.codegen.poet.client.SyncClientClass.getProtocolSpecs;
@@ -31,6 +32,7 @@
import com.squareup.javapoet.TypeSpec;
import java.net.URI;
import java.nio.ByteBuffer;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;
@@ -46,7 +48,6 @@
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
import software.amazon.awssdk.codegen.model.config.customization.UtilitiesMethod;
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
-import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
import software.amazon.awssdk.codegen.poet.PoetExtensions;
@@ -54,6 +55,7 @@
import software.amazon.awssdk.codegen.poet.StaticImport;
import software.amazon.awssdk.codegen.poet.client.specs.ProtocolSpec;
import software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.async.SdkPublisher;
import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
@@ -61,11 +63,16 @@
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
+import software.amazon.awssdk.core.metrics.CoreMetric;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
import software.amazon.awssdk.utils.CompletableFutureUtils;
import software.amazon.awssdk.utils.FunctionalUtils;
public final class AsyncClientClass extends AsyncClientInterface {
+ private static final String PUBLISHER_NAME = "metricPublishers";
+ private static final String METRIC_COLLECTOR_NAME = "apiCallMetricCollector";
private final IntermediateModel model;
private final PoetExtensions poetExtensions;
private final ClassName className;
@@ -101,7 +108,8 @@ public TypeSpec poetSpec() {
.addMethods(operations())
.addMethod(closeMethod())
.addMethods(protocolSpec.additionalMethods())
- .addMethod(protocolSpec.initProtocolFactory(model));
+ .addMethod(protocolSpec.initProtocolFactory(model))
+ .addMethod(resolveMetricPublishersMethod());
// Kinesis doesn't support CBOR for STS yet so need another protocol factory for JSON
if (model.getMetadata().isCborProtocol()) {
@@ -190,9 +198,18 @@ private MethodSpec closeMethod() {
protected MethodSpec.Builder operationBody(MethodSpec.Builder builder, OperationModel opModel) {
builder.addModifiers(Modifier.PUBLIC)
- .addAnnotation(Override.class)
- .beginControlFlow("try")
- .addCode(ClientClassUtils.callApplySignerOverrideMethod(opModel))
+ .addAnnotation(Override.class);
+
+ builder.addStatement("$1T $2N = $1T.create($3S)",
+ MetricCollector.class, METRIC_COLLECTOR_NAME, "ApiCall");
+ builder.beginControlFlow("try");
+
+ builder.addStatement("$N.reportMetric($T.$L, $S)", METRIC_COLLECTOR_NAME, CoreMetric.class, "SERVICE_ID",
+ model.getMetadata().getServiceId());
+ builder.addStatement("$N.reportMetric($T.$L, $S)", METRIC_COLLECTOR_NAME, CoreMetric.class, "OPERATION_NAME",
+ opModel.getOperationName());
+
+ builder.addCode(ClientClassUtils.callApplySignerOverrideMethod(opModel))
.addCode(ClientClassUtils.addEndpointTraitCode(opModel))
.addCode(protocolSpec.responseHandler(model, opModel));
protocolSpec.errorResponseHandler(opModel).ifPresent(builder::addCode);
@@ -224,8 +241,16 @@ protected MethodSpec.Builder operationBody(MethodSpec.Builder builder, Operation
"() -> $N.exceptionOccurred(t))", paramName);
}
- return builder.addStatement("return $T.failedFuture(t)", CompletableFutureUtils.class)
- .endControlFlow();
+ builder.addStatement("$T<$T> $N = resolveMetricPublishers(clientConfiguration, $N.overrideConfiguration().orElse(null))",
+ List.class,
+ MetricPublisher.class,
+ PUBLISHER_NAME,
+ opModel.getInput().getVariableName())
+ .addStatement("$N.forEach(p -> p.publish($N.collect()))", PUBLISHER_NAME, "apiCallMetricCollector")
+ .addStatement("return $T.failedFuture(t)", CompletableFutureUtils.class)
+ .endControlFlow();
+
+ return builder;
}
@Override
@@ -273,7 +298,7 @@ private CodeBlock createEventStreamTaggedUnionJsonMarshaller(ShapeModel eventStr
EventStreamTaggedUnionJsonMarshaller.class);
List eventNames = EventStreamUtils.getEventMembers(eventStreamShape)
- .map(MemberModel::getC2jName)
+ .map(m -> m.getShape().getShapeName())
.collect(Collectors.toList());
eventNames.forEach(event -> builder.add(".putMarshaller($T.class, new $T(protocolFactory))",
@@ -301,4 +326,39 @@ private MethodSpec utilitiesMethod() {
String.join(",", config.getCreateMethodParams()))
.build();
}
+
+ private MethodSpec resolveMetricPublishersMethod() {
+ String clientConfigName = "clientConfiguration";
+ String requestOverrideConfigName = "requestOverrideConfiguration";
+
+ MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("resolveMetricPublishers")
+ .addModifiers(PRIVATE, STATIC)
+ .returns(ParameterizedTypeName.get(List.class, MetricPublisher.class))
+ .addParameter(SdkClientConfiguration.class, clientConfigName)
+ .addParameter(RequestOverrideConfiguration.class, requestOverrideConfigName);
+
+ String publishersName = "publishers";
+
+ methodBuilder.addStatement("$T $N = null", ParameterizedTypeName.get(List.class, MetricPublisher.class), publishersName);
+
+ methodBuilder.beginControlFlow("if ($N != null)", requestOverrideConfigName)
+ .addStatement("$N = $N.metricPublishers()", publishersName, requestOverrideConfigName)
+ .endControlFlow();
+
+ methodBuilder.beginControlFlow("if ($1N == null || $1N.isEmpty())", publishersName)
+ .addStatement("$N = $N.option($T.$N)",
+ publishersName,
+ clientConfigName,
+ SdkClientOption.class,
+ "METRIC_PUBLISHERS")
+ .endControlFlow();
+
+ methodBuilder.beginControlFlow("if ($1N == null)", publishersName)
+ .addStatement("$N = $T.emptyList()", publishersName, Collections.class)
+ .endControlFlow();
+
+ methodBuilder.addStatement("return $N", publishersName);
+
+ return methodBuilder.build();
+ }
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
index cd26f0fc0a5b..d330e2959eae 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
@@ -17,16 +17,19 @@
import static javax.lang.model.element.Modifier.FINAL;
import static javax.lang.model.element.Modifier.PRIVATE;
+import static javax.lang.model.element.Modifier.STATIC;
import static software.amazon.awssdk.codegen.poet.client.ClientClassUtils.applyPaginatorUserAgentMethod;
import static software.amazon.awssdk.codegen.poet.client.ClientClassUtils.applySignerOverrideMethod;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.FieldSpec;
import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeSpec;
import com.squareup.javapoet.TypeSpec.Builder;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import javax.lang.model.element.Modifier;
@@ -47,11 +50,15 @@
import software.amazon.awssdk.codegen.poet.client.specs.QueryProtocolSpec;
import software.amazon.awssdk.codegen.poet.client.specs.XmlProtocolSpec;
import software.amazon.awssdk.codegen.utils.PaginatorUtils;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
+import software.amazon.awssdk.core.metrics.CoreMetric;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
//TODO Make SyncClientClass extend SyncClientInterface (similar to what we do in AsyncClientClass)
public class SyncClientClass implements ClassSpec {
@@ -84,7 +91,8 @@ public TypeSpec poetSpec() {
.addMethod(constructor())
.addMethod(nameMethod())
.addMethods(protocolSpec.additionalMethods())
- .addMethods(operations());
+ .addMethods(operations())
+ .addMethod(resolveMetricPublishersMethod());
protocolSpec.createErrorResponseHandler().ifPresent(classBuilder::addMethod);
@@ -186,7 +194,28 @@ private List operationMethodSpecs(OperationModel opModel) {
method.endControlFlow();
}
- method.addCode(protocolSpec.executionHandler(opModel));
+ String metricCollectorName = "apiCallMetricCollector";
+
+ method.addStatement("$1T $2N = $1T.create($3S)",
+ MetricCollector.class, metricCollectorName, "ApiCall");
+
+ String publishersName = "metricPublishers";
+
+ method.beginControlFlow("try")
+ .addStatement("$N.reportMetric($T.$L, $S)", metricCollectorName, CoreMetric.class, "SERVICE_ID",
+ model.getMetadata().getServiceId())
+ .addStatement("$N.reportMetric($T.$L, $S)", metricCollectorName, CoreMetric.class, "OPERATION_NAME",
+ opModel.getOperationName())
+ .addCode(protocolSpec.executionHandler(opModel))
+ .endControlFlow()
+ .beginControlFlow("finally")
+ .addStatement("$T<$T> $N = resolveMetricPublishers(clientConfiguration, $N.overrideConfiguration().orElse(null))",
+ List.class,
+ MetricPublisher.class,
+ publishersName,
+ opModel.getInput().getVariableName())
+ .addStatement("$N.forEach(p -> p.publish($N.collect()))", publishersName, metricCollectorName)
+ .endControlFlow();
methods.add(method.build());
@@ -259,4 +288,39 @@ static ProtocolSpec getProtocolSpecs(PoetExtensions poetExtensions, Intermediate
throw new RuntimeException("Unknown protocol: " + protocol.name());
}
}
+
+ private MethodSpec resolveMetricPublishersMethod() {
+ String clientConfigName = "clientConfiguration";
+ String requestOverrideConfigName = "requestOverrideConfiguration";
+
+ MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("resolveMetricPublishers")
+ .addModifiers(PRIVATE, STATIC)
+ .returns(ParameterizedTypeName.get(List.class, MetricPublisher.class))
+ .addParameter(SdkClientConfiguration.class, clientConfigName)
+ .addParameter(RequestOverrideConfiguration.class, requestOverrideConfigName);
+
+ String publishersName = "publishers";
+
+ methodBuilder.addStatement("$T $N = null", ParameterizedTypeName.get(List.class, MetricPublisher.class), publishersName);
+
+ methodBuilder.beginControlFlow("if ($N != null)", requestOverrideConfigName)
+ .addStatement("$N = $N.metricPublishers()", publishersName, requestOverrideConfigName)
+ .endControlFlow();
+
+ methodBuilder.beginControlFlow("if ($1N == null || $1N.isEmpty())", publishersName)
+ .addStatement("$N = $N.option($T.$N)",
+ publishersName,
+ clientConfigName,
+ SdkClientOption.class,
+ "METRIC_PUBLISHERS")
+ .endControlFlow();
+
+ methodBuilder.beginControlFlow("if ($1N == null)", publishersName)
+ .addStatement("$N = $T.emptyList()", publishersName, Collections.class)
+ .endControlFlow();
+
+ methodBuilder.addStatement("return $N", publishersName);
+
+ return methodBuilder.build();
+ }
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
index 83e01de1c01f..30f089297401 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
@@ -28,6 +28,7 @@
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import javax.lang.model.element.Modifier;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
import software.amazon.awssdk.awscore.eventstream.EventStreamAsyncResponseTransformer;
import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionPojoSupplier;
import software.amazon.awssdk.awscore.eventstream.RestEventStreamAsyncResponseTransformer;
@@ -39,6 +40,7 @@
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
import software.amazon.awssdk.codegen.poet.PoetExtensions;
import software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils;
+import software.amazon.awssdk.core.SdkPojoBuilder;
import software.amazon.awssdk.core.SdkResponse;
import software.amazon.awssdk.core.async.AsyncRequestBody;
import software.amazon.awssdk.core.client.handler.AttachHttpMetadataResponseHandler;
@@ -177,6 +179,8 @@ public CodeBlock executionHandler(OperationModel opModel) {
"errorResponseHandler",
opModel.getInput().getVariableName());
+ codeBlock.add(".withMetricCollector($N)", "apiCallMetricCollector");
+
if (opModel.hasStreamingInput()) {
codeBlock.add(".withRequestBody(requestBody)")
.add(".withMarshaller($L)", syncStreamingMarshaller(model, opModel, marshaller));
@@ -239,6 +243,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
"$L" +
".withResponseHandler($L)\n" +
".withErrorResponseHandler(errorResponseHandler)\n" +
+ ".withMetricCollector(apiCallMetricCollector)\n" +
hostPrefixExpression(opModel) +
discoveredEndpoint(opModel) +
asyncRequestBody +
@@ -263,7 +268,13 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
asyncResponseTransformerVariable(isStreaming, isRestJson, opModel));
String whenComplete = whenCompleteBody(opModel, customerResponseHandler);
if (!whenComplete.isEmpty()) {
- builder.add("executeFuture$L;", whenComplete);
+ String whenCompletedFutureName = "whenCompleted";
+ builder.addStatement("$T requestOverrideConfig = $L.overrideConfiguration().orElse(null)",
+ AwsRequestOverrideConfiguration.class, opModel.getInput().getVariableName());
+ builder.addStatement("$T<$T> $N = $N$L", CompletableFuture.class, executeFutureValueType,
+ whenCompletedFutureName, "executeFuture", whenComplete);
+ builder.addStatement("executeFuture = $T.forwardExceptionTo($N, executeFuture)",
+ CompletableFutureUtils.class, whenCompletedFutureName);
}
if (opModel.hasEventStreamOutput()) {
builder.addStatement("return $T.forwardExceptionTo(future, executeFuture)", CompletableFutureUtils.class);
@@ -323,7 +334,7 @@ private String whenCompleteBody(OperationModel operationModel, String responseHa
return streamingOutputWhenComplete(responseHandlerName);
} else {
// Non streaming can just return the future as is
- return "";
+ return publishMetricsWhenComplete();
}
}
@@ -333,6 +344,7 @@ private String whenCompleteBody(OperationModel operationModel, String responseHa
* {@link EventStreamAsyncResponseTransformer}. Failure is notified via the normal future (the one returned by the client
* handler).
*
+ *
* @param responseHandlerName Variable name of response handler customer passed in.
* @return whenComplete to append to future.
*/
@@ -344,12 +356,12 @@ private String eventStreamOutputWhenComplete(String responseHandlerName) {
+ " } finally {"
+ " future.completeExceptionally(e);"
+ " }"
- + " }%n"
- + "})", responseHandlerName);
+ + " }"
+ + "%s"
+ + "})", responseHandlerName, publishMetrics());
}
-
@Override
public Optional createErrorResponseHandler() {
ClassName httpResponseHandler = ClassName.get(HttpResponseHandler.class);
@@ -417,11 +429,11 @@ private void responseHandlersForEventStreaming(OperationModel opModel, TypeName
protocolFactory,
JsonOperationMetadata.class,
ClassName.get(EventStreamTaggedUnionPojoSupplier.class));
- EventStreamUtils.getEvents(eventStream)
+ EventStreamUtils.getEventMembers(eventStream)
.forEach(m -> builder.add(".putSdkPojoSupplier(\"$L\", $T::builder)\n",
- m.getC2jName(), poetExtensions.getModelClass(m.getC2jName())));
- builder.add(".defaultSdkPojoSupplier(() -> $T.UNKNOWN)\n"
- + ".build());\n", eventStreamBaseClass);
+ m.getC2jName(), poetExtensions.getModelClass(m.getShape().getC2jName())));
+ builder.add(".defaultSdkPojoSupplier(() -> new $T($T.UNKNOWN))\n"
+ + ".build());\n", SdkPojoBuilder.class, eventStreamBaseClass);
}
private String protocolFactoryLiteral(IntermediateModel model, OperationModel opModel) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java
index 38ba7afc1f8f..f374500e8997 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java
@@ -155,7 +155,8 @@ default String streamingOutputWhenComplete(String responseHandlerName) {
+ " runAndLogError(log, \"Exception thrown in exceptionOccurred callback, ignoring\", () "
+ "-> %s.exceptionOccurred(e));%n"
+ " }%n"
- + "})", responseHandlerName);
+ + "%s"
+ + "})", responseHandlerName, publishMetrics());
}
@@ -177,4 +178,16 @@ default TypeName executeFutureValueType(OperationModel opModel, PoetExtensions p
default TypeName getPojoResponseType(OperationModel opModel, PoetExtensions poetExtensions) {
return poetExtensions.getModelClass(opModel.getReturnType().getReturnType());
}
+
+ default String publishMetricsWhenComplete() {
+ return String.format(".whenComplete((r, e) -> {%n"
+ + "%s%n"
+ + "})", publishMetrics());
+ }
+
+ default String publishMetrics() {
+ return "List metricPublishers = resolveMetricPublishers(clientConfiguration, "
+ + "requestOverrideConfig);\n"
+ + "metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));";
+ }
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java
index cd6b0b2dc94d..1c6327a0e063 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java
@@ -24,6 +24,7 @@
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import javax.lang.model.element.Modifier;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
@@ -31,6 +32,7 @@
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
import software.amazon.awssdk.core.http.HttpResponseHandler;
import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory;
+import software.amazon.awssdk.utils.CompletableFutureUtils;
public class QueryProtocolSpec implements ProtocolSpec {
@@ -113,6 +115,9 @@ public CodeBlock executionHandler(OperationModel opModel) {
"responseHandler",
"errorResponseHandler",
opModel.getInput().getVariableName());
+
+ codeBlock.add(".withMetricCollector($N)", "apiCallMetricCollector");
+
if (opModel.hasStreamingInput()) {
return codeBlock.add(".withRequestBody(requestBody)")
.add(".withMarshaller($L));", syncStreamingMarshaller(intermediateModel, opModel, marshaller))
@@ -137,6 +142,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
".withMarshaller($L)" +
".withResponseHandler(responseHandler)" +
".withErrorResponseHandler($N)\n" +
+ ".withMetricCollector(apiCallMetricCollector)\n" +
hostPrefixExpression(opModel) +
asyncRequestBody +
".withInput($L) $L);",
@@ -151,11 +157,20 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
"errorResponseHandler",
opModel.getInput().getVariableName(),
opModel.hasStreamingOutput() ? ", asyncResponseTransformer" : "");
+ builder.addStatement("$T requestOverrideConfig = $L.overrideConfiguration().orElse(null)",
+ AwsRequestOverrideConfiguration.class, opModel.getInput().getVariableName());
+ String whenCompleteFutureName = "whenCompleteFuture";
+ builder.addStatement("$T $N = null", ParameterizedTypeName.get(ClassName.get(CompletableFuture.class),
+ executeFutureValueType), whenCompleteFutureName);
if (opModel.hasStreamingOutput()) {
- builder.add("executeFuture$L;", streamingOutputWhenComplete("asyncResponseTransformer"));
+ builder.addStatement("$N = executeFuture$L", whenCompleteFutureName,
+ streamingOutputWhenComplete("asyncResponseTransformer"));
+ } else {
+ builder.addStatement("$N = executeFuture$L", whenCompleteFutureName, publishMetricsWhenComplete());
}
- builder.addStatement("return executeFuture");
+ builder.addStatement("return $T.forwardExceptionTo($N, executeFuture)", CompletableFutureUtils.class,
+ whenCompleteFutureName);
return builder.build();
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java
index 55beb7078878..782c3a02bb48 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java
@@ -20,12 +20,15 @@
import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName;
import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
import software.amazon.awssdk.codegen.poet.PoetExtensions;
import software.amazon.awssdk.core.http.HttpResponseHandler;
import software.amazon.awssdk.protocols.xml.AwsXmlProtocolFactory;
import software.amazon.awssdk.protocols.xml.XmlOperationMetadata;
+import software.amazon.awssdk.utils.CompletableFutureUtils;
public final class XmlProtocolSpec extends QueryProtocolSpec {
@@ -111,6 +114,7 @@ public CodeBlock executionHandler(OperationModel opModel) {
.add("\n\nreturn clientHandler.execute(new $T<$T, $T>()" +
".withOperationName(\"$N\")\n" +
".withCombinedResponseHandler($N)" +
+ ".withMetricCollector(apiCallMetricCollector)\n" +
hostPrefixExpression(opModel) +
discoveredEndpoint(opModel) +
".withInput($L)",
@@ -120,6 +124,9 @@ public CodeBlock executionHandler(OperationModel opModel) {
opModel.getOperationName(),
"responseHandler",
opModel.getInput().getVariableName());
+
+ codeBlock.add(".withMetricCollector($N)", "apiCallMetricCollector");
+
if (opModel.hasStreamingInput()) {
return codeBlock.add(".withRequestBody(requestBody)")
.add(".withMarshaller($L));", syncStreamingMarshaller(intermediateModel, opModel, marshaller))
@@ -166,10 +173,20 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
opModel.getInput().getVariableName(),
opModel.hasStreamingOutput() ? ", asyncResponseTransformer" : "");
+ builder.addStatement("$T requestOverrideConfig = $L.overrideConfiguration().orElse(null)",
+ AwsRequestOverrideConfiguration.class, opModel.getInput().getVariableName());
+
+ String whenCompleteFutureName = "whenCompleteFuture";
+ builder.addStatement("$T $N = null", ParameterizedTypeName.get(ClassName.get(CompletableFuture.class),
+ executeFutureValueType), whenCompleteFutureName);
if (opModel.hasStreamingOutput()) {
- builder.add("executeFuture$L;", streamingOutputWhenComplete("asyncResponseTransformer"));
+ builder.addStatement("$N = executeFuture$L", whenCompleteFutureName,
+ streamingOutputWhenComplete("asyncResponseTransformer"));
+ } else {
+ builder.addStatement("$N = executeFuture$L", whenCompleteFutureName, publishMetricsWhenComplete());
}
- builder.addStatement("return executeFuture");
+ builder.addStatement("return $T.forwardExceptionTo($N, executeFuture)", CompletableFutureUtils.class,
+ whenCompleteFutureName);
return builder.build();
}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java
index 2ebf9a991d4d..a0042abb63b3 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java
@@ -27,6 +27,7 @@
import com.squareup.javapoet.TypeSpec;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
@@ -38,6 +39,7 @@
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryCacheLoader;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryEndpoint;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
+import software.amazon.awssdk.utils.Validate;
public class EndpointDiscoveryAsyncCacheLoaderGenerator implements ClassSpec {
@@ -100,12 +102,15 @@ private MethodSpec discoverEndpoint(OperationModel opModel) {
.returns(returnType);
if (!opModel.getInputShape().isHasHeaderMember()) {
+ ClassName endpointClass = poetExtensions.getModelClass("Endpoint");
methodBuilder.addCode("return $L.$L($L.builder().build()).thenApply(r -> {",
CLIENT_FIELD,
opModel.getMethodName(),
poetExtensions.getModelClass(opModel.getInputShape().getC2jName()))
- .addStatement("$T endpoint = r.endpoints().get(0)",
- poetExtensions.getModelClass("Endpoint"))
+ .addStatement("$T<$T> endpoints = r.endpoints()", List.class, endpointClass)
+ .addStatement("$T.notEmpty(endpoints, \"Endpoints returned by service for endpoint discovery must "
+ + "not be empty.\")", Validate.class)
+ .addStatement("$T endpoint = endpoints.get(0)", endpointClass)
.addStatement("return $T.builder().endpoint(toUri(endpoint.address(), $L.defaultEndpoint()))" +
".expirationTime($T.now().plus(endpoint.cachePeriodInMinutes(), $T.MINUTES)).build()",
EndpointDiscoveryEndpoint.class,
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java
index 5661979673c5..b52f1354b820 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java
@@ -27,6 +27,7 @@
import com.squareup.javapoet.TypeSpec;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
@@ -38,6 +39,7 @@
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryCacheLoader;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryEndpoint;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
+import software.amazon.awssdk.utils.Validate;
public class EndpointDiscoveryCacheLoaderGenerator implements ClassSpec {
@@ -101,14 +103,18 @@ private MethodSpec discoverEndpoint(OperationModel opModel) {
.returns(returnType);
if (!opModel.getInputShape().isHasHeaderMember()) {
+ ClassName endpointClass = poetExtensions.getModelClass("Endpoint");
methodBuilder.addCode("return $T.supplyAsync(() -> {", CompletableFuture.class)
.addStatement("$T response = $L.$L($L.builder().build())",
poetExtensions.getModelClass(opModel.getOutputShape().getC2jName()),
CLIENT_FIELD,
opModel.getMethodName(),
poetExtensions.getModelClass(opModel.getInputShape().getC2jName()))
- .addStatement("$T endpoint = response.endpoints().get(0)",
- poetExtensions.getModelClass("Endpoint"))
+ .addStatement("$T<$T> endpoints = response.endpoints()", List.class, endpointClass)
+ .addStatement("$T.notEmpty(endpoints, \"Endpoints returned by service for endpoint discovery must "
+ + "not be empty.\")", Validate.class)
+ .addStatement("$T endpoint = endpoints.get(0)",
+ endpointClass)
.addStatement("return $T.builder().endpoint(toUri(endpoint.address(), $L.defaultEndpoint()))" +
".expirationTime($T.now().plus(endpoint.cachePeriodInMinutes(), $T.MINUTES)).build()",
EndpointDiscoveryEndpoint.class,
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java
index cbd1489bfde4..c238fc6b202d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java
@@ -15,7 +15,10 @@
package software.amazon.awssdk.codegen.poet.eventstream;
+import java.util.Collection;
import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
@@ -55,10 +58,11 @@ public static ShapeModel getEventStreamInResponse(ShapeModel responseShape) {
}
/**
- * Get event stream shape from a request/response shape model. Otherwise return empty optional.
+ * Get event stream shape from a request/response shape model. Otherwise, throw
*
* @param shapeModel request or response shape of an operation
- * @return Optional containing the Eventstream shape
+ * @return the EventStream shape
+ * @throws IllegalStateException if there is no associated event stream shape
*/
private static ShapeModel eventStreamFrom(ShapeModel shapeModel) {
if (shapeModel == null || shapeModel.getMembers() == null) {
@@ -80,17 +84,15 @@ private static ShapeModel eventStreamFrom(ShapeModel shapeModel) {
*
* @param model Intermediate model
* @param eventShape shape with "event: true" trait
- * @return the event stream shape (eventstream: true) that contains the given event.
+ * @return the event stream shape (eventstream: true) that contains the given event, or an empty optional if the C2J shape
+ * is marked as an event but the intermediate model representation is not used by an event stream
*/
- public static ShapeModel getBaseEventStreamShape(IntermediateModel model, ShapeModel eventShape) {
+ public static Optional getBaseEventStreamShape(IntermediateModel model, ShapeModel eventShape) {
return model.getShapes().values()
.stream()
.filter(ShapeModel::isEventStream)
.filter(s -> s.getMembers().stream().anyMatch(m -> m.getShape().equals(eventShape)))
- .findFirst()
- .orElseThrow(() -> new IllegalStateException(
- String.format("Event shape %s not referenced in model by any eventstream shape",
- eventShape.getC2jName())));
+ .findFirst();
}
/**
@@ -116,16 +118,21 @@ public static Stream getEventMembers(ShapeModel eventStreamShape) {
}
/**
- * Returns the first operation that contains the given event stream shape. The event stream can be in operation
+ * Returns the all operations that contain the given event stream shape. The event stream can be in operation
* request or response shape.
*/
- public static OperationModel findOperationWithEventStream(IntermediateModel model, ShapeModel eventStreamShape) {
- return model.getOperations().values()
+ public static Collection findOperationsWithEventStream(IntermediateModel model, ShapeModel eventStreamShape) {
+ Collection operations = model.getOperations().values()
.stream()
.filter(op -> operationContainsEventStream(op, eventStreamShape))
- .findFirst()
- .orElseThrow(() -> new IllegalStateException(String.format(
- "%s is an event shape but has no corresponding operation in the model", eventStreamShape.getC2jName())));
+ .collect(Collectors.toList());
+
+ if (operations.isEmpty()) {
+ throw new IllegalStateException(String.format(
+ "%s is an event shape but has no corresponding operation in the model", eventStreamShape.getC2jName()));
+ }
+
+ return operations;
}
/**
@@ -145,14 +152,11 @@ public static boolean doesShapeContainsEventStream(ShapeModel parentShape, Shape
* Returns true if the given event shape is a sub-member of any operation request.
*/
public static boolean isRequestEvent(IntermediateModel model, ShapeModel eventShape) {
- try {
- ShapeModel eventStreamShape = getBaseEventStreamShape(model, eventShape);
- return model.getOperations().values()
- .stream()
- .anyMatch(o -> doesShapeContainsEventStream(o.getInputShape(), eventStreamShape));
- } catch (IllegalStateException e) {
- return false;
- }
+ return getBaseEventStreamShape(model, eventShape)
+ .map(stream -> model.getOperations().values()
+ .stream()
+ .anyMatch(o -> doesShapeContainsEventStream(o.getInputShape(), stream)))
+ .orElse(false);
}
private static boolean operationContainsEventStream(OperationModel opModel, ShapeModel eventStreamShape) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java
index 65689e909b5a..c92fb5020e62 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java
@@ -28,6 +28,7 @@
import com.squareup.javapoet.WildcardTypeName;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@ -84,46 +85,40 @@ public AwsServiceModel(IntermediateModel intermediateModel, ShapeModel shapeMode
@Override
public TypeSpec poetSpec() {
if (shapeModel.isEventStream()) {
- OperationModel opModel = EventStreamUtils.findOperationWithEventStream(intermediateModel,
- shapeModel);
- String apiName = poetExtensions.getApiName(opModel);
- ClassName modelClass = poetExtensions.getModelClassFromShape(shapeModel);
+ Collection opModels = EventStreamUtils.findOperationsWithEventStream(intermediateModel,
+ shapeModel);
- if (EventStreamUtils.doesShapeContainsEventStream(opModel.getOutputShape(), shapeModel)) {
- ClassName responseHandlerClass = poetExtensions.eventStreamResponseHandlerType(opModel);
- return PoetUtils.createInterfaceBuilder(modelClass)
- .addAnnotation(SdkPublicApi.class)
- .addSuperinterface(ClassName.get(SdkPojo.class))
- .addJavadoc("Base interface for all event types of the $L API.", apiName)
- .addField(FieldSpec.builder(modelClass, "UNKNOWN")
- .addModifiers(PUBLIC, Modifier.STATIC, Modifier.FINAL)
- .initializer(CodeBlock.builder()
- .add("new $T() {\n"
- + " @Override\n"
- + " public $T<$T> sdkFields() {\n"
- + " return $T.emptyList();\n"
- + " }\n"
- + " @Override\n"
- + " public void accept($T.Visitor visitor) {"
- + " \nvisitor.visitDefault(this);\n"
- + " }\n"
- + " };\n",
- modelClass, List.class, SdkField.class,
- Collections.class, responseHandlerClass
- )
- .build())
- .addJavadoc("Special type of {@link $T} for unknown types of events that this "
- + "version of the SDK does not know about", modelClass)
- .build())
- .addMethod(acceptMethodSpec(modelClass, responseHandlerClass)
- .addModifiers(Modifier.ABSTRACT)
- .build())
- .build();
+ Collection outputOperations = findOutputEventStreamOperations(opModels, shapeModel);
+
+ ClassName modelClass = poetExtensions.getModelClassFromShape(shapeModel);
- } else if (EventStreamUtils.doesShapeContainsEventStream(opModel.getInputShape(), shapeModel)) {
+ if (!outputOperations.isEmpty()) {
+ CodeBlock unknownInitializer = buildUnknownEventStreamInitializer(outputOperations,
+ modelClass);
+
+ TypeSpec.Builder builder =
+ PoetUtils.createInterfaceBuilder(modelClass)
+ .addAnnotation(SdkPublicApi.class)
+ .addSuperinterface(ClassName.get(SdkPojo.class))
+ .addJavadoc("Base interface for all event types in $L.", shapeModel.getShapeName())
+ .addField(FieldSpec.builder(modelClass, "UNKNOWN")
+ .addModifiers(PUBLIC, Modifier.STATIC, Modifier.FINAL)
+ .initializer(unknownInitializer)
+ .addJavadoc("Special type of {@link $T} for unknown types of events that this "
+ + "version of the SDK does not know about", modelClass)
+ .build());
+
+ for (OperationModel opModel : outputOperations) {
+ ClassName responseHandlerClass = poetExtensions.eventStreamResponseHandlerType(opModel);
+ builder.addMethod(acceptMethodSpec(modelClass, responseHandlerClass)
+ .addModifiers(Modifier.ABSTRACT)
+ .build());
+ }
+ return builder.build();
+ } else if (hasInputStreamOperations(opModels, shapeModel)) {
return PoetUtils.createInterfaceBuilder(modelClass)
.addAnnotation(SdkPublicApi.class)
- .addJavadoc("Base interface for all event types of the $L API.", apiName)
+ .addJavadoc("Base interface for all event types in $L.", shapeModel.getShapeName())
.build();
}
@@ -158,28 +153,9 @@ public TypeSpec poetSpec() {
}
if (this.shapeModel.isEvent()) {
- ShapeModel eventStream = EventStreamUtils.getBaseEventStreamShape(intermediateModel, shapeModel);
- ClassName eventStreamClassName = poetExtensions.getModelClassFromShape(eventStream);
- OperationModel opModel = EventStreamUtils.findOperationWithEventStream(intermediateModel,
- eventStream);
-
- if (EventStreamUtils.doesShapeContainsEventStream(opModel.getOutputShape(), eventStream)) {
- ClassName modelClass = poetExtensions.getModelClass(shapeModel.getShapeName());
- ClassName responseHandlerClass = poetExtensions.eventStreamResponseHandlerType(opModel);
- specBuilder.addSuperinterface(eventStreamClassName);
- specBuilder.addMethod(acceptMethodSpec(modelClass, responseHandlerClass)
- .addAnnotation(Override.class)
- .addCode(CodeBlock.builder()
- .addStatement("visitor.visit(this)")
- .build())
- .build());
-
- } else if (EventStreamUtils.doesShapeContainsEventStream(opModel.getInputShape(), eventStream)) {
- specBuilder.addSuperinterface(eventStreamClassName);
- } else {
- throw new IllegalArgumentException(shapeModel.getC2jName() + " event shape is not a member in any "
- + "request or response event shape");
- }
+ EventStreamUtils.getBaseEventStreamShape(intermediateModel, shapeModel).ifPresent(
+ eventStream -> addEventSupport(specBuilder, eventStream)
+ );
}
if (this.shapeModel.getDocumentation() != null) {
@@ -190,6 +166,71 @@ public TypeSpec poetSpec() {
}
}
+ private void addEventSupport(TypeSpec.Builder specBuilder, ShapeModel eventStream) {
+ ClassName eventStreamClassName = poetExtensions.getModelClassFromShape(eventStream);
+ Collection opModels = EventStreamUtils.findOperationsWithEventStream(intermediateModel,
+ eventStream);
+
+ Collection outputOperations = findOutputEventStreamOperations(opModels, eventStream);
+
+ if (!outputOperations.isEmpty()) {
+ ClassName modelClass = poetExtensions.getModelClass(shapeModel.getShapeName());
+ specBuilder.addSuperinterface(eventStreamClassName);
+ for (OperationModel opModel : outputOperations) {
+ ClassName responseHandlerClass = poetExtensions.eventStreamResponseHandlerType(opModel);
+ specBuilder.addMethod(acceptMethodSpec(modelClass, responseHandlerClass)
+ .addAnnotation(Override.class)
+ .addCode(CodeBlock.builder()
+ .addStatement("visitor.visit(this)")
+ .build())
+ .build());
+ }
+ } else if (hasInputStreamOperations(opModels, eventStream)) {
+ specBuilder.addSuperinterface(eventStreamClassName);
+ } else {
+ throw new IllegalArgumentException(shapeModel.getC2jName() + " event shape is not a member in any "
+ + "request or response event shape");
+ }
+ }
+
+ private boolean hasInputStreamOperations(Collection opModels, ShapeModel eventStream) {
+ return opModels.stream()
+ .anyMatch(op -> EventStreamUtils.doesShapeContainsEventStream(op.getInputShape(), eventStream));
+ }
+
+ private List findOutputEventStreamOperations(Collection opModels,
+ ShapeModel eventStream) {
+ return opModels
+ .stream()
+ .filter(opModel -> EventStreamUtils.doesShapeContainsEventStream(opModel.getOutputShape(), eventStream))
+ .collect(Collectors.toList());
+ }
+
+ private CodeBlock buildUnknownEventStreamInitializer(Collection outputOperations,
+ ClassName eventStreamModelClass) {
+ CodeBlock.Builder builder = CodeBlock.builder()
+ .add("new $T() {\n"
+ + " @Override\n"
+ + " public $T<$T> sdkFields() {\n"
+ + " return $T.emptyList();\n"
+ + " }\n",
+ eventStreamModelClass, List.class, SdkField.class,
+ Collections.class
+ );
+
+ for (OperationModel opModel : outputOperations) {
+ ClassName responseHandlerClass = poetExtensions.eventStreamResponseHandlerType(opModel);
+ builder.add(" @Override\n"
+ + " public void accept($T.Visitor visitor) {"
+ + " \nvisitor.visitDefault(this);\n"
+ + " }\n", responseHandlerClass);
+ }
+
+ builder.add(" }\n");
+
+ return builder.build();
+ }
+
private MethodSpec sdkFieldsMethod() {
ParameterizedTypeName sdkFieldType = ParameterizedTypeName.get(ClassName.get(SdkField.class),
WildcardTypeName.subtypeOf(ClassName.get(Object.class)));
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java
index ce001db96df5..0879d4eca6bf 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java
@@ -63,7 +63,7 @@ public PaginatorsClassSpec(IntermediateModel model, String c2jOperationName, Pag
this.poetExtensions = new PoetExtensions(model);
this.typeProvider = new TypeProvider(model);
this.operationModel = model.getOperation(c2jOperationName);
- this.paginationDocs = new PaginationDocs(model, operationModel);
+ this.paginationDocs = new PaginationDocs(model, operationModel, paginatorDefinition);
}
/**
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java
index a2bc02eb508b..ac04d95a7777 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java
@@ -84,7 +84,9 @@ protected FieldSpec operationInfoField() {
}
private String getMemberNameFromEventStream() {
- ShapeModel eventStream = EventStreamUtils.getBaseEventStreamShape(intermediateModel, shapeModel);
+ ShapeModel eventStream = EventStreamUtils.getBaseEventStreamShape(intermediateModel, shapeModel)
+ .orElseThrow(() -> new IllegalStateException("Could not find associated event stream spec for "
+ + shapeModel.getC2jName()));
return eventStream.getMembers().stream()
.filter(memberModel -> memberModel.getShape().equals(shapeModel))
.findAny()
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java
new file mode 100644
index 000000000000..378f45a6f4b4
--- /dev/null
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 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;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import org.junit.Test;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+
+public class IntermediateModelBuilderTest {
+
+ @Test
+ public void testServiceAndShapeNameCollisions() throws Exception {
+ final File modelFile = new File(IntermediateModelBuilderTest.class
+ .getResource("poet/client/c2j/collision/service-2.json").getFile());
+ IntermediateModel testModel = new IntermediateModelBuilder(
+ C2jModels.builder()
+ .serviceModel(ModelLoaderUtils.loadModel(ServiceModel.class, modelFile))
+ .customizationConfig(CustomizationConfig.create())
+ .build())
+ .build();
+
+ assertThat(testModel.getShapes().values())
+ .extracting(ShapeModel::getShapeName)
+ .containsExactlyInAnyOrder("DefaultCollisionException", "DefaultCollisionRequest", "DefaultCollisionResponse");
+ }
+
+ @Test
+ public void sharedOutputShapesLinkCorrectlyToOperationOutputs() {
+ final File modelFile = new File(IntermediateModelBuilderTest.class
+ .getResource("poet/client/c2j/shared-output/service-2.json").getFile());
+ IntermediateModel testModel = new IntermediateModelBuilder(
+ C2jModels.builder()
+ .serviceModel(ModelLoaderUtils.loadModel(ServiceModel.class, modelFile))
+ .customizationConfig(CustomizationConfig.create())
+ .build())
+ .build();
+
+ assertEquals("PingResponse", testModel.getOperation("Ping").getOutputShape().getShapeName());
+ assertEquals("SecurePingResponse", testModel.getOperation("SecurePing").getOutputShape().getShapeName());
+ }
+
+ @Test
+ public void defaultEndpointDiscovery_true() {
+ final File modelFile = new File(IntermediateModelBuilderTest.class
+ .getResource("poet/client/c2j/endpointdiscovery/service-2.json").getFile());
+ IntermediateModel testModel = new IntermediateModelBuilder(
+ C2jModels.builder()
+ .serviceModel(ModelLoaderUtils.loadModel(ServiceModel.class, modelFile))
+ .customizationConfig(CustomizationConfig.create())
+ .build())
+ .build();
+
+ assertTrue(testModel.getEndpointOperation().get().isEndpointCacheRequired());
+ }
+
+ @Test
+ public void defaultEndpointDiscovery_false() {
+ final File modelFile = new File(IntermediateModelBuilderTest.class
+ .getResource("poet/client/c2j/endpointdiscoveryoptional/service-2.json").getFile());
+ IntermediateModel testModel = new IntermediateModelBuilder(
+ C2jModels.builder()
+ .serviceModel(ModelLoaderUtils.loadModel(ServiceModel.class, modelFile))
+ .customizationConfig(CustomizationConfig.create())
+ .build())
+ .build();
+
+ assertFalse(testModel.getEndpointOperation().get().isEndpointCacheRequired());
+ }
+
+}
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java
new file mode 100644
index 000000000000..418e9b49b40a
--- /dev/null
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 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;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.File;
+import java.util.Collections;
+import org.junit.Test;
+import software.amazon.awssdk.codegen.C2jModels;
+import software.amazon.awssdk.codegen.IntermediateModelBuilder;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.service.ServiceMetadata;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+
+public class IntermediateModelTest {
+
+ @Test
+ public void cannotFindShapeWhenNoShapesExist() {
+
+ ServiceMetadata metadata = new ServiceMetadata();
+ metadata.setProtocol(Protocol.REST_JSON.getValue());
+ metadata.setServiceId("empty-service");
+ metadata.setSignatureVersion("V4");
+
+ IntermediateModel testModel = new IntermediateModelBuilder(
+ C2jModels.builder()
+ .serviceModel(new ServiceModel(metadata,
+ Collections.emptyMap(),
+ Collections.emptyMap(),
+ Collections.emptyMap()))
+ .customizationConfig(CustomizationConfig.create())
+ .build())
+ .build();
+
+ assertThatThrownBy(() -> testModel.getShapeByNameAndC2jName("AnyShape", "AnyShape"))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("C2J shape AnyShape with shape name AnyShape does not exist in the intermediate model.");
+ }
+
+ @Test
+ public void getShapeByNameAndC2jNameVerifiesC2JName() {
+ final File modelFile = new File(IntermediateModelTest.class
+ .getResource("../../poet/client/c2j/shared-output/service-2.json").getFile());
+ IntermediateModel testModel = new IntermediateModelBuilder(
+ C2jModels.builder()
+ .serviceModel(ModelLoaderUtils.loadModel(ServiceModel.class, modelFile))
+ .customizationConfig(CustomizationConfig.create())
+ .build())
+ .build();
+
+
+
+ assertThatThrownBy(() -> testModel.getShapeByNameAndC2jName("PingResponse", "AnyShape"))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("C2J shape AnyShape with shape name PingResponse does not exist in the intermediate model.");
+ }
+}
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java
index 88f1298f12fb..f30c642cbeb6 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java
@@ -250,6 +250,8 @@ public void sharedModel_providingPackageName_shouldUseProvidedPacakgeName() {
@Test
public void modelNameShouldHavePascalCase() {
+ when(serviceModel.getMetadata()).thenReturn(serviceMetadata);
+ when(serviceMetadata.getServiceId()).thenReturn("UnitTestService");
assertThat(strat.getRequestClassName("CAPSTest")).isEqualTo("CapsTestRequest");
assertThat(strat.getExceptionName("CAPSTest")).isEqualTo("CapsTestException");
assertThat(strat.getResponseClassName("CAPSTest")).isEqualTo("CapsTestResponse");
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/SharedStreamAwsModelSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/SharedStreamAwsModelSpecTest.java
new file mode 100644
index 000000000000..dffbe834b6fd
--- /dev/null
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/SharedStreamAwsModelSpecTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 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.poet.model;
+
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
+import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Locale;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import software.amazon.awssdk.codegen.C2jModels;
+import software.amazon.awssdk.codegen.IntermediateModelBuilder;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+
+@RunWith(Parameterized.class)
+public class SharedStreamAwsModelSpecTest {
+ private static IntermediateModel intermediateModel;
+
+ private final ShapeModel shapeModel;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection data() {
+ invokeSafely(SharedStreamAwsModelSpecTest::setUp);
+ return intermediateModel.getShapes().values().stream().map(shape -> new Object[] { shape }).collect(toList());
+ }
+
+ public SharedStreamAwsModelSpecTest(ShapeModel shapeModel) {
+ this.shapeModel = shapeModel;
+ }
+
+ @Test
+ public void basicGeneration() throws Exception {
+ assertThat(new AwsServiceModel(intermediateModel, shapeModel), generatesTo(referenceFileForShape()));
+ }
+
+ private String referenceFileForShape() {
+ return "sharedstream/" + shapeModel.getShapeName().toLowerCase(Locale.ENGLISH) + ".java";
+ }
+
+ private static void setUp() throws IOException {
+ File serviceModelFile = new File(SharedStreamAwsModelSpecTest.class.getResource("sharedstream/service-2.json").getFile());
+ ServiceModel serviceModel = ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile);
+
+ intermediateModel = new IntermediateModelBuilder(
+ C2jModels.builder()
+ .serviceModel(serviceModel)
+ .customizationConfig(CustomizationConfig.create())
+ .build())
+ .build();
+ }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/collision/service-2.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/collision/service-2.json
new file mode 100644
index 000000000000..431d52020f2b
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/collision/service-2.json
@@ -0,0 +1,52 @@
+{
+ "version": "2.0",
+ "metadata": {
+ "apiVersion": "2010-05-08",
+ "endpointPrefix": "collision-service",
+ "globalEndpoint": "collision-service.amazonaws.com",
+ "protocol": "rest-json",
+ "serviceAbbreviation": "Collision Service",
+ "serviceFullName": "A really bizarrely modelled service",
+ "serviceId":"CollisionService",
+ "signatureVersion": "v4",
+ "uid": "collision-service-2010-05-08",
+ "xmlNamespace": "https://collision-service.amazonaws.com/doc/2010-05-08/"
+ },
+ "operations": {
+ "Collision": {
+ "name": "Collision",
+ "http": {
+ "method": "POST",
+ "requestUri": "/"
+ },
+ "input": {
+ "shape": "Collision"
+ },
+ "errors": [
+ {
+ "shape": "CollisionFault"
+ }
+ ],
+ "documentation": "A very strange operation>
"
+ }
+ },
+ "shapes": {
+ "Collision": {
+ "type": "structure",
+ "required": [],
+ "members": {}
+ },
+ "CollisionFault" : {
+ "type": "structure",
+ "members": {},
+ "documentation": "A fault
",
+ "error": {
+ "code": "Collision",
+ "httpStatusCode": 400,
+ "senderFault": true
+ },
+ "exception": true
+ }
+ },
+ "documentation": "Why would anyone do this?"
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/endpointdiscoveryoptional/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/endpointdiscoveryoptional/customization.config
new file mode 100644
index 000000000000..2c63c0851048
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/endpointdiscoveryoptional/customization.config
@@ -0,0 +1,2 @@
+{
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/endpointdiscoveryoptional/service-2.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/endpointdiscoveryoptional/service-2.json
new file mode 100644
index 000000000000..4e51209e6933
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/endpointdiscoveryoptional/service-2.json
@@ -0,0 +1,134 @@
+{
+ "version":"2.0",
+ "metadata":{
+ "apiVersion":"2018-08-31",
+ "endpointPrefix":"awsendpointdiscoverytestservice",
+ "jsonVersion":"1.1",
+ "protocol":"json",
+ "serviceAbbreviation":"AwsEndpointDiscoveryTest",
+ "serviceFullName":"AwsEndpointDiscoveryTest",
+ "serviceId":"AwsEndpointDiscoveryTest",
+ "signatureVersion":"v4",
+ "signingName":"awsendpointdiscoverytestservice",
+ "targetPrefix":"AwsEndpointDiscoveryTestService"
+ },
+ "operations":{
+ "DescribeEndpoints":{
+ "name":"DescribeEndpoints",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"DescribeEndpointsRequest"},
+ "output":{"shape":"DescribeEndpointsResponse"},
+ "endpointoperation":true
+ },
+ "TestDiscoveryOptional":{
+ "name":"TestDiscoveryOptional",
+ "http":{
+ "method":"POST",
+ "requestUri":"/"
+ },
+ "input":{"shape":"TestDiscoveryOptionalRequest"},
+ "output":{"shape":"TestDiscoveryOptionalResponse"},
+ "endpointdiscovery":{
+ }
+ }
+ },
+ "shapes": {
+ "Boolean": {
+ "type": "boolean"
+ },
+ "DescribeEndpointsRequest": {
+ "type": "structure",
+ "members": {
+ "Operation": {
+ "shape": "String"
+ },
+ "Identifiers": {
+ "shape": "Identifiers"
+ }
+ }
+ },
+ "DescribeEndpointsResponse": {
+ "type": "structure",
+ "required": [
+ "Endpoints"
+ ],
+ "members": {
+ "Endpoints": {
+ "shape": "Endpoints"
+ }
+ }
+ },
+ "Endpoint": {
+ "type": "structure",
+ "required": [
+ "Address",
+ "CachePeriodInMinutes"
+ ],
+ "members": {
+ "Address": {
+ "shape": "String"
+ },
+ "CachePeriodInMinutes": {
+ "shape": "Long"
+ }
+ }
+ },
+ "Endpoints": {
+ "type": "list",
+ "member": {
+ "shape": "Endpoint"
+ }
+ },
+ "Identifiers": {
+ "type": "map",
+ "key": {
+ "shape": "String"
+ },
+ "value": {
+ "shape": "String"
+ }
+ },
+ "Long": {
+ "type": "long"
+ },
+ "String": {
+ "type": "string"
+ },
+ "TestDiscoveryIdentifiersRequiredRequest": {
+ "type": "structure",
+ "required": [
+ "Sdk"
+ ],
+ "members": {
+ "Sdk": {
+ "shape": "String",
+ "endpointdiscoveryid": true
+ }
+ }
+ },
+ "TestDiscoveryIdentifiersRequiredResponse": {
+ "type": "structure",
+ "members": {
+ "DiscoveredEndpoint": {
+ "shape": "Boolean"
+ }
+ }
+ },
+ "TestDiscoveryOptionalRequest": {
+ "type": "structure",
+ "members": {
+ }
+ },
+ "TestDiscoveryOptionalResponse": {
+ "type": "structure",
+ "members": {
+ "DiscoveredEndpoint": {
+ "shape": "Boolean"
+ }
+ }
+ }
+ }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/service-2.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/service-2.json
index 198ae99ea74d..2cca71c81ecc 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/service-2.json
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/service-2.json
@@ -404,7 +404,7 @@
"EventOne": {
"shape": "EventOne"
},
- "EventTwo": {
+ "event-two": {
"shape": "EventTwo"
}
},
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/shared-output/service-2.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/shared-output/service-2.json
new file mode 100644
index 000000000000..96db66f7b864
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/shared-output/service-2.json
@@ -0,0 +1,49 @@
+{
+ "version": "2.0",
+ "metadata": {
+ "apiVersion": "2010-05-08",
+ "endpointPrefix": "shared-output-service",
+ "globalEndpoint": "shared-output-service.amazonaws.com",
+ "protocol": "rest-json",
+ "serviceAbbreviation": "Shared Output Service",
+ "serviceFullName": "Shared output service",
+ "serviceId":"SharedOutputService",
+ "signatureVersion": "v4",
+ "uid": "shared-output-service-2010-05-08",
+ "xmlNamespace": "https://shared-output-service.amazonaws.com/doc/2010-05-08/"
+ },
+ "operations": {
+ "Ping": {
+ "name": "ping",
+ "http": {
+ "method": "POST",
+ "requestUri": "/ping"
+ },
+ "errors": [],
+ "output": {
+ "shape" : "PingOutput"
+ },
+ "documentation": "ping
"
+ },
+ "SecurePing": {
+ "name": "sping",
+ "http": {
+ "method": "POST",
+ "requestUri": "/sping"
+ },
+ "errors": [],
+ "output": {
+ "shape" : "PingOutput"
+ },
+ "documentation": "secure ping
"
+ }
+ },
+ "shapes": {
+ "PingOutput": {
+ "type": "structure",
+ "required": [],
+ "members": {}
+ }
+ },
+ "documentation": "A ping service that shared outputs"
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java
index 47cb182806f0..b693b2aea0f8 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java
@@ -3,6 +3,8 @@
import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
@@ -22,20 +24,26 @@
import software.amazon.awssdk.awscore.eventstream.RestEventStreamAsyncResponseTransformer;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.core.ApiName;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
+import software.amazon.awssdk.core.SdkPojoBuilder;
import software.amazon.awssdk.core.SdkResponse;
import software.amazon.awssdk.core.async.AsyncRequestBody;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.core.async.SdkPublisher;
import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
import software.amazon.awssdk.core.client.handler.AttachHttpMetadataResponseHandler;
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.core.protocol.VoidSdkResponse;
import software.amazon.awssdk.core.runtime.transform.AsyncStreamingRequestMarshaller;
import software.amazon.awssdk.core.signer.Signer;
import software.amazon.awssdk.core.util.VersionInfo;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.core.ExceptionMetadata;
import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
@@ -59,7 +67,6 @@
import software.amazon.awssdk.services.json.model.GetWithoutRequiredMembersRequest;
import software.amazon.awssdk.services.json.model.GetWithoutRequiredMembersResponse;
import software.amazon.awssdk.services.json.model.InputEvent;
-import software.amazon.awssdk.services.json.model.InputEventOne;
import software.amazon.awssdk.services.json.model.InputEventStream;
import software.amazon.awssdk.services.json.model.InputEventStreamTwo;
import software.amazon.awssdk.services.json.model.InputEventTwo;
@@ -85,7 +92,6 @@
import software.amazon.awssdk.services.json.transform.EventStreamOperationWithOnlyOutputRequestMarshaller;
import software.amazon.awssdk.services.json.transform.GetWithoutRequiredMembersRequestMarshaller;
import software.amazon.awssdk.services.json.transform.InputEventMarshaller;
-import software.amazon.awssdk.services.json.transform.InputEventOneMarshaller;
import software.amazon.awssdk.services.json.transform.InputEventTwoMarshaller;
import software.amazon.awssdk.services.json.transform.PaginatedOperationWithResultKeyRequestMarshaller;
import software.amazon.awssdk.services.json.transform.PaginatedOperationWithoutResultKeyRequestMarshaller;
@@ -150,7 +156,10 @@ public final String serviceName() {
*/
@Override
public CompletableFuture aPostOperation(APostOperationRequest aPostOperationRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation");
String hostPrefix = "{StringMember}-foo.";
Validate.paramNotBlank(aPostOperationRequest.stringMember(), "StringMember");
String resolvedHostExpression = String.format("%s-foo.", aPostOperationRequest.stringMember());
@@ -168,9 +177,19 @@ public CompletableFuture aPostOperation(APostOperationRe
.withOperationName("APostOperation")
.withMarshaller(new APostOperationRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest));
+ .withMetricCollector(apiCallMetricCollector).hostPrefixExpression(resolvedHostExpression)
+ .withInput(aPostOperationRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = aPostOperationRequest.overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -201,7 +220,10 @@ public CompletableFuture aPostOperation(APostOperationRe
@Override
public CompletableFuture aPostOperationWithOutput(
APostOperationWithOutputRequest aPostOperationWithOutputRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperationWithOutput");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -216,9 +238,19 @@ public CompletableFuture aPostOperationWithOut
.withOperationName("APostOperationWithOutput")
.withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(aPostOperationWithOutputRequest));
+ .withMetricCollector(apiCallMetricCollector).withInput(aPostOperationWithOutputRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = aPostOperationWithOutputRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -245,7 +277,10 @@ public CompletableFuture aPostOperationWithOut
@Override
public CompletableFuture eventStreamOperation(EventStreamOperationRequest eventStreamOperationRequest,
Publisher requestStream, EventStreamOperationResponseHandler asyncResponseHandler) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "EventStreamOperation");
eventStreamOperationRequest = applySignerOverride(eventStreamOperationRequest, EventStreamAws4Signer.create());
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -259,8 +294,8 @@ public CompletableFuture eventStreamOperation(EventStreamOperationRequest
HttpResponseHandler eventResponseHandler = protocolFactory.createResponseHandler(
JsonOperationMetadata.builder().isPayloadJson(true).hasStreamingSuccessResponse(false).build(),
EventStreamTaggedUnionPojoSupplier.builder().putSdkPojoSupplier("EventOne", EventOne::builder)
- .putSdkPojoSupplier("EventTwo", EventTwo::builder).defaultSdkPojoSupplier(() -> EventStream.UNKNOWN)
- .build());
+ .putSdkPojoSupplier("event-two", EventTwo::builder)
+ .defaultSdkPojoSupplier(() -> new SdkPojoBuilder(EventStream.UNKNOWN)).build());
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
operationMetadata);
@@ -286,9 +321,11 @@ public CompletableFuture eventStreamOperation(EventStreamOperationRequest
.withMarshaller(new EventStreamOperationRequestMarshaller(protocolFactory))
.withAsyncRequestBody(software.amazon.awssdk.core.async.AsyncRequestBody.fromPublisher(adapted))
.withFullDuplex(true).withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withInput(eventStreamOperationRequest),
- restAsyncResponseTransformer);
- executeFuture.whenComplete((r, e) -> {
+ .withErrorResponseHandler(errorResponseHandler).withMetricCollector(apiCallMetricCollector)
+ .withInput(eventStreamOperationRequest), restAsyncResponseTransformer);
+ AwsRequestOverrideConfiguration requestOverrideConfig = eventStreamOperationRequest.overrideConfiguration().orElse(
+ null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
if (e != null) {
try {
asyncResponseHandler.exceptionOccurred(e);
@@ -296,11 +333,17 @@ public CompletableFuture eventStreamOperation(EventStreamOperationRequest
future.completeExceptionally(e);
}
}
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
});
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return CompletableFutureUtils.forwardExceptionTo(future, executeFuture);
} catch (Throwable t) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
() -> asyncResponseHandler.exceptionOccurred(t));
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, eventStreamOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -329,7 +372,10 @@ public CompletableFuture eventStreamOperation(EventStreamOperationRequest
public CompletableFuture eventStreamOperationWithOnlyInput(
EventStreamOperationWithOnlyInputRequest eventStreamOperationWithOnlyInputRequest,
Publisher requestStream) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "EventStreamOperationWithOnlyInput");
eventStreamOperationWithOnlyInputRequest = applySignerOverride(eventStreamOperationWithOnlyInputRequest,
EventStreamAws4Signer.create());
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
@@ -341,7 +387,7 @@ public CompletableFuture eventStreamO
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
operationMetadata);
EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder()
- .putMarshaller(InputEventOne.class, new InputEventOneMarshaller(protocolFactory))
+ .putMarshaller(InputEvent.class, new InputEventMarshaller(protocolFactory))
.putMarshaller(InputEventTwo.class, new InputEventTwoMarshaller(protocolFactory)).build();
SdkPublisher eventPublisher = SdkPublisher.adapt(requestStream);
Publisher adapted = eventPublisher.map(event -> eventMarshaller.marshall(event)).map(
@@ -353,9 +399,19 @@ public CompletableFuture eventStreamO
.withMarshaller(new EventStreamOperationWithOnlyInputRequestMarshaller(protocolFactory))
.withAsyncRequestBody(software.amazon.awssdk.core.async.AsyncRequestBody.fromPublisher(adapted))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(eventStreamOperationWithOnlyInputRequest));
+ .withMetricCollector(apiCallMetricCollector).withInput(eventStreamOperationWithOnlyInputRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = eventStreamOperationWithOnlyInputRequest
+ .overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ eventStreamOperationWithOnlyInputRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -382,45 +438,51 @@ public CompletableFuture eventStreamO
*/
@Override
public CompletableFuture eventStreamOperationWithOnlyOutput(
- EventStreamOperationWithOnlyOutputRequest eventStreamOperationWithOnlyOutputRequest,
- EventStreamOperationWithOnlyOutputResponseHandler asyncResponseHandler) {
+ EventStreamOperationWithOnlyOutputRequest eventStreamOperationWithOnlyOutputRequest,
+ EventStreamOperationWithOnlyOutputResponseHandler asyncResponseHandler) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "EventStreamOperationWithOnlyOutput");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = new AttachHttpMetadataResponseHandler(
- protocolFactory.createResponseHandler(operationMetadata, EventStreamOperationWithOnlyOutputResponse::builder));
+ protocolFactory.createResponseHandler(operationMetadata, EventStreamOperationWithOnlyOutputResponse::builder));
HttpResponseHandler voidResponseHandler = protocolFactory.createResponseHandler(JsonOperationMetadata
- .builder().isPayloadJson(false).hasStreamingSuccessResponse(true).build(), VoidSdkResponse::builder);
+ .builder().isPayloadJson(false).hasStreamingSuccessResponse(true).build(), VoidSdkResponse::builder);
HttpResponseHandler eventResponseHandler = protocolFactory.createResponseHandler(
- JsonOperationMetadata.builder().isPayloadJson(true).hasStreamingSuccessResponse(false).build(),
- EventStreamTaggedUnionPojoSupplier.builder().putSdkPojoSupplier("EventOne", EventOne::builder)
- .putSdkPojoSupplier("EventTwo", EventTwo::builder).defaultSdkPojoSupplier(() -> EventStream.UNKNOWN)
- .build());
+ JsonOperationMetadata.builder().isPayloadJson(true).hasStreamingSuccessResponse(false).build(),
+ EventStreamTaggedUnionPojoSupplier.builder().putSdkPojoSupplier("EventOne", EventOne::builder)
+ .putSdkPojoSupplier("event-two", EventTwo::builder)
+ .defaultSdkPojoSupplier(() -> new SdkPojoBuilder(EventStream.UNKNOWN)).build());
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
+ operationMetadata);
CompletableFuture future = new CompletableFuture<>();
EventStreamAsyncResponseTransformer asyncResponseTransformer = EventStreamAsyncResponseTransformer
- . builder()
- .eventStreamResponseHandler(asyncResponseHandler).eventResponseHandler(eventResponseHandler)
- .initialResponseHandler(responseHandler).exceptionResponseHandler(errorResponseHandler).future(future)
- .executor(executor).serviceName(serviceName()).build();
+ . builder()
+ .eventStreamResponseHandler(asyncResponseHandler).eventResponseHandler(eventResponseHandler)
+ .initialResponseHandler(responseHandler).exceptionResponseHandler(errorResponseHandler).future(future)
+ .executor(executor).serviceName(serviceName()).build();
RestEventStreamAsyncResponseTransformer restAsyncResponseTransformer = RestEventStreamAsyncResponseTransformer
- . builder()
- .eventStreamAsyncResponseTransformer(asyncResponseTransformer)
- .eventStreamResponseHandler(asyncResponseHandler).build();
+ . builder()
+ .eventStreamAsyncResponseTransformer(asyncResponseTransformer)
+ .eventStreamResponseHandler(asyncResponseHandler).build();
CompletableFuture executeFuture = clientHandler
- .execute(
- new ClientExecutionParams()
- .withOperationName("EventStreamOperationWithOnlyOutput")
- .withMarshaller(new EventStreamOperationWithOnlyOutputRequestMarshaller(protocolFactory))
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(eventStreamOperationWithOnlyOutputRequest), restAsyncResponseTransformer);
- executeFuture.whenComplete((r, e) -> {
+ .execute(
+ new ClientExecutionParams()
+ .withOperationName("EventStreamOperationWithOnlyOutput")
+ .withMarshaller(new EventStreamOperationWithOnlyOutputRequestMarshaller(protocolFactory))
+ .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
+ .withMetricCollector(apiCallMetricCollector)
+ .withInput(eventStreamOperationWithOnlyOutputRequest), restAsyncResponseTransformer);
+ AwsRequestOverrideConfiguration requestOverrideConfig = eventStreamOperationWithOnlyOutputRequest
+ .overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
if (e != null) {
try {
asyncResponseHandler.exceptionOccurred(e);
@@ -428,11 +490,17 @@ public CompletableFuture eventStreamOperationWithOnlyOutput(
future.completeExceptionally(e);
}
}
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
});
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return CompletableFutureUtils.forwardExceptionTo(future, executeFuture);
} catch (Throwable t) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
- () -> asyncResponseHandler.exceptionOccurred(t));
+ () -> asyncResponseHandler.exceptionOccurred(t));
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ eventStreamOperationWithOnlyOutputRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -463,7 +531,10 @@ public CompletableFuture eventStreamOperationWithOnlyOutput(
@Override
public CompletableFuture getWithoutRequiredMembers(
GetWithoutRequiredMembersRequest getWithoutRequiredMembersRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "GetWithoutRequiredMembers");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -478,9 +549,19 @@ public CompletableFuture getWithoutRequiredMe
.withOperationName("GetWithoutRequiredMembers")
.withMarshaller(new GetWithoutRequiredMembersRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(getWithoutRequiredMembersRequest));
+ .withMetricCollector(apiCallMetricCollector).withInput(getWithoutRequiredMembersRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = getWithoutRequiredMembersRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ getWithoutRequiredMembersRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -508,7 +589,10 @@ public CompletableFuture getWithoutRequiredMe
@Override
public CompletableFuture paginatedOperationWithResultKey(
PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "PaginatedOperationWithResultKey");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -523,9 +607,19 @@ public CompletableFuture paginatedOpera
.withOperationName("PaginatedOperationWithResultKey")
.withMarshaller(new PaginatedOperationWithResultKeyRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(paginatedOperationWithResultKeyRequest));
+ .withMetricCollector(apiCallMetricCollector).withInput(paginatedOperationWithResultKeyRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = paginatedOperationWithResultKeyRequest
+ .overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ paginatedOperationWithResultKeyRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -552,7 +646,7 @@ public CompletableFuture paginatedOpera
* The following are few ways to use the response class:
*
* 1) Using the subscribe helper method
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
@@ -562,21 +656,25 @@ public CompletableFuture paginatedOpera
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -626,7 +724,10 @@ public PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKeyP
@Override
public CompletableFuture paginatedOperationWithoutResultKey(
PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "PaginatedOperationWithoutResultKey");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -641,9 +742,19 @@ public CompletableFuture paginatedOp
.withOperationName("PaginatedOperationWithoutResultKey")
.withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(paginatedOperationWithoutResultKeyRequest));
+ .withMetricCollector(apiCallMetricCollector).withInput(paginatedOperationWithoutResultKeyRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = paginatedOperationWithoutResultKeyRequest
+ .overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ paginatedOperationWithoutResultKeyRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -670,7 +781,7 @@ public CompletableFuture paginatedOp
* The following are few ways to use the response class:
*
* 1) Using the subscribe helper method
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -680,21 +791,25 @@ public CompletableFuture paginatedOp
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithoutResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyRequest)}
* operation.
@@ -749,7 +864,10 @@ public PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutResu
@Override
public CompletableFuture streamingInputOperation(
StreamingInputOperationRequest streamingInputOperationRequest, AsyncRequestBody requestBody) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOperation");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -763,13 +881,23 @@ public CompletableFuture streamingInputOperatio
.execute(new ClientExecutionParams()
.withOperationName("StreamingInputOperation")
.withMarshaller(
- AsyncStreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
- .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withAsyncRequestBody(requestBody)
- .withInput(streamingInputOperationRequest));
+ AsyncStreamingRequestMarshaller.builder()
+ .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
+ .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withMetricCollector(apiCallMetricCollector)
+ .withAsyncRequestBody(requestBody).withInput(streamingInputOperationRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = streamingInputOperationRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -807,7 +935,10 @@ public CompletableFuture streamingInputOperatio
public CompletableFuture streamingInputOutputOperation(
StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, AsyncRequestBody requestBody,
AsyncResponseTransformer asyncResponseTransformer) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOutputOperation");
streamingInputOutputOperationRequest = applySignerOverride(streamingInputOutputOperationRequest,
Aws4UnsignedPayloadSigner.create());
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true)
@@ -823,24 +954,32 @@ public CompletableFuture streamingInputOutputOperation(
new ClientExecutionParams()
.withOperationName("StreamingInputOutputOperation")
.withMarshaller(
- AsyncStreamingRequestMarshaller
- .builder()
- .delegateMarshaller(
- new StreamingInputOutputOperationRequestMarshaller(protocolFactory))
- .asyncRequestBody(requestBody).transferEncoding(true).build())
+ AsyncStreamingRequestMarshaller
+ .builder()
+ .delegateMarshaller(
+ new StreamingInputOutputOperationRequestMarshaller(protocolFactory))
+ .asyncRequestBody(requestBody).transferEncoding(true).build())
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withAsyncRequestBody(requestBody).withInput(streamingInputOutputOperationRequest),
- asyncResponseTransformer);
- executeFuture.whenComplete((r, e) -> {
+ .withMetricCollector(apiCallMetricCollector).withAsyncRequestBody(requestBody)
+ .withInput(streamingInputOutputOperationRequest), asyncResponseTransformer);
+ AwsRequestOverrideConfiguration requestOverrideConfig = streamingInputOutputOperationRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
if (e != null) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
- () -> asyncResponseTransformer.exceptionOccurred(e));
+ () -> asyncResponseTransformer.exceptionOccurred(e));
}
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
});
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
() -> asyncResponseTransformer.exceptionOccurred(t));
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ streamingInputOutputOperationRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -873,7 +1012,10 @@ public CompletableFuture streamingInputOutputOperation(
public CompletableFuture streamingOutputOperation(
StreamingOutputOperationRequest streamingOutputOperationRequest,
AsyncResponseTransformer asyncResponseTransformer) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingOutputOperation");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true)
.isPayloadJson(false).build();
@@ -888,17 +1030,26 @@ public CompletableFuture streamingOutputOperation(
.withOperationName("StreamingOutputOperation")
.withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingOutputOperationRequest), asyncResponseTransformer);
- executeFuture.whenComplete((r, e) -> {
+ .withMetricCollector(apiCallMetricCollector).withInput(streamingOutputOperationRequest),
+ asyncResponseTransformer);
+ AwsRequestOverrideConfiguration requestOverrideConfig = streamingOutputOperationRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
if (e != null) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
- () -> asyncResponseTransformer.exceptionOccurred(e));
+ () -> asyncResponseTransformer.exceptionOccurred(e));
}
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
});
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
() -> asyncResponseTransformer.exceptionOccurred(t));
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -919,6 +1070,21 @@ private > T init(T builder) {
.exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build());
}
+ private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
+ RequestOverrideConfiguration requestOverrideConfiguration) {
+ List publishers = null;
+ if (requestOverrideConfiguration != null) {
+ publishers = requestOverrideConfiguration.metricPublishers();
+ }
+ if (publishers == null || publishers.isEmpty()) {
+ publishers = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHERS);
+ }
+ if (publishers == null) {
+ publishers = Collections.emptyList();
+ }
+ return publishers;
+ }
+
private T applyPaginatorUserAgent(T request) {
Consumer userAgentApplier = b -> b.addApiName(ApiName.builder()
.version(VersionInfo.SDK_VERSION).name("PAGINATED").build());
@@ -949,3 +1115,4 @@ private HttpResponseHandler createErrorResponseHandler(Base
return protocolFactory.createErrorResponseHandler(operationMetadata);
}
}
+
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java
index c9cba7797d3d..096effd562a6 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java
@@ -3,14 +3,18 @@
import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
import java.net.URI;
+import java.util.Collections;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
@@ -18,6 +22,9 @@
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.metrics.CoreMetric;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
import software.amazon.awssdk.protocols.json.BaseAwsJsonProtocolFactory;
@@ -89,7 +96,10 @@ public final String serviceName() {
*/
@Override
public CompletableFuture describeEndpoints(DescribeEndpointsRequest describeEndpointsRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "DescribeEndpoints");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -104,9 +114,18 @@ public CompletableFuture describeEndpoints(DescribeEn
.withOperationName("DescribeEndpoints")
.withMarshaller(new DescribeEndpointsRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(describeEndpointsRequest));
+ .withMetricCollector(apiCallMetricCollector).withInput(describeEndpointsRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = describeEndpointsRequest.overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, describeEndpointsRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -132,7 +151,10 @@ public CompletableFuture describeEndpoints(DescribeEn
@Override
public CompletableFuture testDiscoveryIdentifiersRequired(
TestDiscoveryIdentifiersRequiredRequest testDiscoveryIdentifiersRequiredRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryIdentifiersRequired");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -155,9 +177,20 @@ public CompletableFuture testDiscovery
.withOperationName("TestDiscoveryIdentifiersRequired")
.withMarshaller(new TestDiscoveryIdentifiersRequiredRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .discoveredEndpoint(cachedEndpoint).withInput(testDiscoveryIdentifiersRequiredRequest));
+ .withMetricCollector(apiCallMetricCollector).discoveredEndpoint(cachedEndpoint)
+ .withInput(testDiscoveryIdentifiersRequiredRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = testDiscoveryIdentifiersRequiredRequest
+ .overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ testDiscoveryIdentifiersRequiredRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -182,7 +215,10 @@ public CompletableFuture testDiscovery
@Override
public CompletableFuture testDiscoveryOptional(
TestDiscoveryOptionalRequest testDiscoveryOptionalRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryOptional");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -205,9 +241,20 @@ public CompletableFuture testDiscoveryOptional(
.withOperationName("TestDiscoveryOptional")
.withMarshaller(new TestDiscoveryOptionalRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .discoveredEndpoint(cachedEndpoint).withInput(testDiscoveryOptionalRequest));
+ .withMetricCollector(apiCallMetricCollector).discoveredEndpoint(cachedEndpoint)
+ .withInput(testDiscoveryOptionalRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = testDiscoveryOptionalRequest.overrideConfiguration().orElse(
+ null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, testDiscoveryOptionalRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -232,7 +279,10 @@ public CompletableFuture testDiscoveryOptional(
@Override
public CompletableFuture testDiscoveryRequired(
TestDiscoveryRequiredRequest testDiscoveryRequiredRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryRequired");
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
.isPayloadJson(true).build();
@@ -255,9 +305,20 @@ public CompletableFuture testDiscoveryRequired(
.withOperationName("TestDiscoveryRequired")
.withMarshaller(new TestDiscoveryRequiredRequestMarshaller(protocolFactory))
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .discoveredEndpoint(cachedEndpoint).withInput(testDiscoveryRequiredRequest));
+ .withMetricCollector(apiCallMetricCollector).discoveredEndpoint(cachedEndpoint)
+ .withInput(testDiscoveryRequiredRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = testDiscoveryRequiredRequest.overrideConfiguration().orElse(
+ null);
+ CompletableFuture whenCompleted = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ executeFuture = CompletableFutureUtils.forwardExceptionTo(whenCompleted, executeFuture);
return executeFuture;
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, testDiscoveryRequiredRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -273,8 +334,24 @@ private > T init(T builder) {
.protocolVersion("1.1");
}
+ private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
+ RequestOverrideConfiguration requestOverrideConfiguration) {
+ List publishers = null;
+ if (requestOverrideConfiguration != null) {
+ publishers = requestOverrideConfiguration.metricPublishers();
+ }
+ if (publishers == null || publishers.isEmpty()) {
+ publishers = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHERS);
+ }
+ if (publishers == null) {
+ publishers = Collections.emptyList();
+ }
+ return publishers;
+ }
+
private HttpResponseHandler createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory,
JsonOperationMetadata operationMetadata) {
return protocolFactory.createErrorResponseHandler(operationMetadata);
}
}
+
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java
index 75d9d095cc41..1f3fe65691ca 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java
@@ -1,11 +1,14 @@
package software.amazon.awssdk.services.endpointdiscoverytest;
import java.net.URI;
+import java.util.Collections;
+import java.util.List;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
import software.amazon.awssdk.awscore.client.handler.AwsSyncClientHandler;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
@@ -14,6 +17,9 @@
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.metrics.CoreMetric;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
import software.amazon.awssdk.protocols.json.BaseAwsJsonProtocolFactory;
@@ -88,11 +94,21 @@ public DescribeEndpointsResponse describeEndpoints(DescribeEndpointsRequest desc
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "DescribeEndpoints");
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("DescribeEndpoints").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withInput(describeEndpointsRequest)
- .withMarshaller(new DescribeEndpointsRequestMarshaller(protocolFactory)));
+ return clientHandler.execute(new ClientExecutionParams()
+ .withOperationName("DescribeEndpoints").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(describeEndpointsRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new DescribeEndpointsRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, describeEndpointsRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -129,13 +145,22 @@ public TestDiscoveryIdentifiersRequiredResponse testDiscoveryIdentifiersRequired
.defaultEndpoint(clientConfiguration.option(SdkClientOption.ENDPOINT)).build();
cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest);
}
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryIdentifiersRequired");
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("TestDiscoveryIdentifiersRequired").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).discoveredEndpoint(cachedEndpoint)
- .withInput(testDiscoveryIdentifiersRequiredRequest)
- .withMarshaller(new TestDiscoveryIdentifiersRequiredRequestMarshaller(protocolFactory)));
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("TestDiscoveryIdentifiersRequired").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).discoveredEndpoint(cachedEndpoint)
+ .withInput(testDiscoveryIdentifiersRequiredRequest).withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new TestDiscoveryIdentifiersRequiredRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ testDiscoveryIdentifiersRequiredRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -171,12 +196,21 @@ public TestDiscoveryOptionalResponse testDiscoveryOptional(TestDiscoveryOptional
.defaultEndpoint(clientConfiguration.option(SdkClientOption.ENDPOINT)).build();
cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest);
}
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryOptional");
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("TestDiscoveryOptional").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).discoveredEndpoint(cachedEndpoint)
- .withInput(testDiscoveryOptionalRequest)
- .withMarshaller(new TestDiscoveryOptionalRequestMarshaller(protocolFactory)));
+ return clientHandler.execute(new ClientExecutionParams()
+ .withOperationName("TestDiscoveryOptional").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).discoveredEndpoint(cachedEndpoint)
+ .withInput(testDiscoveryOptionalRequest).withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new TestDiscoveryOptionalRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, testDiscoveryOptionalRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -212,12 +246,36 @@ public TestDiscoveryRequiredResponse testDiscoveryRequired(TestDiscoveryRequired
.defaultEndpoint(clientConfiguration.option(SdkClientOption.ENDPOINT)).build();
cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest);
}
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryRequired");
+
+ return clientHandler.execute(new ClientExecutionParams()
+ .withOperationName("TestDiscoveryRequired").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).discoveredEndpoint(cachedEndpoint)
+ .withInput(testDiscoveryRequiredRequest).withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new TestDiscoveryRequiredRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, testDiscoveryRequiredRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
+ }
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("TestDiscoveryRequired").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).discoveredEndpoint(cachedEndpoint)
- .withInput(testDiscoveryRequiredRequest)
- .withMarshaller(new TestDiscoveryRequiredRequestMarshaller(protocolFactory)));
+ private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
+ RequestOverrideConfiguration requestOverrideConfiguration) {
+ List publishers = null;
+ if (requestOverrideConfiguration != null) {
+ publishers = requestOverrideConfiguration.metricPublishers();
+ }
+ if (publishers == null || publishers.isEmpty()) {
+ publishers = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHERS);
+ }
+ if (publishers == null) {
+ publishers = Collections.emptyList();
+ }
+ return publishers;
}
private HttpResponseHandler createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory,
@@ -236,3 +294,4 @@ public void close() {
clientHandler.close();
}
}
+
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface.java
index a6da11ecb6b2..e97f69cd5896 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-interface.java
@@ -182,7 +182,7 @@ default CompletableFuture aPostOperationWithOu
default CompletableFuture aPostOperationWithOutput(
Consumer aPostOperationWithOutputRequest) {
return aPostOperationWithOutput(APostOperationWithOutputRequest.builder().applyMutation(aPostOperationWithOutputRequest)
- .build());
+ .build());
}
/**
@@ -205,7 +205,7 @@ default CompletableFuture aPostOperationWithOu
* target="_top">AWS API Documentation
*/
default CompletableFuture eventStreamOperation(EventStreamOperationRequest eventStreamOperationRequest,
- Publisher requestStream, EventStreamOperationResponseHandler asyncResponseHandler) {
+ Publisher requestStream, EventStreamOperationResponseHandler asyncResponseHandler) {
throw new UnsupportedOperationException();
}
@@ -238,7 +238,7 @@ default CompletableFuture eventStreamOperation(
Consumer eventStreamOperationRequest, Publisher requestStream,
EventStreamOperationResponseHandler asyncResponseHandler) {
return eventStreamOperation(EventStreamOperationRequest.builder().applyMutation(eventStreamOperationRequest).build(),
- requestStream, asyncResponseHandler);
+ requestStream, asyncResponseHandler);
}
/**
@@ -298,7 +298,7 @@ default CompletableFuture eventStream
Publisher requestStream) {
return eventStreamOperationWithOnlyInput(
EventStreamOperationWithOnlyInputRequest.builder().applyMutation(eventStreamOperationWithOnlyInputRequest)
- .build(), requestStream);
+ .build(), requestStream);
}
/**
@@ -322,8 +322,8 @@ default CompletableFuture eventStream
* target="_top">AWS API Documentation
*/
default CompletableFuture eventStreamOperationWithOnlyOutput(
- EventStreamOperationWithOnlyOutputRequest eventStreamOperationWithOnlyOutputRequest,
- EventStreamOperationWithOnlyOutputResponseHandler asyncResponseHandler) {
+ EventStreamOperationWithOnlyOutputRequest eventStreamOperationWithOnlyOutputRequest,
+ EventStreamOperationWithOnlyOutputResponseHandler asyncResponseHandler) {
throw new UnsupportedOperationException();
}
@@ -354,11 +354,11 @@ default CompletableFuture eventStreamOperationWithOnlyOutput(
* target="_top">AWS API Documentation
*/
default CompletableFuture eventStreamOperationWithOnlyOutput(
- Consumer eventStreamOperationWithOnlyOutputRequest,
- EventStreamOperationWithOnlyOutputResponseHandler asyncResponseHandler) {
+ Consumer eventStreamOperationWithOnlyOutputRequest,
+ EventStreamOperationWithOnlyOutputResponseHandler asyncResponseHandler) {
return eventStreamOperationWithOnlyOutput(
- EventStreamOperationWithOnlyOutputRequest.builder().applyMutation(eventStreamOperationWithOnlyOutputRequest)
- .build(), asyncResponseHandler);
+ EventStreamOperationWithOnlyOutputRequest.builder().applyMutation(eventStreamOperationWithOnlyOutputRequest)
+ .build(), asyncResponseHandler);
}
/**
@@ -422,7 +422,7 @@ default CompletableFuture getWithoutRequiredM
default CompletableFuture getWithoutRequiredMembers(
Consumer getWithoutRequiredMembersRequest) {
return getWithoutRequiredMembers(GetWithoutRequiredMembersRequest.builder()
- .applyMutation(getWithoutRequiredMembersRequest).build());
+ .applyMutation(getWithoutRequiredMembersRequest).build());
}
/**
@@ -479,7 +479,7 @@ default CompletableFuture paginatedOper
default CompletableFuture paginatedOperationWithResultKey(
Consumer paginatedOperationWithResultKeyRequest) {
return paginatedOperationWithResultKey(PaginatedOperationWithResultKeyRequest.builder()
- .applyMutation(paginatedOperationWithResultKeyRequest).build());
+ .applyMutation(paginatedOperationWithResultKeyRequest).build());
}
/**
@@ -552,6 +552,10 @@ default CompletableFuture paginatedOper
*
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -623,6 +627,10 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey
*
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -696,6 +704,10 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey
*
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -726,7 +738,7 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey
default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKeyPaginator(
Consumer paginatedOperationWithResultKeyRequest) {
return paginatedOperationWithResultKeyPaginator(PaginatedOperationWithResultKeyRequest.builder()
- .applyMutation(paginatedOperationWithResultKeyRequest).build());
+ .applyMutation(paginatedOperationWithResultKeyRequest).build());
}
/**
@@ -783,7 +795,7 @@ default CompletableFuture paginatedO
default CompletableFuture paginatedOperationWithoutResultKey(
Consumer paginatedOperationWithoutResultKeyRequest) {
return paginatedOperationWithoutResultKey(PaginatedOperationWithoutResultKeyRequest.builder()
- .applyMutation(paginatedOperationWithoutResultKeyRequest).build());
+ .applyMutation(paginatedOperationWithoutResultKeyRequest).build());
}
/**
@@ -833,6 +845,10 @@ default CompletableFuture paginatedO
*
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithoutResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyRequest)}
* operation.
@@ -906,6 +922,10 @@ default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutRes
*
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithoutResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyRequest)}
* operation.
@@ -936,7 +956,7 @@ default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutRes
default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutResultKeyPaginator(
Consumer paginatedOperationWithoutResultKeyRequest) {
return paginatedOperationWithoutResultKeyPaginator(PaginatedOperationWithoutResultKeyRequest.builder()
- .applyMutation(paginatedOperationWithoutResultKeyRequest).build());
+ .applyMutation(paginatedOperationWithoutResultKeyRequest).build());
}
/**
@@ -1001,7 +1021,7 @@ default CompletableFuture streamingInputOperati
default CompletableFuture streamingInputOperation(
Consumer streamingInputOperationRequest, AsyncRequestBody requestBody) {
return streamingInputOperation(StreamingInputOperationRequest.builder().applyMutation(streamingInputOperationRequest)
- .build(), requestBody);
+ .build(), requestBody);
}
/**
@@ -1066,7 +1086,7 @@ default CompletableFuture streamingInputOperati
default CompletableFuture streamingInputOperation(
Consumer streamingInputOperationRequest, Path sourcePath) {
return streamingInputOperation(StreamingInputOperationRequest.builder().applyMutation(streamingInputOperationRequest)
- .build(), sourcePath);
+ .build(), sourcePath);
}
/**
@@ -1179,7 +1199,7 @@ default CompletableFuture streamingInputOutputOperation(
default CompletableFuture streamingInputOutputOperation(
StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, Path sourcePath, Path destinationPath) {
return streamingInputOutputOperation(streamingInputOutputOperationRequest, AsyncRequestBody.fromFile(sourcePath),
- AsyncResponseTransformer.toFile(destinationPath));
+ AsyncResponseTransformer.toFile(destinationPath));
}
/**
@@ -1288,7 +1308,7 @@ default CompletableFuture streamingOutputOperation(
Consumer streamingOutputOperationRequest,
AsyncResponseTransformer asyncResponseTransformer) {
return streamingOutputOperation(StreamingOutputOperationRequest.builder().applyMutation(streamingOutputOperationRequest)
- .build(), asyncResponseTransformer);
+ .build(), asyncResponseTransformer);
}
/**
@@ -1351,7 +1371,7 @@ default CompletableFuture streamingOutputOpera
default CompletableFuture streamingOutputOperation(
Consumer streamingOutputOperationRequest, Path destinationPath) {
return streamingOutputOperation(StreamingOutputOperationRequest.builder().applyMutation(streamingOutputOperationRequest)
- .build(), destinationPath);
+ .build(), destinationPath);
}
/**
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java
index 934b2724eaf5..d5dd67826475 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java
@@ -1,5 +1,7 @@
package software.amazon.awssdk.services.json;
+import java.util.Collections;
+import java.util.List;
import java.util.function.Consumer;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -8,16 +10,21 @@
import software.amazon.awssdk.awscore.client.handler.AwsSyncClientHandler;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.core.ApiName;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.core.runtime.transform.StreamingRequestMarshaller;
import software.amazon.awssdk.core.signer.Signer;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.core.sync.ResponseTransformer;
import software.amazon.awssdk.core.util.VersionInfo;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.core.ExceptionMetadata;
import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
@@ -101,24 +108,33 @@ public final String serviceName() {
*/
@Override
public APostOperationResponse aPostOperation(APostOperationRequest aPostOperationRequest) throws InvalidInputException,
- AwsServiceException, SdkClientException, JsonException {
+ AwsServiceException, SdkClientException, JsonException {
String hostPrefix = "{StringMember}-foo.";
Validate.paramNotBlank(aPostOperationRequest.stringMember(), "StringMember");
String resolvedHostExpression = String.format("%s-foo.", aPostOperationRequest.stringMember());
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata,
- APostOperationResponse::builder);
+ APostOperationResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("APostOperation")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest)
- .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation");
+
+ return clientHandler.execute(new ClientExecutionParams()
+ .withOperationName("APostOperation").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression)
+ .withInput(aPostOperationRequest).withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -143,23 +159,32 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
*/
@Override
public APostOperationWithOutputResponse aPostOperationWithOutput(
- APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException,
- SdkClientException, JsonException {
+ APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException,
+ SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, APostOperationWithOutputResponse::builder);
+ operationMetadata, APostOperationWithOutputResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("APostOperationWithOutput")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(aPostOperationWithOutputRequest)
- .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperationWithOutput");
+
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("APostOperationWithOutput").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(aPostOperationWithOutputRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -184,23 +209,32 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
*/
@Override
public GetWithoutRequiredMembersResponse getWithoutRequiredMembers(
- GetWithoutRequiredMembersRequest getWithoutRequiredMembersRequest) throws InvalidInputException, AwsServiceException,
- SdkClientException, JsonException {
+ GetWithoutRequiredMembersRequest getWithoutRequiredMembersRequest) throws InvalidInputException, AwsServiceException,
+ SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, GetWithoutRequiredMembersResponse::builder);
+ operationMetadata, GetWithoutRequiredMembersResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("GetWithoutRequiredMembers")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(getWithoutRequiredMembersRequest)
- .withMarshaller(new GetWithoutRequiredMembersRequestMarshaller(protocolFactory)));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "GetWithoutRequiredMembers");
+
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("GetWithoutRequiredMembers").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(getWithoutRequiredMembersRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new GetWithoutRequiredMembersRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ getWithoutRequiredMembersRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -221,23 +255,32 @@ public GetWithoutRequiredMembersResponse getWithoutRequiredMembers(
*/
@Override
public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
- PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException,
- SdkClientException, JsonException {
+ PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException,
+ SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, PaginatedOperationWithResultKeyResponse::builder);
+ operationMetadata, PaginatedOperationWithResultKeyResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("PaginatedOperationWithResultKey")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(paginatedOperationWithResultKeyRequest)
- .withMarshaller(new PaginatedOperationWithResultKeyRequestMarshaller(protocolFactory)));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "PaginatedOperationWithResultKey");
+
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("PaginatedOperationWithResultKey").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(paginatedOperationWithResultKeyRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new PaginatedOperationWithResultKeyRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ paginatedOperationWithResultKeyRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -259,7 +302,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
* The following are few ways to iterate through the response pages:
*
* 1) Using a Stream
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyIterable responses = client.paginatedOperationWithResultKeyPaginator(request);
@@ -268,7 +311,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
*
*
* 2) Using For loop
- *
+ *
*
* {
* @code
@@ -281,7 +324,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
*
*
* 3) Use iterator directly
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyIterable responses = client.paginatedOperationWithResultKeyPaginator(request);
@@ -289,6 +332,10 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
* }
*
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -309,8 +356,8 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
*/
@Override
public PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyPaginator(
- PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException,
- SdkClientException, JsonException {
+ PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException,
+ SdkClientException, JsonException {
return new PaginatedOperationWithResultKeyIterable(this, applyPaginatorUserAgent(paginatedOperationWithResultKeyRequest));
}
@@ -332,23 +379,32 @@ public PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyPa
*/
@Override
public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResultKey(
- PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
- SdkClientException, JsonException {
+ PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
+ SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder);
+ operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("PaginatedOperationWithoutResultKey")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(paginatedOperationWithoutResultKeyRequest)
- .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory)));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "PaginatedOperationWithoutResultKey");
+
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("PaginatedOperationWithoutResultKey").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(paginatedOperationWithoutResultKeyRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ paginatedOperationWithoutResultKeyRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -370,7 +426,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
* The following are few ways to iterate through the response pages:
*
* 1) Using a Stream
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyIterable responses = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -379,7 +435,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
*
*
* 2) Using For loop
- *
+ *
*
* {
* @code
@@ -392,7 +448,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
*
*
* 3) Use iterator directly
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyIterable responses = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -400,6 +456,10 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
* }
*
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithoutResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyRequest)}
* operation.
@@ -420,10 +480,10 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
*/
@Override
public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResultKeyPaginator(
- PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
- SdkClientException, JsonException {
+ PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
+ SdkClientException, JsonException {
return new PaginatedOperationWithoutResultKeyIterable(this,
- applyPaginatorUserAgent(paginatedOperationWithoutResultKeyRequest));
+ applyPaginatorUserAgent(paginatedOperationWithoutResultKeyRequest));
}
/**
@@ -434,11 +494,11 @@ public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResul
* The content to send to the service. A {@link RequestBody} can be created using one of several factory
* methods for various sources of data. For example, to create a request body from a file you can do the
* following.
- *
+ *
*
* {@code RequestBody.fromFile(new File("myfile.txt"))}
*
- *
+ *
* See documentation in {@link RequestBody} for additional details and which sources of data are supported.
* The service documentation for the request content is as follows 'This be a stream'
* @return Result of the StreamingInputOperation operation returned by the service.
@@ -455,26 +515,37 @@ public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResul
*/
@Override
public StreamingInputOperationResponse streamingInputOperation(StreamingInputOperationRequest streamingInputOperationRequest,
- RequestBody requestBody) throws AwsServiceException, SdkClientException, JsonException {
+ RequestBody requestBody) throws AwsServiceException, SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, StreamingInputOperationResponse::builder);
+ operationMetadata, StreamingInputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("StreamingInputOperation")
- .withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingInputOperationRequest)
- .withRequestBody(requestBody)
- .withMarshaller(
- StreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
- .requestBody(requestBody).build()));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOperation");
+
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("StreamingInputOperation")
+ .withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler)
+ .withInput(streamingInputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withRequestBody(requestBody)
+ .withMarshaller(
+ StreamingRequestMarshaller.builder()
+ .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
+ .requestBody(requestBody).build()));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -485,20 +556,20 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
* The content to send to the service. A {@link RequestBody} can be created using one of several factory
* methods for various sources of data. For example, to create a request body from a file you can do the
* following.
- *
+ *
*
* {@code RequestBody.fromFile(new File("myfile.txt"))}
*
- *
+ *
* See documentation in {@link RequestBody} for additional details and which sources of data are supported.
* The service documentation for the request content is as follows 'This be a stream'
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOutputOperationRequest and an InputStream to the response content are provided as parameters
- * to the callback. The callback may return a transformed type which will be the return value of this method.
- * See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
- * interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
- * service documentation for the response content is as follows 'This be a stream'.
+ * StreamingInputOutputOperationResponse and an InputStream to the response content are provided as
+ * parameters to the callback. The callback may return a transformed type which will be the return value of
+ * this method. See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing
+ * this interface and for links to pre-canned implementations for common scenarios like downloading to a
+ * file. The service documentation for the response content is as follows 'This be a stream'.
* @return The transformed result of the ResponseTransformer.
* @throws SdkException
* Base class for all exceptions that can be thrown by the SDK (both service and client). Can be used for
@@ -513,31 +584,43 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
*/
@Override
public ReturnT streamingInputOutputOperation(
- StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, RequestBody requestBody,
- ResponseTransformer responseTransformer) throws AwsServiceException,
- SdkClientException, JsonException {
+ StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, RequestBody requestBody,
+ ResponseTransformer responseTransformer) throws AwsServiceException,
+ SdkClientException, JsonException {
streamingInputOutputOperationRequest = applySignerOverride(streamingInputOutputOperationRequest,
- Aws4UnsignedPayloadSigner.create());
+ Aws4UnsignedPayloadSigner.create());
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true)
- .isPayloadJson(false).build();
+ .isPayloadJson(false).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, StreamingInputOutputOperationResponse::builder);
+ operationMetadata, StreamingInputOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingInputOutputOperation")
- .withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingInputOutputOperationRequest)
- .withRequestBody(requestBody)
- .withMarshaller(
- StreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOutputOperationRequestMarshaller(protocolFactory))
- .requestBody(requestBody).transferEncoding(true).build()), responseTransformer);
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOutputOperation");
+
+ return clientHandler.execute(
+ new ClientExecutionParams()
+ .withOperationName("StreamingInputOutputOperation")
+ .withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler)
+ .withInput(streamingInputOutputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withRequestBody(requestBody)
+ .withMarshaller(
+ StreamingRequestMarshaller
+ .builder()
+ .delegateMarshaller(
+ new StreamingInputOutputOperationRequestMarshaller(protocolFactory))
+ .requestBody(requestBody).transferEncoding(true).build()), responseTransformer);
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration,
+ streamingInputOutputOperationRequest.overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -546,8 +629,8 @@ public ReturnT streamingInputOutputOperation(
* @param streamingOutputOperationRequest
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOutputOperationRequest and an InputStream to the response content are provided as parameters
- * to the callback. The callback may return a transformed type which will be the return value of this method.
+ * StreamingOutputOperationResponse and an InputStream to the response content are provided as parameters to
+ * the callback. The callback may return a transformed type which will be the return value of this method.
* See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
* interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
* service documentation for the response content is as follows 'This be a stream'.
@@ -565,39 +648,63 @@ public ReturnT streamingInputOutputOperation(
*/
@Override
public ReturnT streamingOutputOperation(StreamingOutputOperationRequest streamingOutputOperationRequest,
- ResponseTransformer responseTransformer) throws AwsServiceException,
- SdkClientException, JsonException {
+ ResponseTransformer responseTransformer) throws AwsServiceException,
+ SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true)
- .isPayloadJson(false).build();
+ .isPayloadJson(false).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, StreamingOutputOperationResponse::builder);
+ operationMetadata, StreamingOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingOutputOperation")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingOutputOperationRequest)
- .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingOutputOperation");
+
+ return clientHandler.execute(
+ new ClientExecutionParams()
+ .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
+ }
+
+ private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
+ RequestOverrideConfiguration requestOverrideConfiguration) {
+ List publishers = null;
+ if (requestOverrideConfiguration != null) {
+ publishers = requestOverrideConfiguration.metricPublishers();
+ }
+ if (publishers == null || publishers.isEmpty()) {
+ publishers = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHERS);
+ }
+ if (publishers == null) {
+ publishers = Collections.emptyList();
+ }
+ return publishers;
}
private HttpResponseHandler createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory,
- JsonOperationMetadata operationMetadata) {
+ JsonOperationMetadata operationMetadata) {
return protocolFactory.createErrorResponseHandler(operationMetadata);
}
private > T init(T builder) {
return builder
- .clientConfiguration(clientConfiguration)
- .defaultServiceExceptionSupplier(JsonException::builder)
- .protocol(AwsJsonProtocol.REST_JSON)
- .protocolVersion("1.1")
- .registerModeledException(
- ExceptionMetadata.builder().errorCode("InvalidInput")
- .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build());
+ .clientConfiguration(clientConfiguration)
+ .defaultServiceExceptionSupplier(JsonException::builder)
+ .protocol(AwsJsonProtocol.REST_JSON)
+ .protocolVersion("1.1")
+ .registerModeledException(
+ ExceptionMetadata.builder().errorCode("InvalidInput")
+ .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build());
}
@Override
@@ -607,10 +714,10 @@ public void close() {
private T applyPaginatorUserAgent(T request) {
Consumer userAgentApplier = b -> b.addApiName(ApiName.builder()
- .version(VersionInfo.SDK_VERSION).name("PAGINATED").build());
+ .version(VersionInfo.SDK_VERSION).name("PAGINATED").build());
AwsRequestOverrideConfiguration overrideConfiguration = request.overrideConfiguration()
- .map(c -> c.toBuilder().applyMutation(userAgentApplier).build())
- .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(userAgentApplier).build()));
+ .map(c -> c.toBuilder().applyMutation(userAgentApplier).build())
+ .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(userAgentApplier).build()));
return (T) request.toBuilder().overrideConfiguration(overrideConfiguration).build();
}
@@ -620,8 +727,8 @@ private T applySignerOverride(T request, Signer signer)
}
Consumer signerOverride = b -> b.signer(signer).build();
AwsRequestOverrideConfiguration overrideConfiguration = request.overrideConfiguration()
- .map(c -> c.toBuilder().applyMutation(signerOverride).build())
- .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(signerOverride).build()));
+ .map(c -> c.toBuilder().applyMutation(signerOverride).build())
+ .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(signerOverride).build()));
return (T) request.toBuilder().overrideConfiguration(overrideConfiguration).build();
}
@@ -630,3 +737,4 @@ public JsonUtilities utilities() {
return JsonUtilities.create(param1, param2, param3);
}
}
+
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-interface.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-interface.java
index ce2d67987cce..e820c2352766 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-interface.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-interface.java
@@ -354,6 +354,10 @@ default PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
* }
*
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -426,6 +430,10 @@ default PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyP
* }
*
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -499,6 +507,10 @@ default PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyP
* }
*
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest)}
* operation.
@@ -630,6 +642,10 @@ default PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResu
* }
*
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithoutResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyRequest)}
* operation.
@@ -703,6 +719,10 @@ default PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResu
* }
*
*
+ * Please notice that the configuration of MaxResults won't limit the number of results you get with the
+ * paginator. It only limits the number of results in each page.
+ *
+ *
* Note: If you prefer to have control on service calls, use the
* {@link #paginatedOperationWithoutResultKey(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyRequest)}
* operation.
@@ -887,7 +907,7 @@ default StreamingInputOperationResponse streamingInputOperation(
* The service documentation for the request content is as follows 'This be a stream'
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOutputOperationRequest and an InputStream to the response content are provided as parameters
+ * StreamingInputOutputOperationResponse and an InputStream to the response content are provided as parameters
* to the callback. The callback may return a transformed type which will be the return value of this method.
* See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
* interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
@@ -934,7 +954,7 @@ default ReturnT streamingInputOutputOperation(
* The service documentation for the request content is as follows 'This be a stream'
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOutputOperationRequest and an InputStream to the response content are provided as parameters
+ * StreamingInputOutputOperationResponse and an InputStream to the response content are provided as parameters
* to the callback. The callback may return a transformed type which will be the return value of this method.
* See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
* interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
@@ -1041,7 +1061,7 @@ default StreamingInputOutputOperationResponse streamingInputOutputOperation(
* @param streamingOutputOperationRequest
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOutputOperationRequest and an InputStream to the response content are provided as parameters
+ * StreamingOutputOperationResponse and an InputStream to the response content are provided as parameters
* to the callback. The callback may return a transformed type which will be the return value of this method.
* See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
* interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
@@ -1076,7 +1096,7 @@ default ReturnT streamingOutputOperation(StreamingOutputOperationReque
* request.
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOutputOperationRequest and an InputStream to the response content are provided as parameters
+ * StreamingOutputOperationResponse and an InputStream to the response content are provided as parameters
* to the callback. The callback may return a transformed type which will be the return value of this method.
* See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
* interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java
index e6ddff92b7f4..17cda3c110f3 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java
@@ -2,20 +2,28 @@
import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
+import java.util.Collections;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.async.AsyncRequestBody;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.core.runtime.transform.AsyncStreamingRequestMarshaller;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.core.ExceptionMetadata;
import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory;
import software.amazon.awssdk.services.query.model.APostOperationRequest;
@@ -86,23 +94,36 @@ public final String serviceName() {
*/
@Override
public CompletableFuture aPostOperation(APostOperationRequest aPostOperationRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation");
String hostPrefix = "foo-";
String resolvedHostExpression = "foo-";
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationResponse::builder);
+ .createResponseHandler(APostOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("APostOperation")
- .withMarshaller(new APostOperationRequestMarshaller(protocolFactory))
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest));
- return executeFuture;
+ .execute(new ClientExecutionParams()
+ .withOperationName("APostOperation")
+ .withMarshaller(new APostOperationRequestMarshaller(protocolFactory))
+ .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
+ .withMetricCollector(apiCallMetricCollector).hostPrefixExpression(resolvedHostExpression)
+ .withInput(aPostOperationRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = aPostOperationRequest.overrideConfiguration().orElse(null);
+ CompletableFuture whenCompleteFuture = null;
+ whenCompleteFuture = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture);
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -132,22 +153,35 @@ public CompletableFuture aPostOperation(APostOperationRe
*/
@Override
public CompletableFuture aPostOperationWithOutput(
- APostOperationWithOutputRequest aPostOperationWithOutputRequest) {
+ APostOperationWithOutputRequest aPostOperationWithOutputRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperationWithOutput");
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationWithOutputResponse::builder);
+ .createResponseHandler(APostOperationWithOutputResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("APostOperationWithOutput")
- .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(aPostOperationWithOutputRequest));
- return executeFuture;
+ .execute(new ClientExecutionParams()
+ .withOperationName("APostOperationWithOutput")
+ .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))
+ .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
+ .withMetricCollector(apiCallMetricCollector).withInput(aPostOperationWithOutputRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = aPostOperationWithOutputRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleteFuture = null;
+ whenCompleteFuture = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture);
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -178,25 +212,38 @@ public CompletableFuture aPostOperationWithOut
*/
@Override
public CompletableFuture streamingInputOperation(
- StreamingInputOperationRequest streamingInputOperationRequest, AsyncRequestBody requestBody) {
+ StreamingInputOperationRequest streamingInputOperationRequest, AsyncRequestBody requestBody) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOperation");
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingInputOperationResponse::builder);
+ .createResponseHandler(StreamingInputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("StreamingInputOperation")
- .withMarshaller(
- AsyncStreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
- .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withAsyncRequestBody(requestBody)
- .withInput(streamingInputOperationRequest));
- return executeFuture;
+ .execute(new ClientExecutionParams()
+ .withOperationName("StreamingInputOperation")
+ .withMarshaller(
+ AsyncStreamingRequestMarshaller.builder()
+ .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
+ .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withMetricCollector(apiCallMetricCollector)
+ .withAsyncRequestBody(requestBody).withInput(streamingInputOperationRequest));
+ AwsRequestOverrideConfiguration requestOverrideConfig = streamingInputOperationRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleteFuture = null;
+ whenCompleteFuture = executeFuture.whenComplete((r, e) -> {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ });
+ return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture);
} catch (Throwable t) {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -227,31 +274,43 @@ public CompletableFuture streamingInputOperatio
*/
@Override
public CompletableFuture streamingOutputOperation(
- StreamingOutputOperationRequest streamingOutputOperationRequest,
- AsyncResponseTransformer asyncResponseTransformer) {
+ StreamingOutputOperationRequest streamingOutputOperationRequest,
+ AsyncResponseTransformer asyncResponseTransformer) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingOutputOperation");
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingOutputOperationResponse::builder);
+ .createResponseHandler(StreamingOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingOutputOperation")
- .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory))
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingOutputOperationRequest), asyncResponseTransformer);
- executeFuture.whenComplete((r, e) -> {
+ new ClientExecutionParams()
+ .withOperationName("StreamingOutputOperation")
+ .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory))
+ .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
+ .withMetricCollector(apiCallMetricCollector).withInput(streamingOutputOperationRequest),
+ asyncResponseTransformer);
+ AwsRequestOverrideConfiguration requestOverrideConfig = streamingOutputOperationRequest.overrideConfiguration()
+ .orElse(null);
+ CompletableFuture whenCompleteFuture = null;
+ whenCompleteFuture = executeFuture.whenComplete((r, e) -> {
if (e != null) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
- () -> asyncResponseTransformer.exceptionOccurred(e));
+ () -> asyncResponseTransformer.exceptionOccurred(e));
}
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig);
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
});
- return executeFuture;
+ return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture);
} catch (Throwable t) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
- () -> asyncResponseTransformer.exceptionOccurred(t));
+ () -> asyncResponseTransformer.exceptionOccurred(t));
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -263,10 +322,26 @@ public void close() {
private AwsQueryProtocolFactory init() {
return AwsQueryProtocolFactory
- .builder()
- .registerModeledException(
- ExceptionMetadata.builder().errorCode("InvalidInput")
- .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
- .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
+ .builder()
+ .registerModeledException(
+ ExceptionMetadata.builder().errorCode("InvalidInput")
+ .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
+ .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
+ }
+
+ private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
+ RequestOverrideConfiguration requestOverrideConfiguration) {
+ List publishers = null;
+ if (requestOverrideConfiguration != null) {
+ publishers = requestOverrideConfiguration.metricPublishers();
+ }
+ if (publishers == null || publishers.isEmpty()) {
+ publishers = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHERS);
+ }
+ if (publishers == null) {
+ publishers = Collections.emptyList();
+ }
+ return publishers;
}
}
+
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
index f9c451e880b3..28cc96b95475 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
@@ -1,17 +1,24 @@
package software.amazon.awssdk.services.query;
+import java.util.Collections;
+import java.util.List;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.awscore.client.handler.AwsSyncClientHandler;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.core.runtime.transform.StreamingRequestMarshaller;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.core.sync.ResponseTransformer;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.core.ExceptionMetadata;
import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory;
import software.amazon.awssdk.services.query.model.APostOperationRequest;
@@ -76,19 +83,29 @@ public final String serviceName() {
*/
@Override
public APostOperationResponse aPostOperation(APostOperationRequest aPostOperationRequest) throws InvalidInputException,
- AwsServiceException, SdkClientException, QueryException {
+ AwsServiceException, SdkClientException, QueryException {
String hostPrefix = "foo-";
String resolvedHostExpression = "foo-";
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationResponse::builder);
+ .createResponseHandler(APostOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation");
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("APostOperation").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression)
- .withInput(aPostOperationRequest).withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
+ return clientHandler.execute(new ClientExecutionParams()
+ .withOperationName("APostOperation").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression)
+ .withInput(aPostOperationRequest).withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -113,19 +130,29 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
*/
@Override
public APostOperationWithOutputResponse aPostOperationWithOutput(
- APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException,
- SdkClientException, QueryException {
+ APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException,
+ SdkClientException, QueryException {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationWithOutputResponse::builder);
+ .createResponseHandler(APostOperationWithOutputResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperationWithOutput");
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("APostOperationWithOutput").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withInput(aPostOperationWithOutputRequest)
- .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("APostOperationWithOutput").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(aPostOperationWithOutputRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -136,11 +163,11 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
* The content to send to the service. A {@link RequestBody} can be created using one of several factory
* methods for various sources of data. For example, to create a request body from a file you can do the
* following.
- *
+ *
*
* {@code RequestBody.fromFile(new File("myfile.txt"))}
*
- *
+ *
* See documentation in {@link RequestBody} for additional details and which sources of data are supported.
* The service documentation for the request content is as follows 'This be a stream'
* @return Result of the StreamingInputOperation operation returned by the service.
@@ -157,23 +184,34 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
*/
@Override
public StreamingInputOperationResponse streamingInputOperation(StreamingInputOperationRequest streamingInputOperationRequest,
- RequestBody requestBody) throws AwsServiceException, SdkClientException, QueryException {
+ RequestBody requestBody) throws AwsServiceException, SdkClientException, QueryException {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingInputOperationResponse::builder);
+ .createResponseHandler(StreamingInputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOperation");
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("StreamingInputOperation")
- .withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingInputOperationRequest)
- .withRequestBody(requestBody)
- .withMarshaller(
- StreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
- .requestBody(requestBody).build()));
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("StreamingInputOperation")
+ .withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler)
+ .withInput(streamingInputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withRequestBody(requestBody)
+ .withMarshaller(
+ StreamingRequestMarshaller.builder()
+ .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
+ .requestBody(requestBody).build()));
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
}
/**
@@ -182,7 +220,7 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
* @param streamingOutputOperationRequest
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOperationRequest and an InputStream to the response content are provided as parameters to
+ * StreamingOutputOperationResponse and an InputStream to the response content are provided as parameters to
* the callback. The callback may return a transformed type which will be the return value of this method.
* See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
* interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
@@ -201,28 +239,53 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
*/
@Override
public ReturnT streamingOutputOperation(StreamingOutputOperationRequest streamingOutputOperationRequest,
- ResponseTransformer responseTransformer) throws AwsServiceException,
- SdkClientException, QueryException {
+ ResponseTransformer responseTransformer) throws AwsServiceException,
+ SdkClientException, QueryException {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingOutputOperationResponse::builder);
+ .createResponseHandler(StreamingOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ try {
+ apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingOutputOperation");
- return clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest)
- .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ return clientHandler.execute(
+ new ClientExecutionParams()
+ .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ } finally {
+ List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest
+ .overrideConfiguration().orElse(null));
+ metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
+ }
+ }
+
+ private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
+ RequestOverrideConfiguration requestOverrideConfiguration) {
+ List publishers = null;
+ if (requestOverrideConfiguration != null) {
+ publishers = requestOverrideConfiguration.metricPublishers();
+ }
+ if (publishers == null || publishers.isEmpty()) {
+ publishers = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHERS);
+ }
+ if (publishers == null) {
+ publishers = Collections.emptyList();
+ }
+ return publishers;
}
private AwsQueryProtocolFactory init() {
return AwsQueryProtocolFactory
- .builder()
- .registerModeledException(
- ExceptionMetadata.builder().errorCode("InvalidInput")
- .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
- .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
+ .builder()
+ .registerModeledException(
+ ExceptionMetadata.builder().errorCode("InvalidInput")
+ .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
+ .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
}
@Override
@@ -230,3 +293,4 @@ public void close() {
clientHandler.close();
}
}
+
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-async-cache-loader.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-async-cache-loader.java
index 2b88b7a1a629..892c6cc8b45d 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-async-cache-loader.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-async-cache-loader.java
@@ -2,6 +2,7 @@
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -9,6 +10,7 @@
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryEndpoint;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
import software.amazon.awssdk.services.endpointdiscoverytest.model.Endpoint;
+import software.amazon.awssdk.utils.Validate;
@SdkInternalApi
@Generated("software.amazon.awssdk:codegen")
@@ -26,14 +28,17 @@ public static EndpointDiscoveryTestAsyncEndpointDiscoveryCacheLoader create(Endp
@Override
public CompletableFuture discoverEndpoint(EndpointDiscoveryRequest endpointDiscoveryRequest) {
return client.describeEndpoints(
- software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsRequest.builder().build())
- .thenApply(
- r -> {
- Endpoint endpoint = r.endpoints().get(0);
- return EndpointDiscoveryEndpoint.builder()
- .endpoint(toUri(endpoint.address(), endpointDiscoveryRequest.defaultEndpoint()))
- .expirationTime(Instant.now().plus(endpoint.cachePeriodInMinutes(), ChronoUnit.MINUTES))
- .build();
- });
+ software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsRequest.builder().build())
+ .thenApply(
+ r -> {
+ List endpoints = r.endpoints();
+ Validate.notEmpty(endpoints,
+ "Endpoints returned by service for endpoint discovery must not be empty.");
+ Endpoint endpoint = endpoints.get(0);
+ return EndpointDiscoveryEndpoint.builder()
+ .endpoint(toUri(endpoint.address(), endpointDiscoveryRequest.defaultEndpoint()))
+ .expirationTime(Instant.now().plus(endpoint.cachePeriodInMinutes(), ChronoUnit.MINUTES))
+ .build();
+ });
}
}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-sync-cache-loader.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-sync-cache-loader.java
index 9873fead9e8d..8262c0f52699 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-sync-cache-loader.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/endpointdiscovery/test-sync-cache-loader.java
@@ -2,6 +2,7 @@
import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -10,6 +11,7 @@
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
import software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsResponse;
import software.amazon.awssdk.services.endpointdiscoverytest.model.Endpoint;
+import software.amazon.awssdk.utils.Validate;
@SdkInternalApi
@Generated("software.amazon.awssdk:codegen")
@@ -28,12 +30,14 @@ public static EndpointDiscoveryTestEndpointDiscoveryCacheLoader create(EndpointD
public CompletableFuture discoverEndpoint(EndpointDiscoveryRequest endpointDiscoveryRequest) {
return CompletableFuture.supplyAsync(() -> {
DescribeEndpointsResponse response = client
- .describeEndpoints(software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsRequest
- .builder().build());
- Endpoint endpoint = response.endpoints().get(0);
+ .describeEndpoints(software.amazon.awssdk.services.endpointdiscoverytest.model.DescribeEndpointsRequest
+ .builder().build());
+ List endpoints = response.endpoints();
+ Validate.notEmpty(endpoints, "Endpoints returned by service for endpoint discovery must not be empty.");
+ Endpoint endpoint = endpoints.get(0);
return EndpointDiscoveryEndpoint.builder()
- .endpoint(toUri(endpoint.address(), endpointDiscoveryRequest.defaultEndpoint()))
- .expirationTime(Instant.now().plus(endpoint.cachePeriodInMinutes(), ChronoUnit.MINUTES)).build();
+ .endpoint(toUri(endpoint.address(), endpointDiscoveryRequest.defaultEndpoint()))
+ .expirationTime(Instant.now().plus(endpoint.cachePeriodInMinutes(), ChronoUnit.MINUTES)).build();
});
}
}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
index 5837fbeee093..ee962fa72e23 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
@@ -2042,7 +2042,7 @@ public final void setSimpleList(Collection simpleList) {
this.simpleList = ListOfStringsCopier.copy(simpleList);
}
- public final Collection getListOfEnumsAsStrings() {
+ public final Collection getListOfEnums() {
return listOfEnums;
}
@@ -2072,7 +2072,7 @@ public final Builder listOfEnums(EnumType... listOfEnums) {
return this;
}
- public final void setListOfEnumsWithStrings(Collection listOfEnums) {
+ public final void setListOfEnums(Collection listOfEnums) {
this.listOfEnums = ListOfEnumsCopier.copy(listOfEnums);
}
@@ -2127,7 +2127,7 @@ public final void setListOfStructs(Collection listOfSt
this.listOfStructs = ListOfSimpleStructsCopier.copyFromBuilder(listOfStructs);
}
- public final Collection> getListOfMapOfEnumToStringAsStrings() {
+ public final Collection> getListOfMapOfEnumToString() {
return listOfMapOfEnumToString;
}
@@ -2144,7 +2144,7 @@ public final Builder listOfMapOfEnumToStringWithStrings(Map... l
return this;
}
- public final void setListOfMapOfEnumToStringWithStrings(Collection> listOfMapOfEnumToString) {
+ public final void setListOfMapOfEnumToString(Collection> listOfMapOfEnumToString) {
this.listOfMapOfEnumToString = ListOfMapOfEnumToStringCopier.copy(listOfMapOfEnumToString);
}
@@ -2191,7 +2191,7 @@ public final void setMapOfStringToSimpleStruct(Map getMapOfEnumToEnumAsStrings() {
+ public final Map getMapOfEnumToEnum() {
return mapOfEnumToEnum;
}
@@ -2207,11 +2207,11 @@ public final Builder mapOfEnumToEnum(Map mapOfEnumToEnum) {
return this;
}
- public final void setMapOfEnumToEnumWithStrings(Map mapOfEnumToEnum) {
+ public final void setMapOfEnumToEnum(Map mapOfEnumToEnum) {
this.mapOfEnumToEnum = MapOfEnumToEnumCopier.copy(mapOfEnumToEnum);
}
- public final Map getMapOfEnumToStringAsStrings() {
+ public final Map getMapOfEnumToString() {
return mapOfEnumToString;
}
@@ -2227,11 +2227,11 @@ public final Builder mapOfEnumToString(Map mapOfEnumToString)
return this;
}
- public final void setMapOfEnumToStringWithStrings(Map mapOfEnumToString) {
+ public final void setMapOfEnumToString(Map mapOfEnumToString) {
this.mapOfEnumToString = MapOfEnumToStringCopier.copy(mapOfEnumToString);
}
- public final Map getMapOfStringToEnumAsStrings() {
+ public final Map getMapOfStringToEnum() {
return mapOfStringToEnum;
}
@@ -2247,11 +2247,11 @@ public final Builder mapOfStringToEnum(Map mapOfStringToEnum)
return this;
}
- public final void setMapOfStringToEnumWithStrings(Map mapOfStringToEnum) {
+ public final void setMapOfStringToEnum(Map mapOfStringToEnum) {
this.mapOfStringToEnum = MapOfStringToEnumCopier.copy(mapOfStringToEnum);
}
- public final Map