AWS SDK for Java 1.11.222

CHANGELOG.md

@@ -1,3 +1,16 @@
+# __1.11.222__ __2017-11-02__
+## __AWS Certificate Manager__
+  - ### Features
+    - Documentation updates for ACM
+
+## __AWS CloudHSM V2__
+  - ### Features
+    - Minor documentation update for AWS CloudHSM (cloudhsmv2).
+
+## __AWS Direct Connect__
+  - ### Features
+    - AWS DirectConnect now provides support for Global Access for Virtual Private Cloud (VPC) via a new feature called Direct Connect Gateway. A Direct Connect Gateway will allow you to group multiple Direct Connect Private Virtual Interfaces (DX-VIF) and Private Virtual Gateways (VGW) from different AWS regions (but belonging to the same AWS Account) and pass traffic from any DX-VIF to any VPC in the grouping.
+
 # __1.11.221__ __2017-10-26__
 ## __Amazon CloudFront__
   - ### Features

README.md

@@ -45,7 +45,7 @@ dependencies.
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-bom</artifactId>
-      <version>1.11.221</version>
+      <version>1.11.222</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

aws-java-sdk-acm/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.222-SNAPSHOT</version>
+    <version>1.11.222</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-acm</artifactId>

aws-java-sdk-acm/src/main/java/com/amazonaws/services/certificatemanager/AWSCertificateManager.java

@@ -187,15 +187,10 @@ public interface AWSCertificateManager {
     /**
      * <p>
      * Retrieves an ACM Certificate and certificate chain for the certificate specified by an ARN. The chain is an
-     * ordered list of certificates that contains the root certificate, intermediate certificates of subordinate CAs,
-     * and the ACM Certificate. The certificate and certificate chain are base64 encoded. If you want to decode the
-     * certificate chain to see the individual certificate fields, you can use OpenSSL.
+     * ordered list of certificates that contains the ACM Certificate, intermediate certificates of subordinate CAs, and
+     * the root certificate in that order. The certificate and certificate chain are base64 encoded. If you want to
+     * decode the certificate chain to see the individual certificate fields, you can use OpenSSL.
      * </p>
-     * <note>
-     * <p>
-     * Currently, ACM Certificates can be used only with Elastic Load Balancing and Amazon CloudFront.
-     * </p>
-     * </note>
      * 
      * @param getCertificateRequest
      * @return Result of the GetCertificate operation returned by the service.
@@ -226,7 +221,7 @@ public interface AWSCertificateManager {
      * <p>
      * For more information about importing certificates into ACM, including the differences between certificates that
      * you import and those that ACM provides, see <a
-     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html">Importing Certificates</a> in the
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html"> Importing Certificates</a> in the
      * <i>AWS Certificate Manager User Guide</i>.
      * </p>
      * <p>
@@ -245,6 +240,12 @@ public interface AWSCertificateManager {
      * replace a previously imported certificate.
      * </p>
      * <p>
+     * When you import a certificate by using the CLI or one of the SDKs, you must specify the certificate, chain, and
+     * private key parameters as file names preceded by <code>file://</code>. For example, you can specify a certificate
+     * saved in the <code>C:\temp</code> folder as <code>C:\temp\certificate_to_import.pem</code>. If you are making an
+     * HTTP or HTTPS Query request, include these parameters as BLOBs.
+     * </p>
+     * <p>
      * This operation returns the <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a>
      * of the imported certificate.
@@ -330,11 +331,20 @@ public interface AWSCertificateManager {
     /**
      * <p>
      * Requests an ACM Certificate for use with other AWS services. To request an ACM Certificate, you must specify the
-     * fully qualified domain name (FQDN) for your site. You can also specify additional FQDNs if users can reach your
-     * site by using other names. For each domain name you specify, email is sent to the domain owner to request
-     * approval to issue the certificate. After receiving approval from the domain owner, the ACM Certificate is issued.
-     * For more information, see the <a href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager
-     * User Guide</a>.
+     * fully qualified domain name (FQDN) for your site in the <code>DomainName</code> parameter. You can also specify
+     * additional FQDNs in the <code>SubjectAlternativeNames</code> parameter if users can reach your site by using
+     * other names.
+     * </p>
+     * <p>
+     * For each domain name you specify, email is sent to the domain owner to request approval to issue the certificate.
+     * Email is sent to three registered contact addresses in the WHOIS database and to five common system
+     * administration addresses formed from the <code>DomainName</code> you enter or the optional
+     * <code>ValidationDomain</code> parameter. For more information, see <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate.html">Validate Domain Ownership</a>.
+     * </p>
+     * <p>
+     * After receiving approval from the domain owner, the ACM Certificate is issued. For more information, see the <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager User Guide</a>.
      * </p>
      * 
      * @param requestCertificateRequest

aws-java-sdk-acm/src/main/java/com/amazonaws/services/certificatemanager/AWSCertificateManagerAsync.java

@@ -182,15 +182,10 @@ java.util.concurrent.Future<DescribeCertificateResult> describeCertificateAsync(
     /**
      * <p>
      * Retrieves an ACM Certificate and certificate chain for the certificate specified by an ARN. The chain is an
-     * ordered list of certificates that contains the root certificate, intermediate certificates of subordinate CAs,
-     * and the ACM Certificate. The certificate and certificate chain are base64 encoded. If you want to decode the
-     * certificate chain to see the individual certificate fields, you can use OpenSSL.
+     * ordered list of certificates that contains the ACM Certificate, intermediate certificates of subordinate CAs, and
+     * the root certificate in that order. The certificate and certificate chain are base64 encoded. If you want to
+     * decode the certificate chain to see the individual certificate fields, you can use OpenSSL.
      * </p>
-     * <note>
-     * <p>
-     * Currently, ACM Certificates can be used only with Elastic Load Balancing and Amazon CloudFront.
-     * </p>
-     * </note>
      * 
      * @param getCertificateRequest
      * @return A Java Future containing the result of the GetCertificate operation returned by the service.
@@ -203,15 +198,10 @@ java.util.concurrent.Future<DescribeCertificateResult> describeCertificateAsync(
     /**
      * <p>
      * Retrieves an ACM Certificate and certificate chain for the certificate specified by an ARN. The chain is an
-     * ordered list of certificates that contains the root certificate, intermediate certificates of subordinate CAs,
-     * and the ACM Certificate. The certificate and certificate chain are base64 encoded. If you want to decode the
-     * certificate chain to see the individual certificate fields, you can use OpenSSL.
-     * </p>
-     * <note>
-     * <p>
-     * Currently, ACM Certificates can be used only with Elastic Load Balancing and Amazon CloudFront.
+     * ordered list of certificates that contains the ACM Certificate, intermediate certificates of subordinate CAs, and
+     * the root certificate in that order. The certificate and certificate chain are base64 encoded. If you want to
+     * decode the certificate chain to see the individual certificate fields, you can use OpenSSL.
      * </p>
-     * </note>
      * 
      * @param getCertificateRequest
      * @param asyncHandler
@@ -240,7 +230,7 @@ java.util.concurrent.Future<GetCertificateResult> getCertificateAsync(GetCertifi
      * <p>
      * For more information about importing certificates into ACM, including the differences between certificates that
      * you import and those that ACM provides, see <a
-     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html">Importing Certificates</a> in the
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html"> Importing Certificates</a> in the
      * <i>AWS Certificate Manager User Guide</i>.
      * </p>
      * <p>
@@ -259,6 +249,12 @@ java.util.concurrent.Future<GetCertificateResult> getCertificateAsync(GetCertifi
      * replace a previously imported certificate.
      * </p>
      * <p>
+     * When you import a certificate by using the CLI or one of the SDKs, you must specify the certificate, chain, and
+     * private key parameters as file names preceded by <code>file://</code>. For example, you can specify a certificate
+     * saved in the <code>C:\temp</code> folder as <code>C:\temp\certificate_to_import.pem</code>. If you are making an
+     * HTTP or HTTPS Query request, include these parameters as BLOBs.
+     * </p>
+     * <p>
      * This operation returns the <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a>
      * of the imported certificate.
@@ -286,7 +282,7 @@ java.util.concurrent.Future<GetCertificateResult> getCertificateAsync(GetCertifi
      * <p>
      * For more information about importing certificates into ACM, including the differences between certificates that
      * you import and those that ACM provides, see <a
-     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html">Importing Certificates</a> in the
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html"> Importing Certificates</a> in the
      * <i>AWS Certificate Manager User Guide</i>.
      * </p>
      * <p>
@@ -305,6 +301,12 @@ java.util.concurrent.Future<GetCertificateResult> getCertificateAsync(GetCertifi
      * replace a previously imported certificate.
      * </p>
      * <p>
+     * When you import a certificate by using the CLI or one of the SDKs, you must specify the certificate, chain, and
+     * private key parameters as file names preceded by <code>file://</code>. For example, you can specify a certificate
+     * saved in the <code>C:\temp</code> folder as <code>C:\temp\certificate_to_import.pem</code>. If you are making an
+     * HTTP or HTTPS Query request, include these parameters as BLOBs.
+     * </p>
+     * <p>
      * This operation returns the <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a>
      * of the imported certificate.
@@ -439,11 +441,20 @@ java.util.concurrent.Future<RemoveTagsFromCertificateResult> removeTagsFromCerti
     /**
      * <p>
      * Requests an ACM Certificate for use with other AWS services. To request an ACM Certificate, you must specify the
-     * fully qualified domain name (FQDN) for your site. You can also specify additional FQDNs if users can reach your
-     * site by using other names. For each domain name you specify, email is sent to the domain owner to request
-     * approval to issue the certificate. After receiving approval from the domain owner, the ACM Certificate is issued.
-     * For more information, see the <a href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager
-     * User Guide</a>.
+     * fully qualified domain name (FQDN) for your site in the <code>DomainName</code> parameter. You can also specify
+     * additional FQDNs in the <code>SubjectAlternativeNames</code> parameter if users can reach your site by using
+     * other names.
+     * </p>
+     * <p>
+     * For each domain name you specify, email is sent to the domain owner to request approval to issue the certificate.
+     * Email is sent to three registered contact addresses in the WHOIS database and to five common system
+     * administration addresses formed from the <code>DomainName</code> you enter or the optional
+     * <code>ValidationDomain</code> parameter. For more information, see <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate.html">Validate Domain Ownership</a>.
+     * </p>
+     * <p>
+     * After receiving approval from the domain owner, the ACM Certificate is issued. For more information, see the <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager User Guide</a>.
      * </p>
      * 
      * @param requestCertificateRequest
@@ -457,11 +468,20 @@ java.util.concurrent.Future<RemoveTagsFromCertificateResult> removeTagsFromCerti
     /**
      * <p>
      * Requests an ACM Certificate for use with other AWS services. To request an ACM Certificate, you must specify the
-     * fully qualified domain name (FQDN) for your site. You can also specify additional FQDNs if users can reach your
-     * site by using other names. For each domain name you specify, email is sent to the domain owner to request
-     * approval to issue the certificate. After receiving approval from the domain owner, the ACM Certificate is issued.
-     * For more information, see the <a href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager
-     * User Guide</a>.
+     * fully qualified domain name (FQDN) for your site in the <code>DomainName</code> parameter. You can also specify
+     * additional FQDNs in the <code>SubjectAlternativeNames</code> parameter if users can reach your site by using
+     * other names.
+     * </p>
+     * <p>
+     * For each domain name you specify, email is sent to the domain owner to request approval to issue the certificate.
+     * Email is sent to three registered contact addresses in the WHOIS database and to five common system
+     * administration addresses formed from the <code>DomainName</code> you enter or the optional
+     * <code>ValidationDomain</code> parameter. For more information, see <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate.html">Validate Domain Ownership</a>.
+     * </p>
+     * <p>
+     * After receiving approval from the domain owner, the ACM Certificate is issued. For more information, see the <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager User Guide</a>.
      * </p>
      * 
      * @param requestCertificateRequest

aws-java-sdk-acm/src/main/java/com/amazonaws/services/certificatemanager/AWSCertificateManagerClient.java

@@ -72,7 +72,7 @@ public class AWSCertificateManagerClient extends AmazonWebServiceClient implemen
     /** Client configuration factory providing ClientConfigurations tailored to this client */
     protected static final ClientConfigurationFactory configFactory = new ClientConfigurationFactory();
 
-    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory = new com.amazonaws.protocol.json.SdkJsonProtocolFactory(
+    private static final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory = new com.amazonaws.protocol.json.SdkJsonProtocolFactory(
             new JsonClientMetadata()
                     .withProtocolVersion("1.1")
                     .withSupportsCbor(false)
@@ -481,15 +481,10 @@ final DescribeCertificateResult executeDescribeCertificate(DescribeCertificateRe
     /**
      * <p>
      * Retrieves an ACM Certificate and certificate chain for the certificate specified by an ARN. The chain is an
-     * ordered list of certificates that contains the root certificate, intermediate certificates of subordinate CAs,
-     * and the ACM Certificate. The certificate and certificate chain are base64 encoded. If you want to decode the
-     * certificate chain to see the individual certificate fields, you can use OpenSSL.
+     * ordered list of certificates that contains the ACM Certificate, intermediate certificates of subordinate CAs, and
+     * the root certificate in that order. The certificate and certificate chain are base64 encoded. If you want to
+     * decode the certificate chain to see the individual certificate fields, you can use OpenSSL.
      * </p>
-     * <note>
-     * <p>
-     * Currently, ACM Certificates can be used only with Elastic Load Balancing and Amazon CloudFront.
-     * </p>
-     * </note>
      * 
      * @param getCertificateRequest
      * @return Result of the GetCertificate operation returned by the service.
@@ -555,7 +550,7 @@ final GetCertificateResult executeGetCertificate(GetCertificateRequest getCertif
      * <p>
      * For more information about importing certificates into ACM, including the differences between certificates that
      * you import and those that ACM provides, see <a
-     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html">Importing Certificates</a> in the
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html"> Importing Certificates</a> in the
      * <i>AWS Certificate Manager User Guide</i>.
      * </p>
      * <p>
@@ -574,6 +569,12 @@ final GetCertificateResult executeGetCertificate(GetCertificateRequest getCertif
      * replace a previously imported certificate.
      * </p>
      * <p>
+     * When you import a certificate by using the CLI or one of the SDKs, you must specify the certificate, chain, and
+     * private key parameters as file names preceded by <code>file://</code>. For example, you can specify a certificate
+     * saved in the <code>C:\temp</code> folder as <code>C:\temp\certificate_to_import.pem</code>. If you are making an
+     * HTTP or HTTPS Query request, include these parameters as BLOBs.
+     * </p>
+     * <p>
      * This operation returns the <a
      * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon Resource Name (ARN)</a>
      * of the imported certificate.
@@ -802,11 +803,20 @@ final RemoveTagsFromCertificateResult executeRemoveTagsFromCertificate(RemoveTag
     /**
      * <p>
      * Requests an ACM Certificate for use with other AWS services. To request an ACM Certificate, you must specify the
-     * fully qualified domain name (FQDN) for your site. You can also specify additional FQDNs if users can reach your
-     * site by using other names. For each domain name you specify, email is sent to the domain owner to request
-     * approval to issue the certificate. After receiving approval from the domain owner, the ACM Certificate is issued.
-     * For more information, see the <a href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager
-     * User Guide</a>.
+     * fully qualified domain name (FQDN) for your site in the <code>DomainName</code> parameter. You can also specify
+     * additional FQDNs in the <code>SubjectAlternativeNames</code> parameter if users can reach your site by using
+     * other names.
+     * </p>
+     * <p>
+     * For each domain name you specify, email is sent to the domain owner to request approval to issue the certificate.
+     * Email is sent to three registered contact addresses in the WHOIS database and to five common system
+     * administration addresses formed from the <code>DomainName</code> you enter or the optional
+     * <code>ValidationDomain</code> parameter. For more information, see <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate.html">Validate Domain Ownership</a>.
+     * </p>
+     * <p>
+     * After receiving approval from the domain owner, the ACM Certificate is issued. For more information, see the <a
+     * href="http://docs.aws.amazon.com/acm/latest/userguide/">AWS Certificate Manager User Guide</a>.
      * </p>
      * 
      * @param requestCertificateRequest
@@ -979,4 +989,9 @@ private <X, Y extends AmazonWebServiceRequest> Response<X> doInvoke(Request<Y> r
         return client.execute(request, responseHandler, errorResponseHandler, executionContext);
     }
 
+    @com.amazonaws.annotation.SdkInternalApi
+    static com.amazonaws.protocol.json.SdkJsonProtocolFactory getProtocolFactory() {
+        return protocolFactory;
+    }
+
 }