Skip to content

Commit 28d179d

Browse files
authored
feat(aws-android-sdk-iot): update models to latest (#3212)
1 parent a25e30e commit 28d179d

21 files changed

+1194
-129
lines changed

aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIot.java

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -744,67 +744,65 @@ CreateBillingGroupResult createBillingGroup(CreateBillingGroupRequest createBill
744744
* request.
745745
* </p>
746746
* <p>
747-
* <b>Note:</b> The CSR must include a public key that is either an RSA key
748-
* with a length of at least 2048 bits or an ECC key from NIST P-256, NIST
749-
* P-384, or NIST P-512 curves. For supported certificates, consult <a href=
750-
* "https://docs.aws.amazon.com/iot/latest/developerguide/x509-client-certs.html#x509-cert-algorithms"
751-
* > Certificate signing algorithms supported by IoT</a>.
752-
* </p>
753-
* <p>
754-
* <b>Note:</b> Reusing the same certificate signing request (CSR) results
755-
* in a distinct certificate.
756-
* </p>
757-
* <p>
758747
* Requires permission to access the <a href=
759748
* "https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions"
760749
* >CreateCertificateFromCsr</a> action.
761750
* </p>
751+
* <note>
762752
* <p>
763-
* You can create multiple certificates in a batch by creating a directory,
764-
* copying multiple .csr files into that directory, and then specifying that
765-
* directory on the command line. The following commands show how to create
766-
* a batch of certificates given a batch of CSRs.
753+
* The CSR must include a public key that is either an RSA key with a length
754+
* of at least 2048 bits or an ECC key from NIST P-25 or NIST P-384 curves.
755+
* For supported certificates, consult <a href=
756+
* "https://docs.aws.amazon.com/iot/latest/developerguide/x509-client-certs.html#x509-cert-algorithms"
757+
* > Certificate signing algorithms supported by IoT</a>.
767758
* </p>
759+
* </note> <note>
768760
* <p>
769-
* Assuming a set of CSRs are located inside of the directory
770-
* my-csr-directory:
761+
* Reusing the same certificate signing request (CSR) results in a distinct
762+
* certificate.
763+
* </p>
764+
* </note>
765+
* <p>
766+
* You can create multiple certificates in a batch by creating a directory,
767+
* copying multiple <code>.csr</code> files into that directory, and then
768+
* specifying that directory on the command line. The following commands
769+
* show how to create a batch of certificates given a batch of CSRs. In the
770+
* following commands, we assume that a set of CSRs are located inside of
771+
* the directory my-csr-directory:
771772
* </p>
772773
* <p>
773774
* On Linux and OS X, the command is:
774775
* </p>
775776
* <p>
776-
* $ ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr
777-
* --certificate-signing-request file://my-csr-directory/{}
777+
* <code>$ ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{}</code>
778778
* </p>
779779
* <p>
780780
* This command lists all of the CSRs in my-csr-directory and pipes each CSR
781-
* file name to the aws iot create-certificate-from-csr Amazon Web Services
782-
* CLI command to create a certificate for the corresponding CSR.
781+
* file name to the <code>aws iot create-certificate-from-csr</code> Amazon
782+
* Web Services CLI command to create a certificate for the corresponding
783+
* CSR.
783784
* </p>
784785
* <p>
785-
* The aws iot create-certificate-from-csr part of the command can also be
786-
* run in parallel to speed up the certificate creation process:
786+
* You can also run the <code>aws iot create-certificate-from-csr</code>
787+
* part of the command in parallel to speed up the certificate creation
788+
* process:
787789
* </p>
788790
* <p>
789-
* $ ls my-csr-directory/ | xargs -P 10 -I {} aws iot
790-
* create-certificate-from-csr --certificate-signing-request
791-
* file://my-csr-directory/{}
791+
* <code>$ ls my-csr-directory/ | xargs -P 10 -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{} </code>
792792
* </p>
793793
* <p>
794794
* On Windows PowerShell, the command to create certificates for all CSRs in
795795
* my-csr-directory is:
796796
* </p>
797797
* <p>
798-
* &gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr
799-
* --certificate-signing-request file://my-csr-directory/$_}
798+
* <code>&gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/$_} </code>
800799
* </p>
801800
* <p>
802801
* On a Windows command prompt, the command to create certificates for all
803802
* CSRs in my-csr-directory is:
804803
* </p>
805804
* <p>
806-
* &gt; forfiles /p my-csr-directory /c
807-
* "cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path"
805+
* <code>&gt; forfiles /p my-csr-directory /c "cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path" </code>
808806
* </p>
809807
*
810808
* @param createCertificateFromCsrRequest <p>

aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIotClient.java

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,67 +1520,65 @@ public CreateBillingGroupResult createBillingGroup(
15201520
* request.
15211521
* </p>
15221522
* <p>
1523-
* <b>Note:</b> The CSR must include a public key that is either an RSA key
1524-
* with a length of at least 2048 bits or an ECC key from NIST P-256, NIST
1525-
* P-384, or NIST P-512 curves. For supported certificates, consult <a href=
1526-
* "https://docs.aws.amazon.com/iot/latest/developerguide/x509-client-certs.html#x509-cert-algorithms"
1527-
* > Certificate signing algorithms supported by IoT</a>.
1528-
* </p>
1529-
* <p>
1530-
* <b>Note:</b> Reusing the same certificate signing request (CSR) results
1531-
* in a distinct certificate.
1532-
* </p>
1533-
* <p>
15341523
* Requires permission to access the <a href=
15351524
* "https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions"
15361525
* >CreateCertificateFromCsr</a> action.
15371526
* </p>
1527+
* <note>
15381528
* <p>
1539-
* You can create multiple certificates in a batch by creating a directory,
1540-
* copying multiple .csr files into that directory, and then specifying that
1541-
* directory on the command line. The following commands show how to create
1542-
* a batch of certificates given a batch of CSRs.
1529+
* The CSR must include a public key that is either an RSA key with a length
1530+
* of at least 2048 bits or an ECC key from NIST P-25 or NIST P-384 curves.
1531+
* For supported certificates, consult <a href=
1532+
* "https://docs.aws.amazon.com/iot/latest/developerguide/x509-client-certs.html#x509-cert-algorithms"
1533+
* > Certificate signing algorithms supported by IoT</a>.
15431534
* </p>
1535+
* </note> <note>
15441536
* <p>
1545-
* Assuming a set of CSRs are located inside of the directory
1546-
* my-csr-directory:
1537+
* Reusing the same certificate signing request (CSR) results in a distinct
1538+
* certificate.
1539+
* </p>
1540+
* </note>
1541+
* <p>
1542+
* You can create multiple certificates in a batch by creating a directory,
1543+
* copying multiple <code>.csr</code> files into that directory, and then
1544+
* specifying that directory on the command line. The following commands
1545+
* show how to create a batch of certificates given a batch of CSRs. In the
1546+
* following commands, we assume that a set of CSRs are located inside of
1547+
* the directory my-csr-directory:
15471548
* </p>
15481549
* <p>
15491550
* On Linux and OS X, the command is:
15501551
* </p>
15511552
* <p>
1552-
* $ ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr
1553-
* --certificate-signing-request file://my-csr-directory/{}
1553+
* <code>$ ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{}</code>
15541554
* </p>
15551555
* <p>
15561556
* This command lists all of the CSRs in my-csr-directory and pipes each CSR
1557-
* file name to the aws iot create-certificate-from-csr Amazon Web Services
1558-
* CLI command to create a certificate for the corresponding CSR.
1557+
* file name to the <code>aws iot create-certificate-from-csr</code> Amazon
1558+
* Web Services CLI command to create a certificate for the corresponding
1559+
* CSR.
15591560
* </p>
15601561
* <p>
1561-
* The aws iot create-certificate-from-csr part of the command can also be
1562-
* run in parallel to speed up the certificate creation process:
1562+
* You can also run the <code>aws iot create-certificate-from-csr</code>
1563+
* part of the command in parallel to speed up the certificate creation
1564+
* process:
15631565
* </p>
15641566
* <p>
1565-
* $ ls my-csr-directory/ | xargs -P 10 -I {} aws iot
1566-
* create-certificate-from-csr --certificate-signing-request
1567-
* file://my-csr-directory/{}
1567+
* <code>$ ls my-csr-directory/ | xargs -P 10 -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{} </code>
15681568
* </p>
15691569
* <p>
15701570
* On Windows PowerShell, the command to create certificates for all CSRs in
15711571
* my-csr-directory is:
15721572
* </p>
15731573
* <p>
1574-
* &gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr
1575-
* --certificate-signing-request file://my-csr-directory/$_}
1574+
* <code>&gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/$_} </code>
15761575
* </p>
15771576
* <p>
15781577
* On a Windows command prompt, the command to create certificates for all
15791578
* CSRs in my-csr-directory is:
15801579
* </p>
15811580
* <p>
1582-
* &gt; forfiles /p my-csr-directory /c
1583-
* "cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path"
1581+
* <code>&gt; forfiles /p my-csr-directory /c "cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path" </code>
15841582
* </p>
15851583
*
15861584
* @param createCertificateFromCsrRequest <p>

aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateCertificateFromCsrRequest.java

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,66 +24,63 @@
2424
* Creates an X.509 certificate using the specified certificate signing request.
2525
* </p>
2626
* <p>
27-
* <b>Note:</b> The CSR must include a public key that is either an RSA key with
28-
* a length of at least 2048 bits or an ECC key from NIST P-256, NIST P-384, or
29-
* NIST P-512 curves. For supported certificates, consult <a href=
30-
* "https://docs.aws.amazon.com/iot/latest/developerguide/x509-client-certs.html#x509-cert-algorithms"
31-
* > Certificate signing algorithms supported by IoT</a>.
32-
* </p>
33-
* <p>
34-
* <b>Note:</b> Reusing the same certificate signing request (CSR) results in a
35-
* distinct certificate.
36-
* </p>
37-
* <p>
3827
* Requires permission to access the <a href=
3928
* "https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions"
4029
* >CreateCertificateFromCsr</a> action.
4130
* </p>
31+
* <note>
4232
* <p>
43-
* You can create multiple certificates in a batch by creating a directory,
44-
* copying multiple .csr files into that directory, and then specifying that
45-
* directory on the command line. The following commands show how to create a
46-
* batch of certificates given a batch of CSRs.
33+
* The CSR must include a public key that is either an RSA key with a length of
34+
* at least 2048 bits or an ECC key from NIST P-25 or NIST P-384 curves. For
35+
* supported certificates, consult <a href=
36+
* "https://docs.aws.amazon.com/iot/latest/developerguide/x509-client-certs.html#x509-cert-algorithms"
37+
* > Certificate signing algorithms supported by IoT</a>.
4738
* </p>
39+
* </note> <note>
4840
* <p>
49-
* Assuming a set of CSRs are located inside of the directory my-csr-directory:
41+
* Reusing the same certificate signing request (CSR) results in a distinct
42+
* certificate.
43+
* </p>
44+
* </note>
45+
* <p>
46+
* You can create multiple certificates in a batch by creating a directory,
47+
* copying multiple <code>.csr</code> files into that directory, and then
48+
* specifying that directory on the command line. The following commands show
49+
* how to create a batch of certificates given a batch of CSRs. In the following
50+
* commands, we assume that a set of CSRs are located inside of the directory
51+
* my-csr-directory:
5052
* </p>
5153
* <p>
5254
* On Linux and OS X, the command is:
5355
* </p>
5456
* <p>
55-
* $ ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr
56-
* --certificate-signing-request file://my-csr-directory/{}
57+
* <code>$ ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{}</code>
5758
* </p>
5859
* <p>
5960
* This command lists all of the CSRs in my-csr-directory and pipes each CSR
60-
* file name to the aws iot create-certificate-from-csr Amazon Web Services CLI
61-
* command to create a certificate for the corresponding CSR.
61+
* file name to the <code>aws iot create-certificate-from-csr</code> Amazon Web
62+
* Services CLI command to create a certificate for the corresponding CSR.
6263
* </p>
6364
* <p>
64-
* The aws iot create-certificate-from-csr part of the command can also be run
65-
* in parallel to speed up the certificate creation process:
65+
* You can also run the <code>aws iot create-certificate-from-csr</code> part of
66+
* the command in parallel to speed up the certificate creation process:
6667
* </p>
6768
* <p>
68-
* $ ls my-csr-directory/ | xargs -P 10 -I {} aws iot
69-
* create-certificate-from-csr --certificate-signing-request
70-
* file://my-csr-directory/{}
69+
* <code>$ ls my-csr-directory/ | xargs -P 10 -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{} </code>
7170
* </p>
7271
* <p>
7372
* On Windows PowerShell, the command to create certificates for all CSRs in
7473
* my-csr-directory is:
7574
* </p>
7675
* <p>
77-
* &gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr
78-
* --certificate-signing-request file://my-csr-directory/$_}
76+
* <code>&gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/$_} </code>
7977
* </p>
8078
* <p>
8179
* On a Windows command prompt, the command to create certificates for all CSRs
8280
* in my-csr-directory is:
8381
* </p>
8482
* <p>
85-
* &gt; forfiles /p my-csr-directory /c
86-
* "cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path"
83+
* <code>&gt; forfiles /p my-csr-directory /c "cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path" </code>
8784
* </p>
8885
*/
8986
public class CreateCertificateFromCsrRequest extends AmazonWebServiceRequest implements

aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateFleetMetricRequest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public class CreateFleetMetricRequest extends AmazonWebServiceRequest implements
112112
* <p>
113113
* Used to support unit transformation such as milliseconds to seconds. The
114114
* unit must be supported by <a href=
115-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
115+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
116116
* >CW metric</a>. Default to null.
117117
* </p>
118118
* <p>
@@ -566,7 +566,7 @@ public CreateFleetMetricRequest withIndexName(String indexName) {
566566
* <p>
567567
* Used to support unit transformation such as milliseconds to seconds. The
568568
* unit must be supported by <a href=
569-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
569+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
570570
* >CW metric</a>. Default to null.
571571
* </p>
572572
* <p>
@@ -581,7 +581,7 @@ public CreateFleetMetricRequest withIndexName(String indexName) {
581581
* @return <p>
582582
* Used to support unit transformation such as milliseconds to
583583
* seconds. The unit must be supported by <a href=
584-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
584+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
585585
* >CW metric</a>. Default to null.
586586
* </p>
587587
* @see FleetMetricUnit
@@ -594,7 +594,7 @@ public String getUnit() {
594594
* <p>
595595
* Used to support unit transformation such as milliseconds to seconds. The
596596
* unit must be supported by <a href=
597-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
597+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
598598
* >CW metric</a>. Default to null.
599599
* </p>
600600
* <p>
@@ -609,7 +609,7 @@ public String getUnit() {
609609
* @param unit <p>
610610
* Used to support unit transformation such as milliseconds to
611611
* seconds. The unit must be supported by <a href=
612-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
612+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
613613
* >CW metric</a>. Default to null.
614614
* </p>
615615
* @see FleetMetricUnit
@@ -622,7 +622,7 @@ public void setUnit(String unit) {
622622
* <p>
623623
* Used to support unit transformation such as milliseconds to seconds. The
624624
* unit must be supported by <a href=
625-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
625+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
626626
* >CW metric</a>. Default to null.
627627
* </p>
628628
* <p>
@@ -640,7 +640,7 @@ public void setUnit(String unit) {
640640
* @param unit <p>
641641
* Used to support unit transformation such as milliseconds to
642642
* seconds. The unit must be supported by <a href=
643-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
643+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
644644
* >CW metric</a>. Default to null.
645645
* </p>
646646
* @return A reference to this updated object so that method calls can be
@@ -656,7 +656,7 @@ public CreateFleetMetricRequest withUnit(String unit) {
656656
* <p>
657657
* Used to support unit transformation such as milliseconds to seconds. The
658658
* unit must be supported by <a href=
659-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
659+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
660660
* >CW metric</a>. Default to null.
661661
* </p>
662662
* <p>
@@ -671,7 +671,7 @@ public CreateFleetMetricRequest withUnit(String unit) {
671671
* @param unit <p>
672672
* Used to support unit transformation such as milliseconds to
673673
* seconds. The unit must be supported by <a href=
674-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
674+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
675675
* >CW metric</a>. Default to null.
676676
* </p>
677677
* @see FleetMetricUnit
@@ -684,7 +684,7 @@ public void setUnit(FleetMetricUnit unit) {
684684
* <p>
685685
* Used to support unit transformation such as milliseconds to seconds. The
686686
* unit must be supported by <a href=
687-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
687+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
688688
* >CW metric</a>. Default to null.
689689
* </p>
690690
* <p>
@@ -702,7 +702,7 @@ public void setUnit(FleetMetricUnit unit) {
702702
* @param unit <p>
703703
* Used to support unit transformation such as milliseconds to
704704
* seconds. The unit must be supported by <a href=
705-
* "https://docs.aws.amazon.com/https:/docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
705+
* "https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html"
706706
* >CW metric</a>. Default to null.
707707
* </p>
708708
* @return A reference to this updated object so that method calls can be

0 commit comments

Comments
 (0)