Skip to content

Commit

Permalink
AWS SDK for Java 1.11.12
Browse files Browse the repository at this point in the history
  • Loading branch information
AWS committed Jun 29, 2016
1 parent 3695815 commit 69823a8
Show file tree
Hide file tree
Showing 1,504 changed files with 80,532 additions and 64,273 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies.
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.11.11</version>
<version>1.11.12</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
21 changes: 15 additions & 6 deletions aws-java-sdk-acm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,40 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.12-SNAPSHOT</version>
<version>1.11.12</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-acm</artifactId>
<name>AWS Java SDK for AWS Certificate Manager</name>
<description>The AWS Java SDK for AWS Certificate Manager module holds the client classes that are used for communicating with AWS Certificate Manager service.</description>
<url>https://aws.amazon.com/sdkforjava</url>

<!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>1.11.11</version>
<optional>false</optional>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
<optional>false</optional>
<version>1.11.12</version>
</dependency>
</dependencies>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>

<!-- This profile uses the JAPICMP plugin to generate a report of changes between the release version and the latest version -->
<!-- For more information on the plugin, see https://github.com/siom79/japicmp -->
<profiles>
<profile>
<id>versiondiff</id>
Expand Down
2 changes: 1 addition & 1 deletion ...ws/services/certificatemanager/model/transform/AddTagsToCertificateRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public Request<AddTagsToCertificateRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion ...onaws/services/certificatemanager/model/transform/DeleteCertificateRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public Request<DeleteCertificateRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion ...aws/services/certificatemanager/model/transform/DescribeCertificateRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public Request<DescribeCertificateRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion ...mazonaws/services/certificatemanager/model/transform/GetCertificateRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public Request<GetCertificateRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion ...zonaws/services/certificatemanager/model/transform/ListCertificatesRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public Request<ListCertificatesRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion .../services/certificatemanager/model/transform/ListTagsForCertificateRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public Request<ListTagsForCertificateRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion ...rvices/certificatemanager/model/transform/RemoveTagsFromCertificateRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public Request<RemoveTagsFromCertificateRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion ...naws/services/certificatemanager/model/transform/RequestCertificateRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public Request<RequestCertificateRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
2 changes: 1 addition & 1 deletion ...s/services/certificatemanager/model/transform/ResendValidationEmailRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public Request<ResendValidationEmailRequest> marshall(
request.setContent(new ByteArrayInputStream(content));
request.addHeader("Content-Length",
Integer.toString(content.length));
request.addHeader("Content-Type", jsonGenerator.getContentType());
request.addHeader("Content-Type", protocolFactory.getContentType());
} catch (Throwable t) {
throw new AmazonClientException(
"Unable to marshall request to JSON: " + t.getMessage(), t);
Expand Down
28 changes: 14 additions & 14 deletions aws-java-sdk-acm/src/main/resources/models/acm-2015-12-08-intermediate.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"metadata" : {
"apiVersion" : "2015-12-08",
"exceptionUnmarshallerImpl" : null,
"protocol" : "json",
"checksumFormat" : null,
"documentation" : "<fullname>AWS Certificate Manager</fullname> <p>Welcome to the AWS Certificate Manager (ACM) Command Reference. This guide provides descriptions, syntax, and usage examples for each ACM command. You can use AWS Certificate Manager to request ACM Certificates for your AWS-based websites and applications. For general information about using ACM and for more information about using the console, see the <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/acm-overview.html\">AWS Certificate Manager User Guide</a>. For more information about using the ACM API, see the <a href=\"http://docs.aws.amazon.com/acm/latest/APIReference/Welcome.html\">AWS Certificate Manager API Reference</a>.</p>",
Expand All @@ -16,17 +15,17 @@
"serviceAbbreviation" : "ACM",
"serviceFullName" : "AWS Certificate Manager",
"hasApiWithStreamInput" : false,
"jsonContentVersion" : "application/x-amz-json-1.1",
"contentType" : null,
"jsonVersion" : "1.1",
"endpointPrefix" : "acm",
"signingName" : "acm",
"jsonProtocol" : true,
"serviceName" : "ACM",
"cborProtocol" : false,
"xmlProtocol" : false,
"unmarshallerContextClassName" : "JsonUnmarshallerContext",
"unmarshallerClassSuffix" : "JsonUnmarshaller",
"protocolDefaultExceptionUnmarshallerType" : "JsonErrorUnmarshaller"
"protocolDefaultExceptionUmarshallerImpl" : null,
"jsonProtocol" : true
},
"operations" : {
"AddTagsToCertificate" : {
Expand Down Expand Up @@ -60,12 +59,12 @@
"documentation" : "<p>The request contains too many tags. Try the request again with fewer tags.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "AddTagsToCertificateResult",
"asyncReturnType" : "AddTagsToCertificateResult",
"asyncFutureType" : "java.util.concurrent.Future<AddTagsToCertificateResult>",
"asyncCallableType" : "java.util.concurrent.Callable<AddTagsToCertificateResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<AddTagsToCertificateRequest, AddTagsToCertificateResult>",
"authenticated" : true,
"methodName" : "addTagsToCertificate"
},
"DeleteCertificate" : {
Expand Down Expand Up @@ -96,12 +95,12 @@
"documentation" : "<p>The requested Amazon Resource Name (ARN) does not refer to an existing resource.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "DeleteCertificateResult",
"asyncReturnType" : "DeleteCertificateResult",
"asyncFutureType" : "java.util.concurrent.Future<DeleteCertificateResult>",
"asyncCallableType" : "java.util.concurrent.Callable<DeleteCertificateResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DeleteCertificateRequest, DeleteCertificateResult>",
"authenticated" : true,
"methodName" : "deleteCertificate"
},
"DescribeCertificate" : {
Expand Down Expand Up @@ -129,12 +128,12 @@
"documentation" : "<p>The requested Amazon Resource Name (ARN) does not refer to an existing resource.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "DescribeCertificateResult",
"asyncReturnType" : "DescribeCertificateResult",
"asyncFutureType" : "java.util.concurrent.Future<DescribeCertificateResult>",
"asyncCallableType" : "java.util.concurrent.Callable<DescribeCertificateResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DescribeCertificateRequest, DescribeCertificateResult>",
"authenticated" : true,
"methodName" : "describeCertificate"
},
"GetCertificate" : {
Expand Down Expand Up @@ -165,12 +164,12 @@
"documentation" : "<p>The requested Amazon Resource Name (ARN) does not refer to an existing resource.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "GetCertificateResult",
"asyncReturnType" : "GetCertificateResult",
"asyncFutureType" : "java.util.concurrent.Future<GetCertificateResult>",
"asyncCallableType" : "java.util.concurrent.Callable<GetCertificateResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<GetCertificateRequest, GetCertificateResult>",
"authenticated" : true,
"methodName" : "getCertificate"
},
"ListCertificates" : {
Expand All @@ -192,12 +191,12 @@
},
"exceptions" : null,
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "ListCertificatesResult",
"asyncReturnType" : "ListCertificatesResult",
"asyncFutureType" : "java.util.concurrent.Future<ListCertificatesResult>",
"asyncCallableType" : "java.util.concurrent.Callable<ListCertificatesResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListCertificatesRequest, ListCertificatesResult>",
"authenticated" : true,
"methodName" : "listCertificates"
},
"ListTagsForCertificate" : {
Expand Down Expand Up @@ -225,12 +224,12 @@
"documentation" : "<p>The requested Amazon Resource Name (ARN) does not refer to an existing resource.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "ListTagsForCertificateResult",
"asyncReturnType" : "ListTagsForCertificateResult",
"asyncFutureType" : "java.util.concurrent.Future<ListTagsForCertificateResult>",
"asyncCallableType" : "java.util.concurrent.Callable<ListTagsForCertificateResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListTagsForCertificateRequest, ListTagsForCertificateResult>",
"authenticated" : true,
"methodName" : "listTagsForCertificate"
},
"RemoveTagsFromCertificate" : {
Expand Down Expand Up @@ -261,12 +260,12 @@
"documentation" : "<p>One or both of the values that make up the key-value pair is not valid. For example, you cannot specify a tag value that begins with <code>aws:</code>.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "RemoveTagsFromCertificateResult",
"asyncReturnType" : "RemoveTagsFromCertificateResult",
"asyncFutureType" : "java.util.concurrent.Future<RemoveTagsFromCertificateResult>",
"asyncCallableType" : "java.util.concurrent.Callable<RemoveTagsFromCertificateResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<RemoveTagsFromCertificateRequest, RemoveTagsFromCertificateResult>",
"authenticated" : true,
"methodName" : "removeTagsFromCertificate"
},
"RequestCertificate" : {
Expand Down Expand Up @@ -294,12 +293,12 @@
"documentation" : "<p>One or more values in the <a>DomainValidationOption</a> structure is incorrect.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "RequestCertificateResult",
"asyncReturnType" : "RequestCertificateResult",
"asyncFutureType" : "java.util.concurrent.Future<RequestCertificateResult>",
"asyncCallableType" : "java.util.concurrent.Callable<RequestCertificateResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<RequestCertificateRequest, RequestCertificateResult>",
"authenticated" : true,
"methodName" : "requestCertificate"
},
"ResendValidationEmail" : {
Expand Down Expand Up @@ -333,12 +332,12 @@
"documentation" : "<p>One or more values in the <a>DomainValidationOption</a> structure is incorrect.</p>"
} ],
"hasBlobMemberAsPayload" : false,
"authenticated" : true,
"syncReturnType" : "ResendValidationEmailResult",
"asyncReturnType" : "ResendValidationEmailResult",
"asyncFutureType" : "java.util.concurrent.Future<ResendValidationEmailResult>",
"asyncCallableType" : "java.util.concurrent.Callable<ResendValidationEmailResult>",
"asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ResendValidationEmailRequest, ResendValidationEmailResult>",
"authenticated" : true,
"methodName" : "resendValidationEmail"
}
},
Expand Down Expand Up @@ -8494,5 +8493,6 @@
"version" : "1.0",
"operationExamples" : { }
},
"clientConfigFactory" : "ClientConfigurationFactory"
"clientConfigFactory" : "ClientConfigurationFactory",
"exceptionUnmarshallerImpl" : null
}
21 changes: 15 additions & 6 deletions aws-java-sdk-api-gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,40 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.12-SNAPSHOT</version>
<version>1.11.12</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-api-gateway</artifactId>
<name>AWS Java SDK for Amazon API Gateway</name>
<description>The AWS Java SDK for Amazon API Gateway module holds the client classes that are used for communicating with Amazon API Gateway</description>
<url>https://aws.amazon.com/sdkforjava</url>

<!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>1.11.11</version>
<optional>false</optional>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
<optional>false</optional>
<version>1.11.12</version>
</dependency>
</dependencies>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>

<!-- This profile uses the JAPICMP plugin to generate a report of changes between the release version and the latest version -->
<!-- For more information on the plugin, see https://github.com/siom79/japicmp -->
<profiles>
<profile>
<id>versiondiff</id>
Expand Down
1 change: 1 addition & 0 deletions ...k-api-gateway/src/main/java/com/amazonaws/services/apigateway/AmazonApiGatewayClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public class AmazonApiGatewayClient extends AmazonWebServiceClient implements
new JsonClientMetadata()
.withProtocolVersion("1.1")
.withSupportsCbor(false)
.withContentTypeOverride("")
.addErrorMetadata(
new JsonErrorShapeMetadata()
.withErrorCode("UnauthorizedException")
Expand Down
5 changes: 2 additions & 3 deletions ...java/com/amazonaws/services/apigateway/model/transform/CreateApiKeyRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
public class CreateApiKeyRequestMarshaller implements
Marshaller<Request<CreateApiKeyRequest>, CreateApiKeyRequest> {

private static final String DEFAULT_CONTENT_TYPE = "application/x-amz-json-1.1";

private final SdkJsonProtocolFactory protocolFactory;

public CreateApiKeyRequestMarshaller(SdkJsonProtocolFactory protocolFactory) {
Expand Down Expand Up @@ -113,7 +111,8 @@ public Request<CreateApiKeyRequest> marshall(
request.addHeader("Content-Length",
Integer.toString(content.length));
if (!request.getHeaders().containsKey("Content-Type")) {
request.addHeader("Content-Type", DEFAULT_CONTENT_TYPE);
request.addHeader("Content-Type",
protocolFactory.getContentType());
}
} catch (Throwable t) {
throw new AmazonClientException(
Expand Down
5 changes: 2 additions & 3 deletions .../com/amazonaws/services/apigateway/model/transform/CreateAuthorizerRequestMarshaller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
public class CreateAuthorizerRequestMarshaller implements
Marshaller<Request<CreateAuthorizerRequest>, CreateAuthorizerRequest> {

private static final String DEFAULT_CONTENT_TYPE = "application/x-amz-json-1.1";

private final SdkJsonProtocolFactory protocolFactory;

public CreateAuthorizerRequestMarshaller(
Expand Down Expand Up @@ -131,7 +129,8 @@ public Request<CreateAuthorizerRequest> marshall(
request.addHeader("Content-Length",
Integer.toString(content.length));
if (!request.getHeaders().containsKey("Content-Type")) {
request.addHeader("Content-Type", DEFAULT_CONTENT_TYPE);
request.addHeader("Content-Type",
protocolFactory.getContentType());
}
} catch (Throwable t) {
throw new AmazonClientException(
Expand Down
Loading

0 comments on commit 69823a8

Please sign in to comment.