High severityNVD Advisory· Published Jul 15, 2022· Updated Apr 22, 2025
Partial Path Traversal in com.amazonaws:aws-java-sdk-s3
CVE-2022-31159
Description
A partial path traversal in the AWS SDK for Java v1 S3 TransferManager’s downloadDirectory method allows writing files outside the intended destination directory.
AI Insight
LLM-synthesized narrative grounded in this CVE's description and references.
A partial path traversal in the AWS SDK for Java v1 S3 TransferManager’s downloadDirectory method allows writing files outside the intended destination directory.
Root
Cause
The vulnerability resides in the downloadDirectory method of the TransferManager component in the AWS SDK for Java v1 (versions before 1.12.261). The method validates object keys to prevent path traversal but fails to adequately handle keys containing a UNIX double-dot (..) sequence [1][2]. The guard logic in leavesRoot was insufficient, allowing a crafted key to bypass the canonical path check when combined with a destination directory that shares a prefix with the traversal target [2].
Exploitation
An attacker who controls the S3 object keys in a bucket (e.g., by uploading objects with malicious keys) can exploit this when an application uses downloadDirectory to download that bucket's contents. The attacker sets an object key such as ../bar when the destination directory is /tmp/foo. The flawed validation permits the file to be written to /tmp/foo-bar (a sibling directory) but not outside the parent of the destination [1][2]. The attacker must have the ability to upload objects to the S3 bucket being downloaded, and the application must process those keys without additional filtering [1].
Impact
Successful exploitation allows an attacker to write files to directories one level up from the intended destination, but only to sibling directories whose names match the prefix of the destination directory [1][2]. While the scope is limited, it can still lead to unintended file overwrites or data leakage if downloaded files contain sensitive information and are placed in accessible locations [1].
Mitigation
A patch was released in version 1.12.261 of the AWS SDK for Java v1 [1][4]. Users should upgrade immediately. As a workaround, applications can pass a KeyFilter that rejects S3ObjectSummary objects whose getKey method returns a string containing .. [1][2]. Note that the AWS SDK for Java 1.x is in maintenance mode and reached end-of-support on December 31, 2025; migration to the 2.x SDK is strongly recommended [3].
References
- NVD - CVE-2022-31159
- Partial Path Traversal in com.amazonaws:aws-java-sdk-s3
- GitHub - aws/aws-sdk-java: The official AWS SDK for Java 1.x (In Maintenance Mode, End-of-Life on 12/31/2025). The AWS SDK for Java 2.x is available here: https://github.com/aws/aws-sdk-java-v2/
- AWS SDK for Java 1.12.261 · aws/aws-sdk-java@cb66c50
AI Insight generated on May 21, 2026. Synthesized from this CVE's description and the cited reference URLs; citations are validated against the source bundle.
Affected packages
Versions sourced from the GitHub Security Advisory.
| Package | Affected versions | Patched versions |
|---|---|---|
com.amazonaws:aws-java-sdk-s3Maven | < 1.12.261 | 1.12.261 |
Affected products
2- Range: <= 1.12.260
Patches
1300 files changed · +10943 −1584
aws-java-sdk-accessanalyzer/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-accessanalyzer</artifactId>
aws-java-sdk-account/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-account</artifactId>
aws-java-sdk-acmpca/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-acmpca</artifactId>
aws-java-sdk-acm/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-acm</artifactId>
aws-java-sdk-alexaforbusiness/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-alexaforbusiness</artifactId>
aws-java-sdk-amplifybackend/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-amplifybackend</artifactId>
aws-java-sdk-amplify/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-amplify</artifactId>
aws-java-sdk-amplifyuibuilder/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-amplifyuibuilder</artifactId>
aws-java-sdk-apigatewaymanagementapi/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-apigatewaymanagementapi</artifactId>
aws-java-sdk-api-gateway/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-api-gateway</artifactId>
aws-java-sdk-apigatewayv2/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-apigatewayv2</artifactId>
aws-java-sdk-appconfigdata/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appconfigdata</artifactId>
aws-java-sdk-appconfig/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appconfig</artifactId>
aws-java-sdk-appflow/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appflow</artifactId>
aws-java-sdk-appintegrations/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appintegrations</artifactId>
aws-java-sdk-applicationautoscaling/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-applicationautoscaling</artifactId>
aws-java-sdk-applicationcostprofiler/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-applicationcostprofiler</artifactId>
aws-java-sdk-applicationinsights/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-applicationinsights</artifactId>
aws-java-sdk-appmesh/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appmesh</artifactId>
aws-java-sdk-appregistry/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appregistry</artifactId>
aws-java-sdk-apprunner/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-apprunner</artifactId>
aws-java-sdk-appstream/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appstream</artifactId>
aws-java-sdk-appsync/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-appsync</artifactId>
aws-java-sdk-athena/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-athena</artifactId>
aws-java-sdk-athena/src/main/java/com/amazonaws/services/athena/AmazonAthenaAsync.java+4 −0 modified@@ -59,6 +59,7 @@ public interface AmazonAthenaAsync extends AmazonAthena { * </p> * * @param batchGetNamedQueryRequest + * Contains an array of named query IDs. * @return A Java Future containing the result of the BatchGetNamedQuery operation returned by the service. * @sample AmazonAthenaAsync.BatchGetNamedQuery * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/BatchGetNamedQuery" target="_top">AWS API @@ -78,6 +79,7 @@ public interface AmazonAthenaAsync extends AmazonAthena { * </p> * * @param batchGetNamedQueryRequest + * Contains an array of named query IDs. * @param asyncHandler * Asynchronous callback handler for events in the lifecycle of the request. Users can provide an * implementation of the callback methods in this interface to receive notification of successful or @@ -138,6 +140,7 @@ java.util.concurrent.Future<BatchGetPreparedStatementResult> batchGetPreparedSta * </p> * * @param batchGetQueryExecutionRequest + * Contains an array of query execution IDs. * @return A Java Future containing the result of the BatchGetQueryExecution operation returned by the service. * @sample AmazonAthenaAsync.BatchGetQueryExecution * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/BatchGetQueryExecution" target="_top">AWS @@ -154,6 +157,7 @@ java.util.concurrent.Future<BatchGetPreparedStatementResult> batchGetPreparedSta * </p> * * @param batchGetQueryExecutionRequest + * Contains an array of query execution IDs. * @param asyncHandler * Asynchronous callback handler for events in the lifecycle of the request. Users can provide an * implementation of the callback methods in this interface to receive notification of successful or
aws-java-sdk-athena/src/main/java/com/amazonaws/services/athena/AmazonAthenaClient.java+2 −0 modified@@ -166,6 +166,7 @@ private void init() { * </p> * * @param batchGetNamedQueryRequest + * Contains an array of named query IDs. * @return Result of the BatchGetNamedQuery operation returned by the service. * @throws InternalServerException * Indicates a platform issue, which may be due to a transient condition or outage. @@ -294,6 +295,7 @@ final BatchGetPreparedStatementResult executeBatchGetPreparedStatement(BatchGetP * </p> * * @param batchGetQueryExecutionRequest + * Contains an array of query execution IDs. * @return Result of the BatchGetQueryExecution operation returned by the service. * @throws InternalServerException * Indicates a platform issue, which may be due to a transient condition or outage.
aws-java-sdk-athena/src/main/java/com/amazonaws/services/athena/AmazonAthena.java+2 −0 modified@@ -68,6 +68,7 @@ public interface AmazonAthena { * </p> * * @param batchGetNamedQueryRequest + * Contains an array of named query IDs. * @return Result of the BatchGetNamedQuery operation returned by the service. * @throws InternalServerException * Indicates a platform issue, which may be due to a transient condition or outage. @@ -110,6 +111,7 @@ public interface AmazonAthena { * </p> * * @param batchGetQueryExecutionRequest + * Contains an array of query execution IDs. * @return Result of the BatchGetQueryExecution operation returned by the service. * @throws InternalServerException * Indicates a platform issue, which may be due to a transient condition or outage.
aws-java-sdk-athena/src/main/java/com/amazonaws/services/athena/model/BatchGetNamedQueryRequest.java+3 −0 modified@@ -18,6 +18,9 @@ import com.amazonaws.AmazonWebServiceRequest; /** + * <p> + * Contains an array of named query IDs. + * </p> * * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/BatchGetNamedQuery" target="_top">AWS API * Documentation</a>
aws-java-sdk-athena/src/main/java/com/amazonaws/services/athena/model/BatchGetQueryExecutionRequest.java+3 −0 modified@@ -18,6 +18,9 @@ import com.amazonaws.AmazonWebServiceRequest; /** + * <p> + * Contains an array of query execution IDs. + * </p> * * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/athena-2017-05-18/BatchGetQueryExecution" target="_top">AWS API * Documentation</a>
aws-java-sdk-auditmanager/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-auditmanager</artifactId>
aws-java-sdk-augmentedairuntime/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-augmentedairuntime</artifactId>
aws-java-sdk-autoscalingplans/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-autoscalingplans</artifactId>
aws-java-sdk-autoscaling/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-autoscaling</artifactId>
aws-java-sdk-backupgateway/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-backupgateway</artifactId>
aws-java-sdk-backup/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-backup</artifactId>
aws-java-sdk-batch/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-batch</artifactId>
aws-java-sdk-billingconductor/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-billingconductor</artifactId>
aws-java-sdk-bom/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-bom</artifactId>
aws-java-sdk-braket/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-braket</artifactId>
aws-java-sdk-budgets/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-budgets</artifactId>
aws-java-sdk-bundle/pom.xml+2 −2 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-bundle</artifactId> @@ -24,7 +24,7 @@ <artifactId>aws-java-sdk</artifactId> <groupId>com.amazonaws</groupId> <optional>false</optional> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </dependency> </dependencies>
aws-java-sdk-chime/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-chime</artifactId>
aws-java-sdk-chimesdkidentity/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-chimesdkidentity</artifactId>
aws-java-sdk-chimesdkmediapipelines/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-chimesdkmediapipelines</artifactId>
aws-java-sdk-chimesdkmeetings/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-chimesdkmeetings</artifactId>
aws-java-sdk-chimesdkmessaging/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-chimesdkmessaging</artifactId>
aws-java-sdk-cloud9/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloud9</artifactId>
aws-java-sdk-cloudcontrolapi/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudcontrolapi</artifactId>
aws-java-sdk-clouddirectory/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-clouddirectory</artifactId>
aws-java-sdk-cloudformation/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudformation</artifactId>
aws-java-sdk-cloudfront/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudfront</artifactId>
aws-java-sdk-cloudhsm/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudhsm</artifactId>
aws-java-sdk-cloudhsmv2/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudhsmv2</artifactId>
aws-java-sdk-cloudsearch/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudsearch</artifactId>
aws-java-sdk-cloudtrail/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudtrail</artifactId>
aws-java-sdk-cloudwatchevidently/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudwatchevidently</artifactId>
aws-java-sdk-cloudwatchmetrics/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>
aws-java-sdk-cloudwatch/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudwatch</artifactId>
aws-java-sdk-cloudwatchrum/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cloudwatchrum</artifactId>
aws-java-sdk-codeartifact/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codeartifact</artifactId>
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/AbstractAWSCodeArtifactAsync.java+26 −0 modified@@ -159,6 +159,19 @@ public java.util.concurrent.Future<DescribeDomainResult> describeDomainAsync(Des throw new java.lang.UnsupportedOperationException(); } + @Override + public java.util.concurrent.Future<DescribePackageResult> describePackageAsync(DescribePackageRequest request) { + + return describePackageAsync(request, null); + } + + @Override + public java.util.concurrent.Future<DescribePackageResult> describePackageAsync(DescribePackageRequest request, + com.amazonaws.handlers.AsyncHandler<DescribePackageRequest, DescribePackageResult> asyncHandler) { + + throw new java.lang.UnsupportedOperationException(); + } + @Override public java.util.concurrent.Future<DescribePackageVersionResult> describePackageVersionAsync(DescribePackageVersionRequest request) { @@ -406,6 +419,19 @@ public java.util.concurrent.Future<PutDomainPermissionsPolicyResult> putDomainPe throw new java.lang.UnsupportedOperationException(); } + @Override + public java.util.concurrent.Future<PutPackageOriginConfigurationResult> putPackageOriginConfigurationAsync(PutPackageOriginConfigurationRequest request) { + + return putPackageOriginConfigurationAsync(request, null); + } + + @Override + public java.util.concurrent.Future<PutPackageOriginConfigurationResult> putPackageOriginConfigurationAsync(PutPackageOriginConfigurationRequest request, + com.amazonaws.handlers.AsyncHandler<PutPackageOriginConfigurationRequest, PutPackageOriginConfigurationResult> asyncHandler) { + + throw new java.lang.UnsupportedOperationException(); + } + @Override public java.util.concurrent.Future<PutRepositoryPermissionsPolicyResult> putRepositoryPermissionsPolicyAsync(PutRepositoryPermissionsPolicyRequest request) {
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/AbstractAWSCodeArtifact.java+10 −0 modified@@ -77,6 +77,11 @@ public DescribeDomainResult describeDomain(DescribeDomainRequest request) { throw new java.lang.UnsupportedOperationException(); } + @Override + public DescribePackageResult describePackage(DescribePackageRequest request) { + throw new java.lang.UnsupportedOperationException(); + } + @Override public DescribePackageVersionResult describePackageVersion(DescribePackageVersionRequest request) { throw new java.lang.UnsupportedOperationException(); @@ -172,6 +177,11 @@ public PutDomainPermissionsPolicyResult putDomainPermissionsPolicy(PutDomainPerm throw new java.lang.UnsupportedOperationException(); } + @Override + public PutPackageOriginConfigurationResult putPackageOriginConfiguration(PutPackageOriginConfigurationRequest request) { + throw new java.lang.UnsupportedOperationException(); + } + @Override public PutRepositoryPermissionsPolicyResult putRepositoryPermissionsPolicy(PutRepositoryPermissionsPolicyRequest request) { throw new java.lang.UnsupportedOperationException();
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/AWSCodeArtifactAsyncClient.java+80 −0 modified@@ -185,6 +185,13 @@ * </li> * <li> * <p> + * <code>DescribePackage</code>: Returns a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html" + * >PackageDescription</a> object that contains details about a package. + * </p> + * </li> + * <li> + * <p> * <code>DescribePackageVersion</code>: Returns a <a * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionDescription.html" * >PackageVersionDescription</a> object that contains details about a package version. @@ -306,6 +313,12 @@ * </li> * <li> * <p> + * <code>PutPackageOriginConfiguration</code>: Sets the package origin configuration for a package, which determine how + * new versions of the package can be added to a specific repository. + * </p> + * </li> + * <li> + * <p> * <code>PutRepositoryPermissionsPolicy</code>: Sets the resource policy on a repository that specifies permissions to * access it. * </p> @@ -699,6 +712,39 @@ public DescribeDomainResult call() throws Exception { }); } + @Override + public java.util.concurrent.Future<DescribePackageResult> describePackageAsync(DescribePackageRequest request) { + + return describePackageAsync(request, null); + } + + @Override + public java.util.concurrent.Future<DescribePackageResult> describePackageAsync(final DescribePackageRequest request, + final com.amazonaws.handlers.AsyncHandler<DescribePackageRequest, DescribePackageResult> asyncHandler) { + final DescribePackageRequest finalRequest = beforeClientExecution(request); + + return executorService.submit(new java.util.concurrent.Callable<DescribePackageResult>() { + @Override + public DescribePackageResult call() throws Exception { + DescribePackageResult result = null; + + try { + result = executeDescribePackage(finalRequest); + } catch (Exception ex) { + if (asyncHandler != null) { + asyncHandler.onError(ex); + } + throw ex; + } + + if (asyncHandler != null) { + asyncHandler.onSuccess(finalRequest, result); + } + return result; + } + }); + } + @Override public java.util.concurrent.Future<DescribePackageVersionResult> describePackageVersionAsync(DescribePackageVersionRequest request) { @@ -1329,6 +1375,40 @@ public PutDomainPermissionsPolicyResult call() throws Exception { }); } + @Override + public java.util.concurrent.Future<PutPackageOriginConfigurationResult> putPackageOriginConfigurationAsync(PutPackageOriginConfigurationRequest request) { + + return putPackageOriginConfigurationAsync(request, null); + } + + @Override + public java.util.concurrent.Future<PutPackageOriginConfigurationResult> putPackageOriginConfigurationAsync( + final PutPackageOriginConfigurationRequest request, + final com.amazonaws.handlers.AsyncHandler<PutPackageOriginConfigurationRequest, PutPackageOriginConfigurationResult> asyncHandler) { + final PutPackageOriginConfigurationRequest finalRequest = beforeClientExecution(request); + + return executorService.submit(new java.util.concurrent.Callable<PutPackageOriginConfigurationResult>() { + @Override + public PutPackageOriginConfigurationResult call() throws Exception { + PutPackageOriginConfigurationResult result = null; + + try { + result = executePutPackageOriginConfiguration(finalRequest); + } catch (Exception ex) { + if (asyncHandler != null) { + asyncHandler.onError(ex); + } + throw ex; + } + + if (asyncHandler != null) { + asyncHandler.onSuccess(finalRequest, result); + } + return result; + } + }); + } + @Override public java.util.concurrent.Future<PutRepositoryPermissionsPolicyResult> putRepositoryPermissionsPolicyAsync(PutRepositoryPermissionsPolicyRequest request) {
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/AWSCodeArtifactAsync.java+115 −2 modified@@ -185,6 +185,13 @@ * </li> * <li> * <p> + * <code>DescribePackage</code>: Returns a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html" + * >PackageDescription</a> object that contains details about a package. + * </p> + * </li> + * <li> + * <p> * <code>DescribePackageVersion</code>: Returns a <a * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionDescription.html" * >PackageVersionDescription</a> object that contains details about a package version. @@ -306,6 +313,12 @@ * </li> * <li> * <p> + * <code>PutPackageOriginConfiguration</code>: Sets the package origin configuration for a package, which determine how + * new versions of the package can be added to a specific repository. + * </p> + * </li> + * <li> + * <p> * <code>PutRepositoryPermissionsPolicy</code>: Sets the resource policy on a repository that specifies permissions to * access it. * </p> @@ -713,6 +726,39 @@ java.util.concurrent.Future<DeleteRepositoryPermissionsPolicyResult> deleteRepos java.util.concurrent.Future<DescribeDomainResult> describeDomainAsync(DescribeDomainRequest describeDomainRequest, com.amazonaws.handlers.AsyncHandler<DescribeDomainRequest, DescribeDomainResult> asyncHandler); + /** + * <p> + * Returns a <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + * + * @param describePackageRequest + * @return A Java Future containing the result of the DescribePackage operation returned by the service. + * @sample AWSCodeArtifactAsync.DescribePackage + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/DescribePackage" target="_top">AWS + * API Documentation</a> + */ + java.util.concurrent.Future<DescribePackageResult> describePackageAsync(DescribePackageRequest describePackageRequest); + + /** + * <p> + * Returns a <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + * + * @param describePackageRequest + * @param asyncHandler + * Asynchronous callback handler for events in the lifecycle of the request. Users can provide an + * implementation of the callback methods in this interface to receive notification of successful or + * unsuccessful completion of the operation. + * @return A Java Future containing the result of the DescribePackage operation returned by the service. + * @sample AWSCodeArtifactAsyncHandler.DescribePackage + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/DescribePackage" target="_top">AWS + * API Documentation</a> + */ + java.util.concurrent.Future<DescribePackageResult> describePackageAsync(DescribePackageRequest describePackageRequest, + com.amazonaws.handlers.AsyncHandler<DescribePackageRequest, DescribePackageResult> asyncHandler); + /** * <p> * Returns a <a @@ -1034,7 +1080,9 @@ java.util.concurrent.Future<GetPackageVersionAssetResult> getPackageVersionAsset /** * <p> - * Gets the readme file or descriptive text for a package version. + * Gets the readme file or descriptive text for a package version. For packages that do not contain a readme file, + * CodeArtifact extracts a description from a metadata file. For example, from the <code><description></code> + * element in the <code>pom.xml</code> file of a Maven package. * </p> * <p> * The returned text might contain formatting. For example, it might contain formatting for Markdown or @@ -1051,7 +1099,9 @@ java.util.concurrent.Future<GetPackageVersionAssetResult> getPackageVersionAsset /** * <p> - * Gets the readme file or descriptive text for a package version. + * Gets the readme file or descriptive text for a package version. For packages that do not contain a readme file, + * CodeArtifact extracts a description from a metadata file. For example, from the <code><description></code> + * element in the <code>pom.xml</code> file of a Maven package. * </p> * <p> * The returned text might contain formatting. For example, it might contain formatting for Markdown or @@ -1518,6 +1568,69 @@ java.util.concurrent.Future<PutDomainPermissionsPolicyResult> putDomainPermissio PutDomainPermissionsPolicyRequest putDomainPermissionsPolicyRequest, com.amazonaws.handlers.AsyncHandler<PutDomainPermissionsPolicyRequest, PutDomainPermissionsPolicyResult> asyncHandler); + /** + * <p> + * Sets the package origin configuration for a package. + * </p> + * <p> + * The package origin configuration determines how new versions of a package can be added to a repository. You can + * allow or block direct publishing of new package versions, or ingestion and retaining of new package versions from + * an external connection or upstream source. For more information about package origin controls and configuration, + * see <a href="https://docs.aws.amazon.com/codeartifact/latest/ug/package-origin-controls.html">Editing package + * origin controls</a> in the <i>CodeArtifact User Guide</i>. + * </p> + * <p> + * <code>PutPackageOriginConfiguration</code> can be called on a package that doesn't yet exist in the repository. + * When called on a package that does not exist, a package is created in the repository with no versions and the + * requested restrictions are set on the package. This can be used to preemptively block ingesting or retaining any + * versions from external connections or upstream repositories, or to block publishing any versions of the package + * into the repository before connecting any package managers or publishers to the repository. + * </p> + * + * @param putPackageOriginConfigurationRequest + * @return A Java Future containing the result of the PutPackageOriginConfiguration operation returned by the + * service. + * @sample AWSCodeArtifactAsync.PutPackageOriginConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PutPackageOriginConfiguration" + * target="_top">AWS API Documentation</a> + */ + java.util.concurrent.Future<PutPackageOriginConfigurationResult> putPackageOriginConfigurationAsync( + PutPackageOriginConfigurationRequest putPackageOriginConfigurationRequest); + + /** + * <p> + * Sets the package origin configuration for a package. + * </p> + * <p> + * The package origin configuration determines how new versions of a package can be added to a repository. You can + * allow or block direct publishing of new package versions, or ingestion and retaining of new package versions from + * an external connection or upstream source. For more information about package origin controls and configuration, + * see <a href="https://docs.aws.amazon.com/codeartifact/latest/ug/package-origin-controls.html">Editing package + * origin controls</a> in the <i>CodeArtifact User Guide</i>. + * </p> + * <p> + * <code>PutPackageOriginConfiguration</code> can be called on a package that doesn't yet exist in the repository. + * When called on a package that does not exist, a package is created in the repository with no versions and the + * requested restrictions are set on the package. This can be used to preemptively block ingesting or retaining any + * versions from external connections or upstream repositories, or to block publishing any versions of the package + * into the repository before connecting any package managers or publishers to the repository. + * </p> + * + * @param putPackageOriginConfigurationRequest + * @param asyncHandler + * Asynchronous callback handler for events in the lifecycle of the request. Users can provide an + * implementation of the callback methods in this interface to receive notification of successful or + * unsuccessful completion of the operation. + * @return A Java Future containing the result of the PutPackageOriginConfiguration operation returned by the + * service. + * @sample AWSCodeArtifactAsyncHandler.PutPackageOriginConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PutPackageOriginConfiguration" + * target="_top">AWS API Documentation</a> + */ + java.util.concurrent.Future<PutPackageOriginConfigurationResult> putPackageOriginConfigurationAsync( + PutPackageOriginConfigurationRequest putPackageOriginConfigurationRequest, + com.amazonaws.handlers.AsyncHandler<PutPackageOriginConfigurationRequest, PutPackageOriginConfigurationResult> asyncHandler); + /** * <p> * Sets the resource policy on a repository that specifies permissions to access it.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/AWSCodeArtifactClient.java+163 −1 modified@@ -210,6 +210,13 @@ * </li> * <li> * <p> + * <code>DescribePackage</code>: Returns a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html" + * >PackageDescription</a> object that contains details about a package. + * </p> + * </li> + * <li> + * <p> * <code>DescribePackageVersion</code>: Returns a <a * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionDescription.html" * >PackageVersionDescription</a> object that contains details about a package version. @@ -331,6 +338,12 @@ * </li> * <li> * <p> + * <code>PutPackageOriginConfiguration</code>: Sets the package origin configuration for a package, which determine how + * new versions of the package can be added to a specific repository. + * </p> + * </li> + * <li> + * <p> * <code>PutRepositoryPermissionsPolicy</code>: Sets the resource policy on a repository that specifies permissions to * access it. * </p> @@ -1155,6 +1168,72 @@ final DescribeDomainResult executeDescribeDomain(DescribeDomainRequest describeD } } + /** + * <p> + * Returns a <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + * + * @param describePackageRequest + * @return Result of the DescribePackage operation returned by the service. + * @throws AccessDeniedException + * The operation did not succeed because of an unauthorized access attempt. + * @throws InternalServerException + * The operation did not succeed because of an error that occurred inside CodeArtifact. + * @throws ResourceNotFoundException + * The operation did not succeed because the resource requested is not found in the service. + * @throws ThrottlingException + * The operation did not succeed because too many requests are sent to the service. + * @throws ValidationException + * The operation did not succeed because a parameter in the request was sent with an invalid value. + * @sample AWSCodeArtifact.DescribePackage + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/DescribePackage" target="_top">AWS + * API Documentation</a> + */ + @Override + public DescribePackageResult describePackage(DescribePackageRequest request) { + request = beforeClientExecution(request); + return executeDescribePackage(request); + } + + @SdkInternalApi + final DescribePackageResult executeDescribePackage(DescribePackageRequest describePackageRequest) { + + ExecutionContext executionContext = createExecutionContext(describePackageRequest); + AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics(); + awsRequestMetrics.startEvent(Field.ClientExecuteTime); + Request<DescribePackageRequest> request = null; + Response<DescribePackageResult> response = null; + + try { + awsRequestMetrics.startEvent(Field.RequestMarshallTime); + try { + request = new DescribePackageRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(describePackageRequest)); + // Binds the request metrics to the current request. + request.setAWSRequestMetrics(awsRequestMetrics); + request.addHandlerContext(HandlerContextKey.CLIENT_ENDPOINT, endpoint); + request.addHandlerContext(HandlerContextKey.ENDPOINT_OVERRIDDEN, isEndpointOverridden()); + request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion()); + request.addHandlerContext(HandlerContextKey.SERVICE_ID, "codeartifact"); + request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DescribePackage"); + request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig); + + } finally { + awsRequestMetrics.endEvent(Field.RequestMarshallTime); + } + + HttpResponseHandler<AmazonWebServiceResponse<DescribePackageResult>> responseHandler = protocolFactory.createResponseHandler( + new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new DescribePackageResultJsonUnmarshaller()); + response = invoke(request, responseHandler, executionContext); + + return response.getAwsResponse(); + + } finally { + + endClientExecution(awsRequestMetrics, request, response); + } + } + /** * <p> * Returns a <a @@ -1680,7 +1759,9 @@ final GetPackageVersionAssetResult executeGetPackageVersionAsset(GetPackageVersi /** * <p> - * Gets the readme file or descriptive text for a package version. + * Gets the readme file or descriptive text for a package version. For packages that do not contain a readme file, + * CodeArtifact extracts a description from a metadata file. For example, from the <code><description></code> + * element in the <code>pom.xml</code> file of a Maven package. * </p> * <p> * The returned text might contain formatting. For example, it might contain formatting for Markdown or @@ -2521,6 +2602,87 @@ final PutDomainPermissionsPolicyResult executePutDomainPermissionsPolicy(PutDoma } } + /** + * <p> + * Sets the package origin configuration for a package. + * </p> + * <p> + * The package origin configuration determines how new versions of a package can be added to a repository. You can + * allow or block direct publishing of new package versions, or ingestion and retaining of new package versions from + * an external connection or upstream source. For more information about package origin controls and configuration, + * see <a href="https://docs.aws.amazon.com/codeartifact/latest/ug/package-origin-controls.html">Editing package + * origin controls</a> in the <i>CodeArtifact User Guide</i>. + * </p> + * <p> + * <code>PutPackageOriginConfiguration</code> can be called on a package that doesn't yet exist in the repository. + * When called on a package that does not exist, a package is created in the repository with no versions and the + * requested restrictions are set on the package. This can be used to preemptively block ingesting or retaining any + * versions from external connections or upstream repositories, or to block publishing any versions of the package + * into the repository before connecting any package managers or publishers to the repository. + * </p> + * + * @param putPackageOriginConfigurationRequest + * @return Result of the PutPackageOriginConfiguration operation returned by the service. + * @throws AccessDeniedException + * The operation did not succeed because of an unauthorized access attempt. + * @throws InternalServerException + * The operation did not succeed because of an error that occurred inside CodeArtifact. + * @throws ResourceNotFoundException + * The operation did not succeed because the resource requested is not found in the service. + * @throws ThrottlingException + * The operation did not succeed because too many requests are sent to the service. + * @throws ValidationException + * The operation did not succeed because a parameter in the request was sent with an invalid value. + * @sample AWSCodeArtifact.PutPackageOriginConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PutPackageOriginConfiguration" + * target="_top">AWS API Documentation</a> + */ + @Override + public PutPackageOriginConfigurationResult putPackageOriginConfiguration(PutPackageOriginConfigurationRequest request) { + request = beforeClientExecution(request); + return executePutPackageOriginConfiguration(request); + } + + @SdkInternalApi + final PutPackageOriginConfigurationResult executePutPackageOriginConfiguration(PutPackageOriginConfigurationRequest putPackageOriginConfigurationRequest) { + + ExecutionContext executionContext = createExecutionContext(putPackageOriginConfigurationRequest); + AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics(); + awsRequestMetrics.startEvent(Field.ClientExecuteTime); + Request<PutPackageOriginConfigurationRequest> request = null; + Response<PutPackageOriginConfigurationResult> response = null; + + try { + awsRequestMetrics.startEvent(Field.RequestMarshallTime); + try { + request = new PutPackageOriginConfigurationRequestProtocolMarshaller(protocolFactory).marshall(super + .beforeMarshalling(putPackageOriginConfigurationRequest)); + // Binds the request metrics to the current request. + request.setAWSRequestMetrics(awsRequestMetrics); + request.addHandlerContext(HandlerContextKey.CLIENT_ENDPOINT, endpoint); + request.addHandlerContext(HandlerContextKey.ENDPOINT_OVERRIDDEN, isEndpointOverridden()); + request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion()); + request.addHandlerContext(HandlerContextKey.SERVICE_ID, "codeartifact"); + request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "PutPackageOriginConfiguration"); + request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig); + + } finally { + awsRequestMetrics.endEvent(Field.RequestMarshallTime); + } + + HttpResponseHandler<AmazonWebServiceResponse<PutPackageOriginConfigurationResult>> responseHandler = protocolFactory.createResponseHandler( + new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), + new PutPackageOriginConfigurationResultJsonUnmarshaller()); + response = invoke(request, responseHandler, executionContext); + + return response.getAwsResponse(); + + } finally { + + endClientExecution(awsRequestMetrics, request, response); + } + } + /** * <p> * Sets the resource policy on a repository that specifies permissions to access it.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/AWSCodeArtifact.java+77 −1 modified@@ -186,6 +186,13 @@ * </li> * <li> * <p> + * <code>DescribePackage</code>: Returns a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html" + * >PackageDescription</a> object that contains details about a package. + * </p> + * </li> + * <li> + * <p> * <code>DescribePackageVersion</code>: Returns a <a * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionDescription.html" * >PackageVersionDescription</a> object that contains details about a package version. @@ -307,6 +314,12 @@ * </li> * <li> * <p> + * <code>PutPackageOriginConfiguration</code>: Sets the package origin configuration for a package, which determine how + * new versions of the package can be added to a specific repository. + * </p> + * </li> + * <li> + * <p> * <code>PutRepositoryPermissionsPolicy</code>: Sets the resource policy on a repository that specifies permissions to * access it. * </p> @@ -622,6 +635,30 @@ public interface AWSCodeArtifact { */ DescribeDomainResult describeDomain(DescribeDomainRequest describeDomainRequest); + /** + * <p> + * Returns a <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + * + * @param describePackageRequest + * @return Result of the DescribePackage operation returned by the service. + * @throws AccessDeniedException + * The operation did not succeed because of an unauthorized access attempt. + * @throws InternalServerException + * The operation did not succeed because of an error that occurred inside CodeArtifact. + * @throws ResourceNotFoundException + * The operation did not succeed because the resource requested is not found in the service. + * @throws ThrottlingException + * The operation did not succeed because too many requests are sent to the service. + * @throws ValidationException + * The operation did not succeed because a parameter in the request was sent with an invalid value. + * @sample AWSCodeArtifact.DescribePackage + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/DescribePackage" target="_top">AWS + * API Documentation</a> + */ + DescribePackageResult describePackage(DescribePackageRequest describePackageRequest); + /** * <p> * Returns a <a @@ -843,7 +880,9 @@ public interface AWSCodeArtifact { /** * <p> - * Gets the readme file or descriptive text for a package version. + * Gets the readme file or descriptive text for a package version. For packages that do not contain a readme file, + * CodeArtifact extracts a description from a metadata file. For example, from the <code><description></code> + * element in the <code>pom.xml</code> file of a Maven package. * </p> * <p> * The returned text might contain formatting. For example, it might contain formatting for Markdown or @@ -1167,6 +1206,43 @@ public interface AWSCodeArtifact { */ PutDomainPermissionsPolicyResult putDomainPermissionsPolicy(PutDomainPermissionsPolicyRequest putDomainPermissionsPolicyRequest); + /** + * <p> + * Sets the package origin configuration for a package. + * </p> + * <p> + * The package origin configuration determines how new versions of a package can be added to a repository. You can + * allow or block direct publishing of new package versions, or ingestion and retaining of new package versions from + * an external connection or upstream source. For more information about package origin controls and configuration, + * see <a href="https://docs.aws.amazon.com/codeartifact/latest/ug/package-origin-controls.html">Editing package + * origin controls</a> in the <i>CodeArtifact User Guide</i>. + * </p> + * <p> + * <code>PutPackageOriginConfiguration</code> can be called on a package that doesn't yet exist in the repository. + * When called on a package that does not exist, a package is created in the repository with no versions and the + * requested restrictions are set on the package. This can be used to preemptively block ingesting or retaining any + * versions from external connections or upstream repositories, or to block publishing any versions of the package + * into the repository before connecting any package managers or publishers to the repository. + * </p> + * + * @param putPackageOriginConfigurationRequest + * @return Result of the PutPackageOriginConfiguration operation returned by the service. + * @throws AccessDeniedException + * The operation did not succeed because of an unauthorized access attempt. + * @throws InternalServerException + * The operation did not succeed because of an error that occurred inside CodeArtifact. + * @throws ResourceNotFoundException + * The operation did not succeed because the resource requested is not found in the service. + * @throws ThrottlingException + * The operation did not succeed because too many requests are sent to the service. + * @throws ValidationException + * The operation did not succeed because a parameter in the request was sent with an invalid value. + * @sample AWSCodeArtifact.PutPackageOriginConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PutPackageOriginConfiguration" + * target="_top">AWS API Documentation</a> + */ + PutPackageOriginConfigurationResult putPackageOriginConfiguration(PutPackageOriginConfigurationRequest putPackageOriginConfigurationRequest); + /** * <p> * Sets the resource policy on a repository that specifies permissions to access it.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/AllowPublish.java+60 −0 added@@ -0,0 +1,60 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import javax.annotation.Generated; + +/** + * + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public enum AllowPublish { + + ALLOW("ALLOW"), + BLOCK("BLOCK"); + + private String value; + + private AllowPublish(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.value; + } + + /** + * Use this in place of valueOf. + * + * @param value + * real value + * @return AllowPublish corresponding to the value + * + * @throws IllegalArgumentException + * If the specified value does not map to one of the known values in this enum. + */ + public static AllowPublish fromValue(String value) { + if (value == null || "".equals(value)) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } + + for (AllowPublish enumEntry : AllowPublish.values()) { + if (enumEntry.toString().equals(value)) { + return enumEntry; + } + } + + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/AllowUpstream.java+60 −0 added@@ -0,0 +1,60 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import javax.annotation.Generated; + +/** + * + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public enum AllowUpstream { + + ALLOW("ALLOW"), + BLOCK("BLOCK"); + + private String value; + + private AllowUpstream(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.value; + } + + /** + * Use this in place of valueOf. + * + * @param value + * real value + * @return AllowUpstream corresponding to the value + * + * @throws IllegalArgumentException + * If the specified value does not map to one of the known values in this enum. + */ + public static AllowUpstream fromValue(String value) { + if (value == null || "".equals(value)) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } + + for (AllowUpstream enumEntry : AllowUpstream.values()) { + if (enumEntry.toString().equals(value)) { + return enumEntry; + } + } + + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/AssociateExternalConnectionRequest.java+0 −35 modified@@ -56,11 +56,6 @@ public class AssociateExternalConnectionRequest extends com.amazonaws.AmazonWebS * </li> * <li> * <p> - * <code>public:nuget-org</code> - for the NuGet Gallery. - * </p> - * </li> - * <li> - * <p> * <code>public:pypi</code> - for the Python Package Index. * </p> * </li> @@ -226,11 +221,6 @@ public AssociateExternalConnectionRequest withRepository(String repository) { * </li> * <li> * <p> - * <code>public:nuget-org</code> - for the NuGet Gallery. - * </p> - * </li> - * <li> - * <p> * <code>public:pypi</code> - for the Python Package Index. * </p> * </li> @@ -266,11 +256,6 @@ public AssociateExternalConnectionRequest withRepository(String repository) { * </li> * <li> * <p> - * <code>public:nuget-org</code> - for the NuGet Gallery. - * </p> - * </li> - * <li> - * <p> * <code>public:pypi</code> - for the Python Package Index. * </p> * </li> @@ -312,11 +297,6 @@ public void setExternalConnection(String externalConnection) { * </li> * <li> * <p> - * <code>public:nuget-org</code> - for the NuGet Gallery. - * </p> - * </li> - * <li> - * <p> * <code>public:pypi</code> - for the Python Package Index. * </p> * </li> @@ -351,11 +331,6 @@ public void setExternalConnection(String externalConnection) { * </li> * <li> * <p> - * <code>public:nuget-org</code> - for the NuGet Gallery. - * </p> - * </li> - * <li> - * <p> * <code>public:pypi</code> - for the Python Package Index. * </p> * </li> @@ -397,11 +372,6 @@ public String getExternalConnection() { * </li> * <li> * <p> - * <code>public:nuget-org</code> - for the NuGet Gallery. - * </p> - * </li> - * <li> - * <p> * <code>public:pypi</code> - for the Python Package Index. * </p> * </li> @@ -437,11 +407,6 @@ public String getExternalConnection() { * </li> * <li> * <p> - * <code>public:nuget-org</code> - for the NuGet Gallery. - * </p> - * </li> - * <li> - * <p> * <code>public:pypi</code> - for the Python Package Index. * </p> * </li>
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/CopyPackageVersionsRequest.java+81 −67 modified@@ -40,7 +40,7 @@ public class CopyPackageVersionsRequest extends com.amazonaws.AmazonWebServiceRe private String domainOwner; /** * <p> - * The name of the repository that contains the package versions to copy. + * The name of the repository that contains the package versions to be copied. * </p> */ private String sourceRepository; @@ -52,43 +52,45 @@ public class CopyPackageVersionsRequest extends com.amazonaws.AmazonWebServiceRe private String destinationRepository; /** * <p> - * The format of the package that is copied. + * The format of the package versions to be copied. * </p> */ private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be copied. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when copying + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> */ private String namespace; /** * <p> - * The name of the package that is copied. + * The name of the package that contains the versions to be copied. * </p> */ private String packageValue; /** * <p> - * The versions of the package to copy. + * The versions of the package to be copied. * </p> * <note> * <p> @@ -216,11 +218,11 @@ public CopyPackageVersionsRequest withDomainOwner(String domainOwner) { /** * <p> - * The name of the repository that contains the package versions to copy. + * The name of the repository that contains the package versions to be copied. * </p> * * @param sourceRepository - * The name of the repository that contains the package versions to copy. + * The name of the repository that contains the package versions to be copied. */ public void setSourceRepository(String sourceRepository) { @@ -229,10 +231,10 @@ public void setSourceRepository(String sourceRepository) { /** * <p> - * The name of the repository that contains the package versions to copy. + * The name of the repository that contains the package versions to be copied. * </p> * - * @return The name of the repository that contains the package versions to copy. + * @return The name of the repository that contains the package versions to be copied. */ public String getSourceRepository() { @@ -241,11 +243,11 @@ public String getSourceRepository() { /** * <p> - * The name of the repository that contains the package versions to copy. + * The name of the repository that contains the package versions to be copied. * </p> * * @param sourceRepository - * The name of the repository that contains the package versions to copy. + * The name of the repository that contains the package versions to be copied. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -296,11 +298,11 @@ public CopyPackageVersionsRequest withDestinationRepository(String destinationRe /** * <p> - * The format of the package that is copied. + * The format of the package versions to be copied. * </p> * * @param format - * The format of the package that is copied. + * The format of the package versions to be copied. * @see PackageFormat */ @@ -310,10 +312,10 @@ public void setFormat(String format) { /** * <p> - * The format of the package that is copied. + * The format of the package versions to be copied. * </p> * - * @return The format of the package that is copied. + * @return The format of the package versions to be copied. * @see PackageFormat */ @@ -323,11 +325,11 @@ public String getFormat() { /** * <p> - * The format of the package that is copied. + * The format of the package versions to be copied. * </p> * * @param format - * The format of the package that is copied. + * The format of the package versions to be copied. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -339,11 +341,11 @@ public CopyPackageVersionsRequest withFormat(String format) { /** * <p> - * The format of the package that is copied. + * The format of the package versions to be copied. * </p> * * @param format - * The format of the package that is copied. + * The format of the package versions to be copied. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -355,44 +357,48 @@ public CopyPackageVersionsRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be copied. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when copying + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package versions to be copied. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when + * copying Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -403,43 +409,47 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be copied. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when copying + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package versions to be copied. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when + * copying Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -450,44 +460,48 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be copied. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when copying + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package versions to be copied. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when + * copying Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -500,11 +514,11 @@ public CopyPackageVersionsRequest withNamespace(String namespace) { /** * <p> - * The name of the package that is copied. + * The name of the package that contains the versions to be copied. * </p> * * @param packageValue - * The name of the package that is copied. + * The name of the package that contains the versions to be copied. */ public void setPackage(String packageValue) { @@ -513,10 +527,10 @@ public void setPackage(String packageValue) { /** * <p> - * The name of the package that is copied. + * The name of the package that contains the versions to be copied. * </p> * - * @return The name of the package that is copied. + * @return The name of the package that contains the versions to be copied. */ public String getPackage() { @@ -525,11 +539,11 @@ public String getPackage() { /** * <p> - * The name of the package that is copied. + * The name of the package that contains the versions to be copied. * </p> * * @param packageValue - * The name of the package that is copied. + * The name of the package that contains the versions to be copied. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -540,15 +554,15 @@ public CopyPackageVersionsRequest withPackage(String packageValue) { /** * <p> - * The versions of the package to copy. + * The versions of the package to be copied. * </p> * <note> * <p> * You must specify <code>versions</code> or <code>versionRevisions</code>. You cannot specify both. * </p> * </note> * - * @return The versions of the package to copy. </p> <note> + * @return The versions of the package to be copied. </p> <note> * <p> * You must specify <code>versions</code> or <code>versionRevisions</code>. You cannot specify both. * </p> @@ -560,7 +574,7 @@ public java.util.List<String> getVersions() { /** * <p> - * The versions of the package to copy. + * The versions of the package to be copied. * </p> * <note> * <p> @@ -569,7 +583,7 @@ public java.util.List<String> getVersions() { * </note> * * @param versions - * The versions of the package to copy. </p> <note> + * The versions of the package to be copied. </p> <note> * <p> * You must specify <code>versions</code> or <code>versionRevisions</code>. You cannot specify both. * </p> @@ -586,7 +600,7 @@ public void setVersions(java.util.Collection<String> versions) { /** * <p> - * The versions of the package to copy. + * The versions of the package to be copied. * </p> * <note> * <p> @@ -600,7 +614,7 @@ public void setVersions(java.util.Collection<String> versions) { * </p> * * @param versions - * The versions of the package to copy. </p> <note> + * The versions of the package to be copied. </p> <note> * <p> * You must specify <code>versions</code> or <code>versionRevisions</code>. You cannot specify both. * </p> @@ -619,7 +633,7 @@ public CopyPackageVersionsRequest withVersions(String... versions) { /** * <p> - * The versions of the package to copy. + * The versions of the package to be copied. * </p> * <note> * <p> @@ -628,7 +642,7 @@ public CopyPackageVersionsRequest withVersions(String... versions) { * </note> * * @param versions - * The versions of the package to copy. </p> <note> + * The versions of the package to be copied. </p> <note> * <p> * You must specify <code>versions</code> or <code>versionRevisions</code>. You cannot specify both. * </p>
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/DeletePackageVersionsRequest.java+49 −35 modified@@ -52,23 +52,25 @@ public class DeletePackageVersionsRequest extends com.amazonaws.AmazonWebService private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be deleted. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when deleting + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -280,44 +282,48 @@ public DeletePackageVersionsRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be deleted. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when deleting + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package versions to be deleted. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when + * deleting Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -328,43 +334,47 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be deleted. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when deleting + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package versions to be deleted. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when + * deleting Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -375,44 +385,48 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be deleted. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when deleting + * Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package versions to be deleted. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. The namespace is required when + * deleting Maven package versions. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/DescribePackageRequest.java+552 −0 added@@ -0,0 +1,552 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +import com.amazonaws.AmazonWebServiceRequest; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/DescribePackage" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class DescribePackageRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable { + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + */ + private String domain; + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + */ + private String domainOwner; + /** + * <p> + * The name of the repository that contains the requested package. + * </p> + */ + private String repository; + /** + * <p> + * A format that specifies the type of the requested package. + * </p> + */ + private String format; + /** + * <p> + * The namespace of the requested package. The package component that specifies its namespace depends on its type. + * For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. The namespace is required when requesting Maven + * packages. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + */ + private String namespace; + /** + * <p> + * The name of the requested package. + * </p> + */ + private String packageValue; + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + * + * @param domain + * The name of the domain that contains the repository that contains the package. + */ + + public void setDomain(String domain) { + this.domain = domain; + } + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + * + * @return The name of the domain that contains the repository that contains the package. + */ + + public String getDomain() { + return this.domain; + } + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + * + * @param domain + * The name of the domain that contains the repository that contains the package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DescribePackageRequest withDomain(String domain) { + setDomain(domain); + return this; + } + + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + * + * @param domainOwner + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include + * dashes or spaces. + */ + + public void setDomainOwner(String domainOwner) { + this.domainOwner = domainOwner; + } + + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + * + * @return The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include + * dashes or spaces. + */ + + public String getDomainOwner() { + return this.domainOwner; + } + + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + * + * @param domainOwner + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include + * dashes or spaces. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DescribePackageRequest withDomainOwner(String domainOwner) { + setDomainOwner(domainOwner); + return this; + } + + /** + * <p> + * The name of the repository that contains the requested package. + * </p> + * + * @param repository + * The name of the repository that contains the requested package. + */ + + public void setRepository(String repository) { + this.repository = repository; + } + + /** + * <p> + * The name of the repository that contains the requested package. + * </p> + * + * @return The name of the repository that contains the requested package. + */ + + public String getRepository() { + return this.repository; + } + + /** + * <p> + * The name of the repository that contains the requested package. + * </p> + * + * @param repository + * The name of the repository that contains the requested package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DescribePackageRequest withRepository(String repository) { + setRepository(repository); + return this; + } + + /** + * <p> + * A format that specifies the type of the requested package. + * </p> + * + * @param format + * A format that specifies the type of the requested package. + * @see PackageFormat + */ + + public void setFormat(String format) { + this.format = format; + } + + /** + * <p> + * A format that specifies the type of the requested package. + * </p> + * + * @return A format that specifies the type of the requested package. + * @see PackageFormat + */ + + public String getFormat() { + return this.format; + } + + /** + * <p> + * A format that specifies the type of the requested package. + * </p> + * + * @param format + * A format that specifies the type of the requested package. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageFormat + */ + + public DescribePackageRequest withFormat(String format) { + setFormat(format); + return this; + } + + /** + * <p> + * A format that specifies the type of the requested package. + * </p> + * + * @param format + * A format that specifies the type of the requested package. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageFormat + */ + + public DescribePackageRequest withFormat(PackageFormat format) { + this.format = format.toString(); + return this; + } + + /** + * <p> + * The namespace of the requested package. The package component that specifies its namespace depends on its type. + * For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. The namespace is required when requesting Maven + * packages. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @param namespace + * The namespace of the requested package. The package component that specifies its namespace depends on its + * type. For example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. The namespace is required when requesting + * Maven packages. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + */ + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + /** + * <p> + * The namespace of the requested package. The package component that specifies its namespace depends on its type. + * For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. The namespace is required when requesting Maven + * packages. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @return The namespace of the requested package. The package component that specifies its namespace depends on its + * type. For example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. The namespace is required when requesting + * Maven packages. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + */ + + public String getNamespace() { + return this.namespace; + } + + /** + * <p> + * The namespace of the requested package. The package component that specifies its namespace depends on its type. + * For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. The namespace is required when requesting Maven + * packages. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @param namespace + * The namespace of the requested package. The package component that specifies its namespace depends on its + * type. For example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. The namespace is required when requesting + * Maven packages. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DescribePackageRequest withNamespace(String namespace) { + setNamespace(namespace); + return this; + } + + /** + * <p> + * The name of the requested package. + * </p> + * + * @param packageValue + * The name of the requested package. + */ + + public void setPackage(String packageValue) { + this.packageValue = packageValue; + } + + /** + * <p> + * The name of the requested package. + * </p> + * + * @return The name of the requested package. + */ + + public String getPackage() { + return this.packageValue; + } + + /** + * <p> + * The name of the requested package. + * </p> + * + * @param packageValue + * The name of the requested package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DescribePackageRequest withPackage(String packageValue) { + setPackage(packageValue); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getDomain() != null) + sb.append("Domain: ").append(getDomain()).append(","); + if (getDomainOwner() != null) + sb.append("DomainOwner: ").append(getDomainOwner()).append(","); + if (getRepository() != null) + sb.append("Repository: ").append(getRepository()).append(","); + if (getFormat() != null) + sb.append("Format: ").append(getFormat()).append(","); + if (getNamespace() != null) + sb.append("Namespace: ").append(getNamespace()).append(","); + if (getPackage() != null) + sb.append("Package: ").append(getPackage()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof DescribePackageRequest == false) + return false; + DescribePackageRequest other = (DescribePackageRequest) obj; + if (other.getDomain() == null ^ this.getDomain() == null) + return false; + if (other.getDomain() != null && other.getDomain().equals(this.getDomain()) == false) + return false; + if (other.getDomainOwner() == null ^ this.getDomainOwner() == null) + return false; + if (other.getDomainOwner() != null && other.getDomainOwner().equals(this.getDomainOwner()) == false) + return false; + if (other.getRepository() == null ^ this.getRepository() == null) + return false; + if (other.getRepository() != null && other.getRepository().equals(this.getRepository()) == false) + return false; + if (other.getFormat() == null ^ this.getFormat() == null) + return false; + if (other.getFormat() != null && other.getFormat().equals(this.getFormat()) == false) + return false; + if (other.getNamespace() == null ^ this.getNamespace() == null) + return false; + if (other.getNamespace() != null && other.getNamespace().equals(this.getNamespace()) == false) + return false; + if (other.getPackage() == null ^ this.getPackage() == null) + return false; + if (other.getPackage() != null && other.getPackage().equals(this.getPackage()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getDomain() == null) ? 0 : getDomain().hashCode()); + hashCode = prime * hashCode + ((getDomainOwner() == null) ? 0 : getDomainOwner().hashCode()); + hashCode = prime * hashCode + ((getRepository() == null) ? 0 : getRepository().hashCode()); + hashCode = prime * hashCode + ((getFormat() == null) ? 0 : getFormat().hashCode()); + hashCode = prime * hashCode + ((getNamespace() == null) ? 0 : getNamespace().hashCode()); + hashCode = prime * hashCode + ((getPackage() == null) ? 0 : getPackage().hashCode()); + return hashCode; + } + + @Override + public DescribePackageRequest clone() { + return (DescribePackageRequest) super.clone(); + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/DescribePackageResult.java+133 −0 added@@ -0,0 +1,133 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/DescribePackage" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class DescribePackageResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable { + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + */ + private PackageDescription packageValue; + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + * + * @param packageValue + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + */ + + public void setPackage(PackageDescription packageValue) { + this.packageValue = packageValue; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + * + * @return A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + */ + + public PackageDescription getPackage() { + return this.packageValue; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * </p> + * + * @param packageValue + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html"> + * PackageDescription</a> object that contains information about the requested package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DescribePackageResult withPackage(PackageDescription packageValue) { + setPackage(packageValue); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getPackage() != null) + sb.append("Package: ").append(getPackage()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof DescribePackageResult == false) + return false; + DescribePackageResult other = (DescribePackageResult) obj; + if (other.getPackage() == null ^ this.getPackage() == null) + return false; + if (other.getPackage() != null && other.getPackage().equals(this.getPackage()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getPackage() == null) ? 0 : getPackage().hashCode()); + return hashCode; + } + + @Override + public DescribePackageResult clone() { + try { + return (DescribePackageResult) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/DescribePackageVersionRequest.java+42 −35 modified@@ -52,23 +52,24 @@ public class DescribePackageVersionRequest extends com.amazonaws.AmazonWebServic private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the requested package version. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -274,44 +275,46 @@ public DescribePackageVersionRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the requested package version. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the requested package version. The package version component that specifies its namespace + * depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -322,43 +325,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the requested package version. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the requested package version. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -369,44 +374,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the requested package version. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the requested package version. The package version component that specifies its namespace + * depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/DisposePackageVersionsRequest.java+42 −35 modified@@ -52,23 +52,24 @@ public class DisposePackageVersionsRequest extends com.amazonaws.AmazonWebServic private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be disposed. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -286,44 +287,46 @@ public DisposePackageVersionsRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be disposed. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package versions to be disposed. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -334,43 +337,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be disposed. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package versions to be disposed. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -381,44 +386,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package versions to be disposed. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package versions to be disposed. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/DomainEntryPoint.java+192 −0 added@@ -0,0 +1,192 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Information about how a package originally entered the CodeArtifact domain. For packages published directly to + * CodeArtifact, the entry point is the repository it was published to. For packages ingested from an external + * repository, the entry point is the external connection that it was ingested from. An external connection is a + * CodeArtifact repository that is connected to an external repository such as the npm registry or NuGet gallery. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/DomainEntryPoint" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class DomainEntryPoint implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * The name of the repository that a package was originally published to. + * </p> + */ + private String repositoryName; + /** + * <p> + * The name of the external connection that a package was ingested from. + * </p> + */ + private String externalConnectionName; + + /** + * <p> + * The name of the repository that a package was originally published to. + * </p> + * + * @param repositoryName + * The name of the repository that a package was originally published to. + */ + + public void setRepositoryName(String repositoryName) { + this.repositoryName = repositoryName; + } + + /** + * <p> + * The name of the repository that a package was originally published to. + * </p> + * + * @return The name of the repository that a package was originally published to. + */ + + public String getRepositoryName() { + return this.repositoryName; + } + + /** + * <p> + * The name of the repository that a package was originally published to. + * </p> + * + * @param repositoryName + * The name of the repository that a package was originally published to. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DomainEntryPoint withRepositoryName(String repositoryName) { + setRepositoryName(repositoryName); + return this; + } + + /** + * <p> + * The name of the external connection that a package was ingested from. + * </p> + * + * @param externalConnectionName + * The name of the external connection that a package was ingested from. + */ + + public void setExternalConnectionName(String externalConnectionName) { + this.externalConnectionName = externalConnectionName; + } + + /** + * <p> + * The name of the external connection that a package was ingested from. + * </p> + * + * @return The name of the external connection that a package was ingested from. + */ + + public String getExternalConnectionName() { + return this.externalConnectionName; + } + + /** + * <p> + * The name of the external connection that a package was ingested from. + * </p> + * + * @param externalConnectionName + * The name of the external connection that a package was ingested from. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public DomainEntryPoint withExternalConnectionName(String externalConnectionName) { + setExternalConnectionName(externalConnectionName); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getRepositoryName() != null) + sb.append("RepositoryName: ").append(getRepositoryName()).append(","); + if (getExternalConnectionName() != null) + sb.append("ExternalConnectionName: ").append(getExternalConnectionName()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof DomainEntryPoint == false) + return false; + DomainEntryPoint other = (DomainEntryPoint) obj; + if (other.getRepositoryName() == null ^ this.getRepositoryName() == null) + return false; + if (other.getRepositoryName() != null && other.getRepositoryName().equals(this.getRepositoryName()) == false) + return false; + if (other.getExternalConnectionName() == null ^ this.getExternalConnectionName() == null) + return false; + if (other.getExternalConnectionName() != null && other.getExternalConnectionName().equals(this.getExternalConnectionName()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getRepositoryName() == null) ? 0 : getRepositoryName().hashCode()); + hashCode = prime * hashCode + ((getExternalConnectionName() == null) ? 0 : getExternalConnectionName().hashCode()); + return hashCode; + } + + @Override + public DomainEntryPoint clone() { + try { + return (DomainEntryPoint) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.codeartifact.model.transform.DomainEntryPointMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/GetPackageVersionAssetRequest.java+42 −35 modified@@ -52,23 +52,24 @@ public class GetPackageVersionAssetRequest extends com.amazonaws.AmazonWebServic private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested asset file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -289,44 +290,46 @@ public GetPackageVersionAssetRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested asset file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested asset file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -337,43 +340,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested asset file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version with the requested asset file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -384,44 +389,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested asset file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested asset file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/GetPackageVersionReadmeRequest.java+46 −85 modified@@ -49,33 +49,28 @@ public class GetPackageVersionReadmeRequest extends com.amazonaws.AmazonWebServi * <p> * A format that specifies the type of the package version with the requested readme file. * </p> - * <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme files for - * Maven packages. - * </p> - * </note> */ private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -230,19 +225,9 @@ public GetPackageVersionReadmeRequest withRepository(String repository) { * <p> * A format that specifies the type of the package version with the requested readme file. * </p> - * <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme files for - * Maven packages. - * </p> - * </note> * * @param format - * A format that specifies the type of the package version with the requested readme file. </p> <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme - * files for Maven packages. - * </p> + * A format that specifies the type of the package version with the requested readme file. * @see PackageFormat */ @@ -254,18 +239,8 @@ public void setFormat(String format) { * <p> * A format that specifies the type of the package version with the requested readme file. * </p> - * <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme files for - * Maven packages. - * </p> - * </note> * - * @return A format that specifies the type of the package version with the requested readme file. </p> <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme - * files for Maven packages. - * </p> + * @return A format that specifies the type of the package version with the requested readme file. * @see PackageFormat */ @@ -277,19 +252,9 @@ public String getFormat() { * <p> * A format that specifies the type of the package version with the requested readme file. * </p> - * <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme files for - * Maven packages. - * </p> - * </note> * * @param format - * A format that specifies the type of the package version with the requested readme file. </p> <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme - * files for Maven packages. - * </p> + * A format that specifies the type of the package version with the requested readme file. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -303,19 +268,9 @@ public GetPackageVersionReadmeRequest withFormat(String format) { * <p> * A format that specifies the type of the package version with the requested readme file. * </p> - * <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme files for - * Maven packages. - * </p> - * </note> * * @param format - * A format that specifies the type of the package version with the requested readme file. </p> <note> - * <p> - * Although <code>maven</code> is listed as a valid value, CodeArtifact does not support displaying readme - * files for Maven packages. - * </p> + * A format that specifies the type of the package version with the requested readme file. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -327,44 +282,46 @@ public GetPackageVersionReadmeRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested readme file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -375,43 +332,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version with the requested readme file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -422,44 +381,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested readme file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/GetPackageVersionReadmeResult.java+42 −35 modified@@ -31,23 +31,24 @@ public class GetPackageVersionReadmeResult extends com.amazonaws.AmazonWebServic private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -139,44 +140,46 @@ public GetPackageVersionReadmeResult withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested readme file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -187,43 +190,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version with the requested readme file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -234,44 +239,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested readme file. The package version component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested readme file. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/ListPackagesRequest.java+257 −52 modified@@ -27,7 +27,7 @@ public class ListPackagesRequest extends com.amazonaws.AmazonWebServiceRequest i /** * <p> - * The name of the domain that contains the repository that contains the requested list of packages. + * The name of the domain that contains the repository that contains the requested packages. * </p> */ private String domain; @@ -40,20 +40,20 @@ public class ListPackagesRequest extends com.amazonaws.AmazonWebServiceRequest i private String domainOwner; /** * <p> - * The name of the repository from which packages are to be listed. + * The name of the repository that contains the requested packages. * </p> */ private String repository; /** * <p> - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * </p> */ private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace used to filter requested packages. Only packages with the provided namespace will be returned. The + * package component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -68,15 +68,16 @@ public class ListPackagesRequest extends com.amazonaws.AmazonWebServiceRequest i * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> */ private String namespace; /** * <p> - * A prefix used to filter returned packages. Only packages with names that start with <code>packagePrefix</code> + * A prefix used to filter requested packages. Only packages with names that start with <code>packagePrefix</code> * are returned. * </p> */ @@ -94,14 +95,32 @@ public class ListPackagesRequest extends com.amazonaws.AmazonWebServiceRequest i * </p> */ private String nextToken; + /** + * <p> + * The value of the <code>Publish</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + */ + private String publish; + /** + * <p> + * The value of the <code>Upstream</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + */ + private String upstream; /** * <p> - * The name of the domain that contains the repository that contains the requested list of packages. + * The name of the domain that contains the repository that contains the requested packages. * </p> * * @param domain - * The name of the domain that contains the repository that contains the requested list of packages. + * The name of the domain that contains the repository that contains the requested packages. */ public void setDomain(String domain) { @@ -110,10 +129,10 @@ public void setDomain(String domain) { /** * <p> - * The name of the domain that contains the repository that contains the requested list of packages. + * The name of the domain that contains the repository that contains the requested packages. * </p> * - * @return The name of the domain that contains the repository that contains the requested list of packages. + * @return The name of the domain that contains the repository that contains the requested packages. */ public String getDomain() { @@ -122,11 +141,11 @@ public String getDomain() { /** * <p> - * The name of the domain that contains the repository that contains the requested list of packages. + * The name of the domain that contains the repository that contains the requested packages. * </p> * * @param domain - * The name of the domain that contains the repository that contains the requested list of packages. + * The name of the domain that contains the repository that contains the requested packages. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -183,11 +202,11 @@ public ListPackagesRequest withDomainOwner(String domainOwner) { /** * <p> - * The name of the repository from which packages are to be listed. + * The name of the repository that contains the requested packages. * </p> * * @param repository - * The name of the repository from which packages are to be listed. + * The name of the repository that contains the requested packages. */ public void setRepository(String repository) { @@ -196,10 +215,10 @@ public void setRepository(String repository) { /** * <p> - * The name of the repository from which packages are to be listed. + * The name of the repository that contains the requested packages. * </p> * - * @return The name of the repository from which packages are to be listed. + * @return The name of the repository that contains the requested packages. */ public String getRepository() { @@ -208,11 +227,11 @@ public String getRepository() { /** * <p> - * The name of the repository from which packages are to be listed. + * The name of the repository that contains the requested packages. * </p> * * @param repository - * The name of the repository from which packages are to be listed. + * The name of the repository that contains the requested packages. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -223,11 +242,11 @@ public ListPackagesRequest withRepository(String repository) { /** * <p> - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * </p> * * @param format - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * @see PackageFormat */ @@ -237,10 +256,10 @@ public void setFormat(String format) { /** * <p> - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * </p> * - * @return The format of the packages. + * @return The format used to filter requested packages. Only packages from the provided format will be returned. * @see PackageFormat */ @@ -250,11 +269,11 @@ public String getFormat() { /** * <p> - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * </p> * * @param format - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -266,11 +285,11 @@ public ListPackagesRequest withFormat(String format) { /** * <p> - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * </p> * * @param format - * The format of the packages. + * The format used to filter requested packages. Only packages from the provided format will be returned. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -282,8 +301,8 @@ public ListPackagesRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace used to filter requested packages. Only packages with the provided namespace will be returned. The + * package component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -298,14 +317,15 @@ public ListPackagesRequest withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace used to filter requested packages. Only packages with the provided namespace will be + * returned. The package component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -319,7 +339,8 @@ public ListPackagesRequest withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -330,8 +351,8 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace used to filter requested packages. Only packages with the provided namespace will be returned. The + * package component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -346,13 +367,14 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace used to filter requested packages. Only packages with the provided namespace will be + * returned. The package component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -366,7 +388,8 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -377,8 +400,8 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace used to filter requested packages. Only packages with the provided namespace will be returned. The + * package component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -393,14 +416,15 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace used to filter requested packages. Only packages with the provided namespace will be + * returned. The package component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -414,7 +438,8 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -427,12 +452,12 @@ public ListPackagesRequest withNamespace(String namespace) { /** * <p> - * A prefix used to filter returned packages. Only packages with names that start with <code>packagePrefix</code> + * A prefix used to filter requested packages. Only packages with names that start with <code>packagePrefix</code> * are returned. * </p> * * @param packagePrefix - * A prefix used to filter returned packages. Only packages with names that start with + * A prefix used to filter requested packages. Only packages with names that start with * <code>packagePrefix</code> are returned. */ @@ -442,11 +467,11 @@ public void setPackagePrefix(String packagePrefix) { /** * <p> - * A prefix used to filter returned packages. Only packages with names that start with <code>packagePrefix</code> + * A prefix used to filter requested packages. Only packages with names that start with <code>packagePrefix</code> * are returned. * </p> * - * @return A prefix used to filter returned packages. Only packages with names that start with + * @return A prefix used to filter requested packages. Only packages with names that start with * <code>packagePrefix</code> are returned. */ @@ -456,12 +481,12 @@ public String getPackagePrefix() { /** * <p> - * A prefix used to filter returned packages. Only packages with names that start with <code>packagePrefix</code> + * A prefix used to filter requested packages. Only packages with names that start with <code>packagePrefix</code> * are returned. * </p> * * @param packagePrefix - * A prefix used to filter returned packages. Only packages with names that start with + * A prefix used to filter requested packages. Only packages with names that start with * <code>packagePrefix</code> are returned. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -557,6 +582,172 @@ public ListPackagesRequest withNextToken(String nextToken) { return this; } + /** + * <p> + * The value of the <code>Publish</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @param publish + * The value of the <code>Publish</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @see AllowPublish + */ + + public void setPublish(String publish) { + this.publish = publish; + } + + /** + * <p> + * The value of the <code>Publish</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @return The value of the <code>Publish</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @see AllowPublish + */ + + public String getPublish() { + return this.publish; + } + + /** + * <p> + * The value of the <code>Publish</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @param publish + * The value of the <code>Publish</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowPublish + */ + + public ListPackagesRequest withPublish(String publish) { + setPublish(publish); + return this; + } + + /** + * <p> + * The value of the <code>Publish</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @param publish + * The value of the <code>Publish</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowPublish + */ + + public ListPackagesRequest withPublish(AllowPublish publish) { + this.publish = publish.toString(); + return this; + } + + /** + * <p> + * The value of the <code>Upstream</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @param upstream + * The value of the <code>Upstream</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @see AllowUpstream + */ + + public void setUpstream(String upstream) { + this.upstream = upstream; + } + + /** + * <p> + * The value of the <code>Upstream</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @return The value of the <code>Upstream</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @see AllowUpstream + */ + + public String getUpstream() { + return this.upstream; + } + + /** + * <p> + * The value of the <code>Upstream</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @param upstream + * The value of the <code>Upstream</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowUpstream + */ + + public ListPackagesRequest withUpstream(String upstream) { + setUpstream(upstream); + return this; + } + + /** + * <p> + * The value of the <code>Upstream</code> package origin control restriction used to filter requested packages. Only + * packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * </p> + * + * @param upstream + * The value of the <code>Upstream</code> package origin control restriction used to filter requested + * packages. Only packages with the provided restriction are returned. For more information, see <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a>. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowUpstream + */ + + public ListPackagesRequest withUpstream(AllowUpstream upstream) { + this.upstream = upstream.toString(); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -584,7 +775,11 @@ public String toString() { if (getMaxResults() != null) sb.append("MaxResults: ").append(getMaxResults()).append(","); if (getNextToken() != null) - sb.append("NextToken: ").append(getNextToken()); + sb.append("NextToken: ").append(getNextToken()).append(","); + if (getPublish() != null) + sb.append("Publish: ").append(getPublish()).append(","); + if (getUpstream() != null) + sb.append("Upstream: ").append(getUpstream()); sb.append("}"); return sb.toString(); } @@ -631,6 +826,14 @@ public boolean equals(Object obj) { return false; if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false; + if (other.getPublish() == null ^ this.getPublish() == null) + return false; + if (other.getPublish() != null && other.getPublish().equals(this.getPublish()) == false) + return false; + if (other.getUpstream() == null ^ this.getUpstream() == null) + return false; + if (other.getUpstream() != null && other.getUpstream().equals(this.getUpstream()) == false) + return false; return true; } @@ -647,6 +850,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getPackagePrefix() == null) ? 0 : getPackagePrefix().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); + hashCode = prime * hashCode + ((getPublish() == null) ? 0 : getPublish().hashCode()); + hashCode = prime * hashCode + ((getUpstream() == null) ? 0 : getUpstream().hashCode()); return hashCode; }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/ListPackageVersionAssetsRequest.java+65 −58 modified@@ -40,43 +40,44 @@ public class ListPackageVersionAssetsRequest extends com.amazonaws.AmazonWebServ private String domainOwner; /** * <p> - * The name of the repository that contains the package that contains the returned package version assets. + * The name of the repository that contains the package that contains the requested package version assets. * </p> */ private String repository; /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> */ private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> */ private String namespace; /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> */ private String packageValue; @@ -188,11 +189,11 @@ public ListPackageVersionAssetsRequest withDomainOwner(String domainOwner) { /** * <p> - * The name of the repository that contains the package that contains the returned package version assets. + * The name of the repository that contains the package that contains the requested package version assets. * </p> * * @param repository - * The name of the repository that contains the package that contains the returned package version assets. + * The name of the repository that contains the package that contains the requested package version assets. */ public void setRepository(String repository) { @@ -201,10 +202,10 @@ public void setRepository(String repository) { /** * <p> - * The name of the repository that contains the package that contains the returned package version assets. + * The name of the repository that contains the package that contains the requested package version assets. * </p> * - * @return The name of the repository that contains the package that contains the returned package version assets. + * @return The name of the repository that contains the package that contains the requested package version assets. */ public String getRepository() { @@ -213,11 +214,11 @@ public String getRepository() { /** * <p> - * The name of the repository that contains the package that contains the returned package version assets. + * The name of the repository that contains the package that contains the requested package version assets. * </p> * * @param repository - * The name of the repository that contains the package that contains the returned package version assets. + * The name of the repository that contains the package that contains the requested package version assets. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -228,11 +229,11 @@ public ListPackageVersionAssetsRequest withRepository(String repository) { /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * * @param format - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * @see PackageFormat */ @@ -242,10 +243,10 @@ public void setFormat(String format) { /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * - * @return The format of the package that contains the returned package version assets. + * @return The format of the package that contains the requested package version assets. * @see PackageFormat */ @@ -255,11 +256,11 @@ public String getFormat() { /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * * @param format - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -271,11 +272,11 @@ public ListPackageVersionAssetsRequest withFormat(String format) { /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * * @param format - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -287,44 +288,46 @@ public ListPackageVersionAssetsRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version that contains the requested package version assets. The package + * version component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -335,43 +338,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version that contains the requested package version assets. The package + * version component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -382,44 +387,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version that contains the requested package version assets. The package + * version component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -432,11 +439,11 @@ public ListPackageVersionAssetsRequest withNamespace(String namespace) { /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> * * @param packageValue - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. */ public void setPackage(String packageValue) { @@ -445,10 +452,10 @@ public void setPackage(String packageValue) { /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> * - * @return The name of the package that contains the returned package version assets. + * @return The name of the package that contains the requested package version assets. */ public String getPackage() { @@ -457,11 +464,11 @@ public String getPackage() { /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> * * @param packageValue - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/ListPackageVersionAssetsResult.java+65 −58 modified@@ -25,43 +25,44 @@ public class ListPackageVersionAssetsResult extends com.amazonaws.AmazonWebServi /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> */ private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> */ private String namespace; /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> */ private String packageValue; /** * <p> - * The version of the package associated with the returned assets. + * The version of the package associated with the requested assets. * </p> */ private String version; @@ -88,11 +89,11 @@ public class ListPackageVersionAssetsResult extends com.amazonaws.AmazonWebServi /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * * @param format - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * @see PackageFormat */ @@ -102,10 +103,10 @@ public void setFormat(String format) { /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * - * @return The format of the package that contains the returned package version assets. + * @return The format of the package that contains the requested package version assets. * @see PackageFormat */ @@ -115,11 +116,11 @@ public String getFormat() { /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * * @param format - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -131,11 +132,11 @@ public ListPackageVersionAssetsResult withFormat(String format) { /** * <p> - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * </p> * * @param format - * The format of the package that contains the returned package version assets. + * The format of the package that contains the requested package version assets. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -147,44 +148,46 @@ public ListPackageVersionAssetsResult withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version that contains the requested package version assets. The package + * version component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -195,43 +198,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version that contains the requested package version assets. The package + * version component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -242,44 +247,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the requested package version assets. The package version + * component that specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version that contains the requested package version assets. The package + * version component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -292,11 +299,11 @@ public ListPackageVersionAssetsResult withNamespace(String namespace) { /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> * * @param packageValue - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. */ public void setPackage(String packageValue) { @@ -305,10 +312,10 @@ public void setPackage(String packageValue) { /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> * - * @return The name of the package that contains the returned package version assets. + * @return The name of the package that contains the requested package version assets. */ public String getPackage() { @@ -317,11 +324,11 @@ public String getPackage() { /** * <p> - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * </p> * * @param packageValue - * The name of the package that contains the returned package version assets. + * The name of the package that contains the requested package version assets. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -332,11 +339,11 @@ public ListPackageVersionAssetsResult withPackage(String packageValue) { /** * <p> - * The version of the package associated with the returned assets. + * The version of the package associated with the requested assets. * </p> * * @param version - * The version of the package associated with the returned assets. + * The version of the package associated with the requested assets. */ public void setVersion(String version) { @@ -345,10 +352,10 @@ public void setVersion(String version) { /** * <p> - * The version of the package associated with the returned assets. + * The version of the package associated with the requested assets. * </p> * - * @return The version of the package associated with the returned assets. + * @return The version of the package associated with the requested assets. */ public String getVersion() { @@ -357,11 +364,11 @@ public String getVersion() { /** * <p> - * The version of the package associated with the returned assets. + * The version of the package associated with the requested assets. * </p> * * @param version - * The version of the package associated with the returned assets. + * The version of the package associated with the requested assets. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/ListPackageVersionDependenciesRequest.java+42 −35 modified@@ -52,23 +52,24 @@ public class ListPackageVersionDependenciesRequest extends com.amazonaws.AmazonW private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -284,44 +285,46 @@ public ListPackageVersionDependenciesRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested dependencies. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -332,43 +335,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version with the requested dependencies. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -379,44 +384,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version with the requested dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version with the requested dependencies. The package version component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/ListPackageVersionDependenciesResult.java+42 −35 modified@@ -32,23 +32,24 @@ public class ListPackageVersionDependenciesResult extends com.amazonaws.AmazonWe private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the returned dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -149,44 +150,46 @@ public ListPackageVersionDependenciesResult withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the returned dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version that contains the returned dependencies. The package version + * component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -197,43 +200,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the returned dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version that contains the returned dependencies. The package version + * component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -244,44 +249,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version that contains the returned dependencies. The package version component that + * specifies its namespace depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version that contains the returned dependencies. The package version + * component that specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/ListPackageVersionsRequest.java+158 −70 modified@@ -27,7 +27,7 @@ public class ListPackageVersionsRequest extends com.amazonaws.AmazonWebServiceRe /** * <p> - * The name of the domain that contains the repository that contains the returned package versions. + * The name of the domain that contains the repository that contains the requested package versions. * </p> */ private String domain; @@ -40,20 +40,20 @@ public class ListPackageVersionsRequest extends com.amazonaws.AmazonWebServiceRe private String domainOwner; /** * <p> - * The name of the repository that contains the package. + * The name of the repository that contains the requested package versions. * </p> */ private String repository; /** * <p> - * The format of the returned packages. + * The format of the returned package versions. * </p> */ private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -68,27 +68,28 @@ public class ListPackageVersionsRequest extends com.amazonaws.AmazonWebServiceRe * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> */ private String namespace; /** * <p> - * The name of the package for which you want to return a list of package versions. + * The name of the package for which you want to request package versions. * </p> */ private String packageValue; /** * <p> - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * </p> */ private String status; /** * <p> - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * </p> */ private String sortBy; @@ -105,14 +106,21 @@ public class ListPackageVersionsRequest extends com.amazonaws.AmazonWebServiceRe * </p> */ private String nextToken; + /** + * <p> + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * </p> + */ + private String originType; /** * <p> - * The name of the domain that contains the repository that contains the returned package versions. + * The name of the domain that contains the repository that contains the requested package versions. * </p> * * @param domain - * The name of the domain that contains the repository that contains the returned package versions. + * The name of the domain that contains the repository that contains the requested package versions. */ public void setDomain(String domain) { @@ -121,10 +129,10 @@ public void setDomain(String domain) { /** * <p> - * The name of the domain that contains the repository that contains the returned package versions. + * The name of the domain that contains the repository that contains the requested package versions. * </p> * - * @return The name of the domain that contains the repository that contains the returned package versions. + * @return The name of the domain that contains the repository that contains the requested package versions. */ public String getDomain() { @@ -133,11 +141,11 @@ public String getDomain() { /** * <p> - * The name of the domain that contains the repository that contains the returned package versions. + * The name of the domain that contains the repository that contains the requested package versions. * </p> * * @param domain - * The name of the domain that contains the repository that contains the returned package versions. + * The name of the domain that contains the repository that contains the requested package versions. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -194,11 +202,11 @@ public ListPackageVersionsRequest withDomainOwner(String domainOwner) { /** * <p> - * The name of the repository that contains the package. + * The name of the repository that contains the requested package versions. * </p> * * @param repository - * The name of the repository that contains the package. + * The name of the repository that contains the requested package versions. */ public void setRepository(String repository) { @@ -207,10 +215,10 @@ public void setRepository(String repository) { /** * <p> - * The name of the repository that contains the package. + * The name of the repository that contains the requested package versions. * </p> * - * @return The name of the repository that contains the package. + * @return The name of the repository that contains the requested package versions. */ public String getRepository() { @@ -219,11 +227,11 @@ public String getRepository() { /** * <p> - * The name of the repository that contains the package. + * The name of the repository that contains the requested package versions. * </p> * * @param repository - * The name of the repository that contains the package. + * The name of the repository that contains the requested package versions. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -234,11 +242,11 @@ public ListPackageVersionsRequest withRepository(String repository) { /** * <p> - * The format of the returned packages. + * The format of the returned package versions. * </p> * * @param format - * The format of the returned packages. + * The format of the returned package versions. * @see PackageFormat */ @@ -248,10 +256,10 @@ public void setFormat(String format) { /** * <p> - * The format of the returned packages. + * The format of the returned package versions. * </p> * - * @return The format of the returned packages. + * @return The format of the returned package versions. * @see PackageFormat */ @@ -261,11 +269,11 @@ public String getFormat() { /** * <p> - * The format of the returned packages. + * The format of the returned package versions. * </p> * * @param format - * The format of the returned packages. + * The format of the returned package versions. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -277,11 +285,11 @@ public ListPackageVersionsRequest withFormat(String format) { /** * <p> - * The format of the returned packages. + * The format of the returned package versions. * </p> * * @param format - * The format of the returned packages. + * The format of the returned package versions. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageFormat */ @@ -293,8 +301,8 @@ public ListPackageVersionsRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -309,14 +317,15 @@ public ListPackageVersionsRequest withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package that contains the requested package versions. The package component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -330,7 +339,8 @@ public ListPackageVersionsRequest withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -341,8 +351,8 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -357,13 +367,14 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package that contains the requested package versions. The package component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -377,7 +388,8 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -388,8 +400,8 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -404,14 +416,15 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package that contains the requested package versions. The package component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -425,7 +438,8 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -438,11 +452,11 @@ public ListPackageVersionsRequest withNamespace(String namespace) { /** * <p> - * The name of the package for which you want to return a list of package versions. + * The name of the package for which you want to request package versions. * </p> * * @param packageValue - * The name of the package for which you want to return a list of package versions. + * The name of the package for which you want to request package versions. */ public void setPackage(String packageValue) { @@ -451,10 +465,10 @@ public void setPackage(String packageValue) { /** * <p> - * The name of the package for which you want to return a list of package versions. + * The name of the package for which you want to request package versions. * </p> * - * @return The name of the package for which you want to return a list of package versions. + * @return The name of the package for which you want to request package versions. */ public String getPackage() { @@ -463,11 +477,11 @@ public String getPackage() { /** * <p> - * The name of the package for which you want to return a list of package versions. + * The name of the package for which you want to request package versions. * </p> * * @param packageValue - * The name of the package for which you want to return a list of package versions. + * The name of the package for which you want to request package versions. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -478,11 +492,11 @@ public ListPackageVersionsRequest withPackage(String packageValue) { /** * <p> - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * </p> * * @param status - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * @see PackageVersionStatus */ @@ -492,10 +506,10 @@ public void setStatus(String status) { /** * <p> - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * </p> * - * @return A string that specifies the status of the package versions to include in the returned list. + * @return A string that filters the requested package versions by status. * @see PackageVersionStatus */ @@ -505,11 +519,11 @@ public String getStatus() { /** * <p> - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * </p> * * @param status - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageVersionStatus */ @@ -521,11 +535,11 @@ public ListPackageVersionsRequest withStatus(String status) { /** * <p> - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * </p> * * @param status - * A string that specifies the status of the package versions to include in the returned list. + * A string that filters the requested package versions by status. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageVersionStatus */ @@ -537,11 +551,11 @@ public ListPackageVersionsRequest withStatus(PackageVersionStatus status) { /** * <p> - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * </p> * * @param sortBy - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * @see PackageVersionSortType */ @@ -551,10 +565,10 @@ public void setSortBy(String sortBy) { /** * <p> - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * </p> * - * @return How to sort the returned list of package versions. + * @return How to sort the requested list of package versions. * @see PackageVersionSortType */ @@ -564,11 +578,11 @@ public String getSortBy() { /** * <p> - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * </p> * * @param sortBy - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageVersionSortType */ @@ -580,11 +594,11 @@ public ListPackageVersionsRequest withSortBy(String sortBy) { /** * <p> - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * </p> * * @param sortBy - * How to sort the returned list of package versions. + * How to sort the requested list of package versions. * @return Returns a reference to this object so that method calls can be chained together. * @see PackageVersionSortType */ @@ -680,6 +694,73 @@ public ListPackageVersionsRequest withNextToken(String nextToken) { return this; } + /** + * <p> + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * </p> + * + * @param originType + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * @see PackageVersionOriginType + */ + + public void setOriginType(String originType) { + this.originType = originType; + } + + /** + * <p> + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * </p> + * + * @return The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * @see PackageVersionOriginType + */ + + public String getOriginType() { + return this.originType; + } + + /** + * <p> + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * </p> + * + * @param originType + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageVersionOriginType + */ + + public ListPackageVersionsRequest withOriginType(String originType) { + setOriginType(originType); + return this; + } + + /** + * <p> + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * </p> + * + * @param originType + * The <code>originType</code> used to filter package versions. Only package versions with the provided + * <code>originType</code> will be returned. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageVersionOriginType + */ + + public ListPackageVersionsRequest withOriginType(PackageVersionOriginType originType) { + this.originType = originType.toString(); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -711,7 +792,9 @@ public String toString() { if (getMaxResults() != null) sb.append("MaxResults: ").append(getMaxResults()).append(","); if (getNextToken() != null) - sb.append("NextToken: ").append(getNextToken()); + sb.append("NextToken: ").append(getNextToken()).append(","); + if (getOriginType() != null) + sb.append("OriginType: ").append(getOriginType()); sb.append("}"); return sb.toString(); } @@ -766,6 +849,10 @@ public boolean equals(Object obj) { return false; if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false; + if (other.getOriginType() == null ^ this.getOriginType() == null) + return false; + if (other.getOriginType() != null && other.getOriginType().equals(this.getOriginType()) == false) + return false; return true; } @@ -784,6 +871,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getSortBy() == null) ? 0 : getSortBy().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); + hashCode = prime * hashCode + ((getOriginType() == null) ? 0 : getOriginType().hashCode()); return hashCode; }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/ListPackageVersionsResult.java+28 −21 modified@@ -50,8 +50,8 @@ public class ListPackageVersionsResult extends com.amazonaws.AmazonWebServiceRes private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -66,7 +66,8 @@ public class ListPackageVersionsResult extends com.amazonaws.AmazonWebServiceRes * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> @@ -269,8 +270,8 @@ public ListPackageVersionsResult withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -285,14 +286,15 @@ public ListPackageVersionsResult withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package that contains the requested package versions. The package component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -306,7 +308,8 @@ public ListPackageVersionsResult withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -317,8 +320,8 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -333,13 +336,14 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package that contains the requested package versions. The package component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -353,7 +357,8 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -364,8 +369,8 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that contains the requested package versions. The package component that specifies + * its namespace depends on its type. For example: * </p> * <ul> * <li> @@ -380,14 +385,15 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package that contains the requested package versions. The package component that + * specifies its namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -401,7 +407,8 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageDependency.java+28 −21 modified@@ -30,8 +30,8 @@ public class PackageDependency implements Serializable, Cloneable, StructuredPoj /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that this package depends on. The package component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> @@ -46,7 +46,8 @@ public class PackageDependency implements Serializable, Cloneable, StructuredPoj * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> @@ -76,8 +77,8 @@ public class PackageDependency implements Serializable, Cloneable, StructuredPoj /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that this package depends on. The package component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> @@ -92,14 +93,15 @@ public class PackageDependency implements Serializable, Cloneable, StructuredPoj * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package that this package depends on. The package component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -113,7 +115,8 @@ public class PackageDependency implements Serializable, Cloneable, StructuredPoj * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -124,8 +127,8 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that this package depends on. The package component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> @@ -140,13 +143,14 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package that this package depends on. The package component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -160,7 +164,8 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -171,8 +176,8 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package that this package depends on. The package component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> @@ -187,14 +192,15 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package that this package depends on. The package component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> @@ -208,7 +214,8 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageDescription.java+444 −0 added@@ -0,0 +1,444 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Details about a package. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PackageDescription" target="_top">AWS + * API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageDescription implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * A format that specifies the type of the package. + * </p> + */ + private String format; + /** + * <p> + * The namespace of the package. The package component that specifies its namespace depends on its type. For + * example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + */ + private String namespace; + /** + * <p> + * The name of the package. + * </p> + */ + private String name; + /** + * <p> + * The package origin configuration for the package. + * </p> + */ + private PackageOriginConfiguration originConfiguration; + + /** + * <p> + * A format that specifies the type of the package. + * </p> + * + * @param format + * A format that specifies the type of the package. + * @see PackageFormat + */ + + public void setFormat(String format) { + this.format = format; + } + + /** + * <p> + * A format that specifies the type of the package. + * </p> + * + * @return A format that specifies the type of the package. + * @see PackageFormat + */ + + public String getFormat() { + return this.format; + } + + /** + * <p> + * A format that specifies the type of the package. + * </p> + * + * @param format + * A format that specifies the type of the package. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageFormat + */ + + public PackageDescription withFormat(String format) { + setFormat(format); + return this; + } + + /** + * <p> + * A format that specifies the type of the package. + * </p> + * + * @param format + * A format that specifies the type of the package. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageFormat + */ + + public PackageDescription withFormat(PackageFormat format) { + this.format = format.toString(); + return this; + } + + /** + * <p> + * The namespace of the package. The package component that specifies its namespace depends on its type. For + * example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @param namespace + * The namespace of the package. The package component that specifies its namespace depends on its type. For + * example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + */ + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + /** + * <p> + * The namespace of the package. The package component that specifies its namespace depends on its type. For + * example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @return The namespace of the package. The package component that specifies its namespace depends on its type. For + * example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + */ + + public String getNamespace() { + return this.namespace; + } + + /** + * <p> + * The namespace of the package. The package component that specifies its namespace depends on its type. For + * example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @param namespace + * The namespace of the package. The package component that specifies its namespace depends on its type. For + * example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageDescription withNamespace(String namespace) { + setNamespace(namespace); + return this; + } + + /** + * <p> + * The name of the package. + * </p> + * + * @param name + * The name of the package. + */ + + public void setName(String name) { + this.name = name; + } + + /** + * <p> + * The name of the package. + * </p> + * + * @return The name of the package. + */ + + public String getName() { + return this.name; + } + + /** + * <p> + * The name of the package. + * </p> + * + * @param name + * The name of the package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageDescription withName(String name) { + setName(name); + return this; + } + + /** + * <p> + * The package origin configuration for the package. + * </p> + * + * @param originConfiguration + * The package origin configuration for the package. + */ + + public void setOriginConfiguration(PackageOriginConfiguration originConfiguration) { + this.originConfiguration = originConfiguration; + } + + /** + * <p> + * The package origin configuration for the package. + * </p> + * + * @return The package origin configuration for the package. + */ + + public PackageOriginConfiguration getOriginConfiguration() { + return this.originConfiguration; + } + + /** + * <p> + * The package origin configuration for the package. + * </p> + * + * @param originConfiguration + * The package origin configuration for the package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageDescription withOriginConfiguration(PackageOriginConfiguration originConfiguration) { + setOriginConfiguration(originConfiguration); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getFormat() != null) + sb.append("Format: ").append(getFormat()).append(","); + if (getNamespace() != null) + sb.append("Namespace: ").append(getNamespace()).append(","); + if (getName() != null) + sb.append("Name: ").append(getName()).append(","); + if (getOriginConfiguration() != null) + sb.append("OriginConfiguration: ").append(getOriginConfiguration()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof PackageDescription == false) + return false; + PackageDescription other = (PackageDescription) obj; + if (other.getFormat() == null ^ this.getFormat() == null) + return false; + if (other.getFormat() != null && other.getFormat().equals(this.getFormat()) == false) + return false; + if (other.getNamespace() == null ^ this.getNamespace() == null) + return false; + if (other.getNamespace() != null && other.getNamespace().equals(this.getNamespace()) == false) + return false; + if (other.getName() == null ^ this.getName() == null) + return false; + if (other.getName() != null && other.getName().equals(this.getName()) == false) + return false; + if (other.getOriginConfiguration() == null ^ this.getOriginConfiguration() == null) + return false; + if (other.getOriginConfiguration() != null && other.getOriginConfiguration().equals(this.getOriginConfiguration()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getFormat() == null) ? 0 : getFormat().hashCode()); + hashCode = prime * hashCode + ((getNamespace() == null) ? 0 : getNamespace().hashCode()); + hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode()); + hashCode = prime * hashCode + ((getOriginConfiguration() == null) ? 0 : getOriginConfiguration().hashCode()); + return hashCode; + } + + @Override + public PackageDescription clone() { + try { + return (PackageDescription) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.codeartifact.model.transform.PackageDescriptionMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageOriginConfiguration.java+143 −0 added@@ -0,0 +1,143 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Details about the package origin configuration of a package. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PackageOriginConfiguration" + * target="_top">AWS API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageOriginConfiguration implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * A <code>PackageOriginRestrictions</code> object that contains information about the upstream and publish package + * origin configuration for the package. + * </p> + */ + private PackageOriginRestrictions restrictions; + + /** + * <p> + * A <code>PackageOriginRestrictions</code> object that contains information about the upstream and publish package + * origin configuration for the package. + * </p> + * + * @param restrictions + * A <code>PackageOriginRestrictions</code> object that contains information about the upstream and publish + * package origin configuration for the package. + */ + + public void setRestrictions(PackageOriginRestrictions restrictions) { + this.restrictions = restrictions; + } + + /** + * <p> + * A <code>PackageOriginRestrictions</code> object that contains information about the upstream and publish package + * origin configuration for the package. + * </p> + * + * @return A <code>PackageOriginRestrictions</code> object that contains information about the upstream and publish + * package origin configuration for the package. + */ + + public PackageOriginRestrictions getRestrictions() { + return this.restrictions; + } + + /** + * <p> + * A <code>PackageOriginRestrictions</code> object that contains information about the upstream and publish package + * origin configuration for the package. + * </p> + * + * @param restrictions + * A <code>PackageOriginRestrictions</code> object that contains information about the upstream and publish + * package origin configuration for the package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageOriginConfiguration withRestrictions(PackageOriginRestrictions restrictions) { + setRestrictions(restrictions); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getRestrictions() != null) + sb.append("Restrictions: ").append(getRestrictions()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof PackageOriginConfiguration == false) + return false; + PackageOriginConfiguration other = (PackageOriginConfiguration) obj; + if (other.getRestrictions() == null ^ this.getRestrictions() == null) + return false; + if (other.getRestrictions() != null && other.getRestrictions().equals(this.getRestrictions()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getRestrictions() == null) ? 0 : getRestrictions().hashCode()); + return hashCode; + } + + @Override + public PackageOriginConfiguration clone() { + try { + return (PackageOriginConfiguration) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.codeartifact.model.transform.PackageOriginConfigurationMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageOriginRestrictions.java+246 −0 added@@ -0,0 +1,246 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Details about the origin restrictions set on the package. The package origin restrictions determine how new versions + * of a package can be added to a specific repository. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PackageOriginRestrictions" + * target="_top">AWS API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageOriginRestrictions implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be published directly to the + * repository. + * </p> + */ + private String publish; + /** + * <p> + * The package origin configuration that determines if new versions of the package can be added to the repository + * from an external connection or upstream source. + * </p> + */ + private String upstream; + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be published directly to the + * repository. + * </p> + * + * @param publish + * The package origin configuration that determines if new versions of the package can be published directly + * to the repository. + * @see AllowPublish + */ + + public void setPublish(String publish) { + this.publish = publish; + } + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be published directly to the + * repository. + * </p> + * + * @return The package origin configuration that determines if new versions of the package can be published directly + * to the repository. + * @see AllowPublish + */ + + public String getPublish() { + return this.publish; + } + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be published directly to the + * repository. + * </p> + * + * @param publish + * The package origin configuration that determines if new versions of the package can be published directly + * to the repository. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowPublish + */ + + public PackageOriginRestrictions withPublish(String publish) { + setPublish(publish); + return this; + } + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be published directly to the + * repository. + * </p> + * + * @param publish + * The package origin configuration that determines if new versions of the package can be published directly + * to the repository. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowPublish + */ + + public PackageOriginRestrictions withPublish(AllowPublish publish) { + this.publish = publish.toString(); + return this; + } + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be added to the repository + * from an external connection or upstream source. + * </p> + * + * @param upstream + * The package origin configuration that determines if new versions of the package can be added to the + * repository from an external connection or upstream source. + * @see AllowUpstream + */ + + public void setUpstream(String upstream) { + this.upstream = upstream; + } + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be added to the repository + * from an external connection or upstream source. + * </p> + * + * @return The package origin configuration that determines if new versions of the package can be added to the + * repository from an external connection or upstream source. + * @see AllowUpstream + */ + + public String getUpstream() { + return this.upstream; + } + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be added to the repository + * from an external connection or upstream source. + * </p> + * + * @param upstream + * The package origin configuration that determines if new versions of the package can be added to the + * repository from an external connection or upstream source. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowUpstream + */ + + public PackageOriginRestrictions withUpstream(String upstream) { + setUpstream(upstream); + return this; + } + + /** + * <p> + * The package origin configuration that determines if new versions of the package can be added to the repository + * from an external connection or upstream source. + * </p> + * + * @param upstream + * The package origin configuration that determines if new versions of the package can be added to the + * repository from an external connection or upstream source. + * @return Returns a reference to this object so that method calls can be chained together. + * @see AllowUpstream + */ + + public PackageOriginRestrictions withUpstream(AllowUpstream upstream) { + this.upstream = upstream.toString(); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getPublish() != null) + sb.append("Publish: ").append(getPublish()).append(","); + if (getUpstream() != null) + sb.append("Upstream: ").append(getUpstream()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof PackageOriginRestrictions == false) + return false; + PackageOriginRestrictions other = (PackageOriginRestrictions) obj; + if (other.getPublish() == null ^ this.getPublish() == null) + return false; + if (other.getPublish() != null && other.getPublish().equals(this.getPublish()) == false) + return false; + if (other.getUpstream() == null ^ this.getUpstream() == null) + return false; + if (other.getUpstream() != null && other.getUpstream().equals(this.getUpstream()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getPublish() == null) ? 0 : getPublish().hashCode()); + hashCode = prime * hashCode + ((getUpstream() == null) ? 0 : getUpstream().hashCode()); + return hashCode; + } + + @Override + public PackageOriginRestrictions clone() { + try { + return (PackageOriginRestrictions) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.codeartifact.model.transform.PackageOriginRestrictionsMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageSummary.java+102 −11 modified@@ -54,7 +54,8 @@ public class PackageSummary implements Serializable, Cloneable, StructuredPojo { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> @@ -66,6 +67,16 @@ public class PackageSummary implements Serializable, Cloneable, StructuredPojo { * </p> */ private String packageValue; + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the upstream and publish package origin + * restrictions. + * </p> + */ + private PackageOriginConfiguration originConfiguration; /** * <p> @@ -144,14 +155,15 @@ public PackageSummary withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * example:</p> * <ul> * <li> * <p> @@ -165,7 +177,8 @@ public PackageSummary withFormat(PackageFormat format) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -192,13 +205,14 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * example:</p> * <ul> * <li> * <p> @@ -212,7 +226,8 @@ public void setNamespace(String namespace) { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> */ @@ -239,14 +254,15 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. * </p> * </li> * </ul> * * @param namespace * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * example:</p> * <ul> * <li> * <p> @@ -260,7 +276,8 @@ public String getNamespace() { * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -311,6 +328,73 @@ public PackageSummary withPackage(String packageValue) { return this; } + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the upstream and publish package origin + * restrictions. + * </p> + * + * @param originConfiguration + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html" + * >PackageOriginConfiguration</a> object that contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the upstream and publish package + * origin restrictions. + */ + + public void setOriginConfiguration(PackageOriginConfiguration originConfiguration) { + this.originConfiguration = originConfiguration; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the upstream and publish package origin + * restrictions. + * </p> + * + * @return A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html" + * >PackageOriginConfiguration</a> object that contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the upstream and publish package + * origin restrictions. + */ + + public PackageOriginConfiguration getOriginConfiguration() { + return this.originConfiguration; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the upstream and publish package origin + * restrictions. + * </p> + * + * @param originConfiguration + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html" + * >PackageOriginConfiguration</a> object that contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the upstream and publish package + * origin restrictions. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageSummary withOriginConfiguration(PackageOriginConfiguration originConfiguration) { + setOriginConfiguration(originConfiguration); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -328,7 +412,9 @@ public String toString() { if (getNamespace() != null) sb.append("Namespace: ").append(getNamespace()).append(","); if (getPackage() != null) - sb.append("Package: ").append(getPackage()); + sb.append("Package: ").append(getPackage()).append(","); + if (getOriginConfiguration() != null) + sb.append("OriginConfiguration: ").append(getOriginConfiguration()); sb.append("}"); return sb.toString(); } @@ -355,6 +441,10 @@ public boolean equals(Object obj) { return false; if (other.getPackage() != null && other.getPackage().equals(this.getPackage()) == false) return false; + if (other.getOriginConfiguration() == null ^ this.getOriginConfiguration() == null) + return false; + if (other.getOriginConfiguration() != null && other.getOriginConfiguration().equals(this.getOriginConfiguration()) == false) + return false; return true; } @@ -366,6 +456,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getFormat() == null) ? 0 : getFormat().hashCode()); hashCode = prime * hashCode + ((getNamespace() == null) ? 0 : getNamespace().hashCode()); hashCode = prime * hashCode + ((getPackage() == null) ? 0 : getPackage().hashCode()); + hashCode = prime * hashCode + ((getOriginConfiguration() == null) ? 0 : getOriginConfiguration().hashCode()); return hashCode; }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageVersionDescription.java+110 −36 modified@@ -36,23 +36,24 @@ public class PackageVersionDescription implements Serializable, Cloneable, Struc private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version. The package version component that specifies its namespace depends on its + * type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -121,6 +122,14 @@ public class PackageVersionDescription implements Serializable, Cloneable, Struc * </p> */ private String status; + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + */ + private PackageVersionOrigin origin; /** * <p> @@ -183,44 +192,46 @@ public PackageVersionDescription withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version. The package version component that specifies its namespace depends on its + * type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version. The package version component that specifies its namespace depends + * on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -231,43 +242,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version. The package version component that specifies its namespace depends on its + * type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version. The package version component that specifies its namespace depends + * on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -278,44 +291,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version. The package version component that specifies its namespace depends on its + * type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version. The package version component that specifies its namespace depends + * on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -796,6 +811,58 @@ public PackageVersionDescription withStatus(PackageVersionStatus status) { return this; } + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + * + * @param origin + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + */ + + public void setOrigin(PackageVersionOrigin origin) { + this.origin = origin; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + * + * @return A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + */ + + public PackageVersionOrigin getOrigin() { + return this.origin; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + * + * @param origin + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageVersionDescription withOrigin(PackageVersionOrigin origin) { + setOrigin(origin); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -831,7 +898,9 @@ public String toString() { if (getRevision() != null) sb.append("Revision: ").append(getRevision()).append(","); if (getStatus() != null) - sb.append("Status: ").append(getStatus()); + sb.append("Status: ").append(getStatus()).append(","); + if (getOrigin() != null) + sb.append("Origin: ").append(getOrigin()); sb.append("}"); return sb.toString(); } @@ -894,6 +963,10 @@ public boolean equals(Object obj) { return false; if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false) return false; + if (other.getOrigin() == null ^ this.getOrigin() == null) + return false; + if (other.getOrigin() != null && other.getOrigin().equals(this.getOrigin()) == false) + return false; return true; } @@ -914,6 +987,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getLicenses() == null) ? 0 : getLicenses().hashCode()); hashCode = prime * hashCode + ((getRevision() == null) ? 0 : getRevision().hashCode()); hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode()); + hashCode = prime * hashCode + ((getOrigin() == null) ? 0 : getOrigin().hashCode()); return hashCode; }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageVersionError.java+1 −1 modified@@ -19,7 +19,7 @@ /** * <p> - * An error associated with package. + * l An error associated with package. * </p> * * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PackageVersionError" target="_top">AWS
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageVersionOrigin.java+245 −0 added@@ -0,0 +1,245 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Information about how a package version was added to a repository. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PackageVersionOrigin" target="_top">AWS + * API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageVersionOrigin implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainEntryPoint.html">DomainEntryPoint + * </a> object that contains information about from which repository or external connection the package version was + * added to the domain. + * </p> + */ + private DomainEntryPoint domainEntryPoint; + /** + * <p> + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type means + * the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> origin type + * means the package version was ingested from an external connection. + * </p> + */ + private String originType; + + /** + * <p> + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainEntryPoint.html">DomainEntryPoint + * </a> object that contains information about from which repository or external connection the package version was + * added to the domain. + * </p> + * + * @param domainEntryPoint + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainEntryPoint.html"> + * DomainEntryPoint</a> object that contains information about from which repository or external connection + * the package version was added to the domain. + */ + + public void setDomainEntryPoint(DomainEntryPoint domainEntryPoint) { + this.domainEntryPoint = domainEntryPoint; + } + + /** + * <p> + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainEntryPoint.html">DomainEntryPoint + * </a> object that contains information about from which repository or external connection the package version was + * added to the domain. + * </p> + * + * @return A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainEntryPoint.html">DomainEntryPoint + * </a> object that contains information about from which repository or external connection the package + * version was added to the domain. + */ + + public DomainEntryPoint getDomainEntryPoint() { + return this.domainEntryPoint; + } + + /** + * <p> + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainEntryPoint.html">DomainEntryPoint + * </a> object that contains information about from which repository or external connection the package version was + * added to the domain. + * </p> + * + * @param domainEntryPoint + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_DomainEntryPoint.html"> + * DomainEntryPoint</a> object that contains information about from which repository or external connection + * the package version was added to the domain. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageVersionOrigin withDomainEntryPoint(DomainEntryPoint domainEntryPoint) { + setDomainEntryPoint(domainEntryPoint); + return this; + } + + /** + * <p> + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type means + * the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> origin type + * means the package version was ingested from an external connection. + * </p> + * + * @param originType + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type + * means the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> + * origin type means the package version was ingested from an external connection. + * @see PackageVersionOriginType + */ + + public void setOriginType(String originType) { + this.originType = originType; + } + + /** + * <p> + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type means + * the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> origin type + * means the package version was ingested from an external connection. + * </p> + * + * @return Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin + * type means the package version was published directly to a repository in the domain. An + * <code>EXTERNAL</code> origin type means the package version was ingested from an external connection. + * @see PackageVersionOriginType + */ + + public String getOriginType() { + return this.originType; + } + + /** + * <p> + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type means + * the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> origin type + * means the package version was ingested from an external connection. + * </p> + * + * @param originType + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type + * means the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> + * origin type means the package version was ingested from an external connection. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageVersionOriginType + */ + + public PackageVersionOrigin withOriginType(String originType) { + setOriginType(originType); + return this; + } + + /** + * <p> + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type means + * the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> origin type + * means the package version was ingested from an external connection. + * </p> + * + * @param originType + * Describes how the package version was originally added to the domain. An <code>INTERNAL</code> origin type + * means the package version was published directly to a repository in the domain. An <code>EXTERNAL</code> + * origin type means the package version was ingested from an external connection. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageVersionOriginType + */ + + public PackageVersionOrigin withOriginType(PackageVersionOriginType originType) { + this.originType = originType.toString(); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getDomainEntryPoint() != null) + sb.append("DomainEntryPoint: ").append(getDomainEntryPoint()).append(","); + if (getOriginType() != null) + sb.append("OriginType: ").append(getOriginType()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof PackageVersionOrigin == false) + return false; + PackageVersionOrigin other = (PackageVersionOrigin) obj; + if (other.getDomainEntryPoint() == null ^ this.getDomainEntryPoint() == null) + return false; + if (other.getDomainEntryPoint() != null && other.getDomainEntryPoint().equals(this.getDomainEntryPoint()) == false) + return false; + if (other.getOriginType() == null ^ this.getOriginType() == null) + return false; + if (other.getOriginType() != null && other.getOriginType().equals(this.getOriginType()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getDomainEntryPoint() == null) ? 0 : getDomainEntryPoint().hashCode()); + hashCode = prime * hashCode + ((getOriginType() == null) ? 0 : getOriginType().hashCode()); + return hashCode; + } + + @Override + public PackageVersionOrigin clone() { + try { + return (PackageVersionOrigin) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.codeartifact.model.transform.PackageVersionOriginMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageVersionOriginType.java+61 −0 added@@ -0,0 +1,61 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import javax.annotation.Generated; + +/** + * + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public enum PackageVersionOriginType { + + INTERNAL("INTERNAL"), + EXTERNAL("EXTERNAL"), + UNKNOWN("UNKNOWN"); + + private String value; + + private PackageVersionOriginType(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.value; + } + + /** + * Use this in place of valueOf. + * + * @param value + * real value + * @return PackageVersionOriginType corresponding to the value + * + * @throws IllegalArgumentException + * If the specified value does not map to one of the known values in this enum. + */ + public static PackageVersionOriginType fromValue(String value) { + if (value == null || "".equals(value)) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } + + for (PackageVersionOriginType enumEntry : PackageVersionOriginType.values()) { + if (enumEntry.toString().equals(value)) { + return enumEntry; + } + } + + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PackageVersionSummary.java+68 −1 modified@@ -48,6 +48,14 @@ public class PackageVersionSummary implements Serializable, Cloneable, Structure * </p> */ private String status; + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + */ + private PackageVersionOrigin origin; /** * <p> @@ -188,6 +196,58 @@ public PackageVersionSummary withStatus(PackageVersionStatus status) { return this; } + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + * + * @param origin + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + */ + + public void setOrigin(PackageVersionOrigin origin) { + this.origin = origin; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + * + * @return A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + */ + + public PackageVersionOrigin getOrigin() { + return this.origin; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * </p> + * + * @param origin + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionOrigin.html"> + * PackageVersionOrigin</a> object that contains information about how the package version was added to the + * repository. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PackageVersionSummary withOrigin(PackageVersionOrigin origin) { + setOrigin(origin); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -205,7 +265,9 @@ public String toString() { if (getRevision() != null) sb.append("Revision: ").append(getRevision()).append(","); if (getStatus() != null) - sb.append("Status: ").append(getStatus()); + sb.append("Status: ").append(getStatus()).append(","); + if (getOrigin() != null) + sb.append("Origin: ").append(getOrigin()); sb.append("}"); return sb.toString(); } @@ -232,6 +294,10 @@ public boolean equals(Object obj) { return false; if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false) return false; + if (other.getOrigin() == null ^ this.getOrigin() == null) + return false; + if (other.getOrigin() != null && other.getOrigin().equals(this.getOrigin()) == false) + return false; return true; } @@ -243,6 +309,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getVersion() == null) ? 0 : getVersion().hashCode()); hashCode = prime * hashCode + ((getRevision() == null) ? 0 : getRevision().hashCode()); hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode()); + hashCode = prime * hashCode + ((getOrigin() == null) ? 0 : getOrigin().hashCode()); return hashCode; }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PutPackageOriginConfigurationRequest.java+650 −0 added@@ -0,0 +1,650 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +import com.amazonaws.AmazonWebServiceRequest; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PutPackageOriginConfiguration" + * target="_top">AWS API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PutPackageOriginConfigurationRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable { + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + */ + private String domain; + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + */ + private String domainOwner; + /** + * <p> + * The name of the repository that contains the package. + * </p> + */ + private String repository; + /** + * <p> + * A format that specifies the type of the package to be updated. + * </p> + */ + private String format; + /** + * <p> + * The namespace of the package to be updated. The package component that specifies its namespace depends on its + * type. For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + */ + private String namespace; + /** + * <p> + * The name of the package to be updated. + * </p> + */ + private String packageValue; + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that contains information about the <code>upstream</code> and + * <code>publish</code> package origin restrictions. The <code>upstream</code> restriction determines if new package + * versions can be ingested or retained from external connections or upstream repositories. The <code>publish</code> + * restriction determines if new package versions can be published directly to the repository. + * </p> + * <p> + * You must include both the desired <code>upstream</code> and <code>publish</code> restrictions. + * </p> + */ + private PackageOriginRestrictions restrictions; + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + * + * @param domain + * The name of the domain that contains the repository that contains the package. + */ + + public void setDomain(String domain) { + this.domain = domain; + } + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + * + * @return The name of the domain that contains the repository that contains the package. + */ + + public String getDomain() { + return this.domain; + } + + /** + * <p> + * The name of the domain that contains the repository that contains the package. + * </p> + * + * @param domain + * The name of the domain that contains the repository that contains the package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PutPackageOriginConfigurationRequest withDomain(String domain) { + setDomain(domain); + return this; + } + + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + * + * @param domainOwner + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include + * dashes or spaces. + */ + + public void setDomainOwner(String domainOwner) { + this.domainOwner = domainOwner; + } + + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + * + * @return The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include + * dashes or spaces. + */ + + public String getDomainOwner() { + return this.domainOwner; + } + + /** + * <p> + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include dashes + * or spaces. + * </p> + * + * @param domainOwner + * The 12-digit account number of the Amazon Web Services account that owns the domain. It does not include + * dashes or spaces. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PutPackageOriginConfigurationRequest withDomainOwner(String domainOwner) { + setDomainOwner(domainOwner); + return this; + } + + /** + * <p> + * The name of the repository that contains the package. + * </p> + * + * @param repository + * The name of the repository that contains the package. + */ + + public void setRepository(String repository) { + this.repository = repository; + } + + /** + * <p> + * The name of the repository that contains the package. + * </p> + * + * @return The name of the repository that contains the package. + */ + + public String getRepository() { + return this.repository; + } + + /** + * <p> + * The name of the repository that contains the package. + * </p> + * + * @param repository + * The name of the repository that contains the package. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PutPackageOriginConfigurationRequest withRepository(String repository) { + setRepository(repository); + return this; + } + + /** + * <p> + * A format that specifies the type of the package to be updated. + * </p> + * + * @param format + * A format that specifies the type of the package to be updated. + * @see PackageFormat + */ + + public void setFormat(String format) { + this.format = format; + } + + /** + * <p> + * A format that specifies the type of the package to be updated. + * </p> + * + * @return A format that specifies the type of the package to be updated. + * @see PackageFormat + */ + + public String getFormat() { + return this.format; + } + + /** + * <p> + * A format that specifies the type of the package to be updated. + * </p> + * + * @param format + * A format that specifies the type of the package to be updated. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageFormat + */ + + public PutPackageOriginConfigurationRequest withFormat(String format) { + setFormat(format); + return this; + } + + /** + * <p> + * A format that specifies the type of the package to be updated. + * </p> + * + * @param format + * A format that specifies the type of the package to be updated. + * @return Returns a reference to this object so that method calls can be chained together. + * @see PackageFormat + */ + + public PutPackageOriginConfigurationRequest withFormat(PackageFormat format) { + this.format = format.toString(); + return this; + } + + /** + * <p> + * The namespace of the package to be updated. The package component that specifies its namespace depends on its + * type. For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @param namespace + * The namespace of the package to be updated. The package component that specifies its namespace depends on + * its type. For example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + */ + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + /** + * <p> + * The namespace of the package to be updated. The package component that specifies its namespace depends on its + * type. For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @return The namespace of the package to be updated. The package component that specifies its namespace depends on + * its type. For example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + */ + + public String getNamespace() { + return this.namespace; + } + + /** + * <p> + * The namespace of the package to be updated. The package component that specifies its namespace depends on its + * type. For example: + * </p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have a + * namespace. + * </p> + * </li> + * </ul> + * + * @param namespace + * The namespace of the package to be updated. The package component that specifies its namespace depends on + * its type. For example:</p> + * <ul> + * <li> + * <p> + * The namespace of a Maven package is its <code>groupId</code>. + * </p> + * </li> + * <li> + * <p> + * The namespace of an npm package is its <code>scope</code>. + * </p> + * </li> + * <li> + * <p> + * Python and NuGet packages do not contain a corresponding component, packages of those formats do not have + * a namespace. + * </p> + * </li> + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PutPackageOriginConfigurationRequest withNamespace(String namespace) { + setNamespace(namespace); + return this; + } + + /** + * <p> + * The name of the package to be updated. + * </p> + * + * @param packageValue + * The name of the package to be updated. + */ + + public void setPackage(String packageValue) { + this.packageValue = packageValue; + } + + /** + * <p> + * The name of the package to be updated. + * </p> + * + * @return The name of the package to be updated. + */ + + public String getPackage() { + return this.packageValue; + } + + /** + * <p> + * The name of the package to be updated. + * </p> + * + * @param packageValue + * The name of the package to be updated. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PutPackageOriginConfigurationRequest withPackage(String packageValue) { + setPackage(packageValue); + return this; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that contains information about the <code>upstream</code> and + * <code>publish</code> package origin restrictions. The <code>upstream</code> restriction determines if new package + * versions can be ingested or retained from external connections or upstream repositories. The <code>publish</code> + * restriction determines if new package versions can be published directly to the repository. + * </p> + * <p> + * You must include both the desired <code>upstream</code> and <code>publish</code> restrictions. + * </p> + * + * @param restrictions + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the <code>upstream</code> and + * <code>publish</code> package origin restrictions. The <code>upstream</code> restriction determines if new + * package versions can be ingested or retained from external connections or upstream repositories. The + * <code>publish</code> restriction determines if new package versions can be published directly to the + * repository.</p> + * <p> + * You must include both the desired <code>upstream</code> and <code>publish</code> restrictions. + */ + + public void setRestrictions(PackageOriginRestrictions restrictions) { + this.restrictions = restrictions; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that contains information about the <code>upstream</code> and + * <code>publish</code> package origin restrictions. The <code>upstream</code> restriction determines if new package + * versions can be ingested or retained from external connections or upstream repositories. The <code>publish</code> + * restriction determines if new package versions can be published directly to the repository. + * </p> + * <p> + * You must include both the desired <code>upstream</code> and <code>publish</code> restrictions. + * </p> + * + * @return A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the <code>upstream</code> and + * <code>publish</code> package origin restrictions. The <code>upstream</code> restriction determines if new + * package versions can be ingested or retained from external connections or upstream repositories. The + * <code>publish</code> restriction determines if new package versions can be published directly to the + * repository.</p> + * <p> + * You must include both the desired <code>upstream</code> and <code>publish</code> restrictions. + */ + + public PackageOriginRestrictions getRestrictions() { + return this.restrictions; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that contains information about the <code>upstream</code> and + * <code>publish</code> package origin restrictions. The <code>upstream</code> restriction determines if new package + * versions can be ingested or retained from external connections or upstream repositories. The <code>publish</code> + * restriction determines if new package versions can be published directly to the repository. + * </p> + * <p> + * You must include both the desired <code>upstream</code> and <code>publish</code> restrictions. + * </p> + * + * @param restrictions + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that contains information about the <code>upstream</code> and + * <code>publish</code> package origin restrictions. The <code>upstream</code> restriction determines if new + * package versions can be ingested or retained from external connections or upstream repositories. The + * <code>publish</code> restriction determines if new package versions can be published directly to the + * repository.</p> + * <p> + * You must include both the desired <code>upstream</code> and <code>publish</code> restrictions. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PutPackageOriginConfigurationRequest withRestrictions(PackageOriginRestrictions restrictions) { + setRestrictions(restrictions); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getDomain() != null) + sb.append("Domain: ").append(getDomain()).append(","); + if (getDomainOwner() != null) + sb.append("DomainOwner: ").append(getDomainOwner()).append(","); + if (getRepository() != null) + sb.append("Repository: ").append(getRepository()).append(","); + if (getFormat() != null) + sb.append("Format: ").append(getFormat()).append(","); + if (getNamespace() != null) + sb.append("Namespace: ").append(getNamespace()).append(","); + if (getPackage() != null) + sb.append("Package: ").append(getPackage()).append(","); + if (getRestrictions() != null) + sb.append("Restrictions: ").append(getRestrictions()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof PutPackageOriginConfigurationRequest == false) + return false; + PutPackageOriginConfigurationRequest other = (PutPackageOriginConfigurationRequest) obj; + if (other.getDomain() == null ^ this.getDomain() == null) + return false; + if (other.getDomain() != null && other.getDomain().equals(this.getDomain()) == false) + return false; + if (other.getDomainOwner() == null ^ this.getDomainOwner() == null) + return false; + if (other.getDomainOwner() != null && other.getDomainOwner().equals(this.getDomainOwner()) == false) + return false; + if (other.getRepository() == null ^ this.getRepository() == null) + return false; + if (other.getRepository() != null && other.getRepository().equals(this.getRepository()) == false) + return false; + if (other.getFormat() == null ^ this.getFormat() == null) + return false; + if (other.getFormat() != null && other.getFormat().equals(this.getFormat()) == false) + return false; + if (other.getNamespace() == null ^ this.getNamespace() == null) + return false; + if (other.getNamespace() != null && other.getNamespace().equals(this.getNamespace()) == false) + return false; + if (other.getPackage() == null ^ this.getPackage() == null) + return false; + if (other.getPackage() != null && other.getPackage().equals(this.getPackage()) == false) + return false; + if (other.getRestrictions() == null ^ this.getRestrictions() == null) + return false; + if (other.getRestrictions() != null && other.getRestrictions().equals(this.getRestrictions()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getDomain() == null) ? 0 : getDomain().hashCode()); + hashCode = prime * hashCode + ((getDomainOwner() == null) ? 0 : getDomainOwner().hashCode()); + hashCode = prime * hashCode + ((getRepository() == null) ? 0 : getRepository().hashCode()); + hashCode = prime * hashCode + ((getFormat() == null) ? 0 : getFormat().hashCode()); + hashCode = prime * hashCode + ((getNamespace() == null) ? 0 : getNamespace().hashCode()); + hashCode = prime * hashCode + ((getPackage() == null) ? 0 : getPackage().hashCode()); + hashCode = prime * hashCode + ((getRestrictions() == null) ? 0 : getRestrictions().hashCode()); + return hashCode; + } + + @Override + public PutPackageOriginConfigurationRequest clone() { + return (PutPackageOriginConfigurationRequest) super.clone(); + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/PutPackageOriginConfigurationResult.java+161 −0 added@@ -0,0 +1,161 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codeartifact-2018-09-22/PutPackageOriginConfiguration" + * target="_top">AWS API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PutPackageOriginConfigurationResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, + Cloneable { + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that describes the origin configuration set for the package. It contains a + * <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that describes how new versions of the package can be introduced to the + * repository. + * </p> + */ + private PackageOriginConfiguration originConfiguration; + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that describes the origin configuration set for the package. It contains a + * <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that describes how new versions of the package can be introduced to the + * repository. + * </p> + * + * @param originConfiguration + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html" + * >PackageOriginConfiguration</a> object that describes the origin configuration set for the package. It + * contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that describes how new versions of the package can be introduced to + * the repository. + */ + + public void setOriginConfiguration(PackageOriginConfiguration originConfiguration) { + this.originConfiguration = originConfiguration; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that describes the origin configuration set for the package. It contains a + * <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that describes how new versions of the package can be introduced to the + * repository. + * </p> + * + * @return A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html" + * >PackageOriginConfiguration</a> object that describes the origin configuration set for the package. It + * contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that describes how new versions of the package can be introduced to + * the repository. + */ + + public PackageOriginConfiguration getOriginConfiguration() { + return this.originConfiguration; + } + + /** + * <p> + * A <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html"> + * PackageOriginConfiguration</a> object that describes the origin configuration set for the package. It contains a + * <a href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html"> + * PackageOriginRestrictions</a> object that describes how new versions of the package can be introduced to the + * repository. + * </p> + * + * @param originConfiguration + * A <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginConfiguration.html" + * >PackageOriginConfiguration</a> object that describes the origin configuration set for the package. It + * contains a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageOriginRestrictions.html" + * >PackageOriginRestrictions</a> object that describes how new versions of the package can be introduced to + * the repository. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public PutPackageOriginConfigurationResult withOriginConfiguration(PackageOriginConfiguration originConfiguration) { + setOriginConfiguration(originConfiguration); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getOriginConfiguration() != null) + sb.append("OriginConfiguration: ").append(getOriginConfiguration()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof PutPackageOriginConfigurationResult == false) + return false; + PutPackageOriginConfigurationResult other = (PutPackageOriginConfigurationResult) obj; + if (other.getOriginConfiguration() == null ^ this.getOriginConfiguration() == null) + return false; + if (other.getOriginConfiguration() != null && other.getOriginConfiguration().equals(this.getOriginConfiguration()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getOriginConfiguration() == null) ? 0 : getOriginConfiguration().hashCode()); + return hashCode; + } + + @Override + public PutPackageOriginConfigurationResult clone() { + try { + return (PutPackageOriginConfigurationResult) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/DescribePackageRequestMarshaller.java+70 −0 added@@ -0,0 +1,70 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.codeartifact.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * DescribePackageRequestMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class DescribePackageRequestMarshaller { + + private static final MarshallingInfo<String> DOMAIN_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("domain").build(); + private static final MarshallingInfo<String> DOMAINOWNER_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("domain-owner").build(); + private static final MarshallingInfo<String> REPOSITORY_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("repository").build(); + private static final MarshallingInfo<String> FORMAT_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("format").build(); + private static final MarshallingInfo<String> NAMESPACE_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("namespace").build(); + private static final MarshallingInfo<String> PACKAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("package").build(); + + private static final DescribePackageRequestMarshaller instance = new DescribePackageRequestMarshaller(); + + public static DescribePackageRequestMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(DescribePackageRequest describePackageRequest, ProtocolMarshaller protocolMarshaller) { + + if (describePackageRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(describePackageRequest.getDomain(), DOMAIN_BINDING); + protocolMarshaller.marshall(describePackageRequest.getDomainOwner(), DOMAINOWNER_BINDING); + protocolMarshaller.marshall(describePackageRequest.getRepository(), REPOSITORY_BINDING); + protocolMarshaller.marshall(describePackageRequest.getFormat(), FORMAT_BINDING); + protocolMarshaller.marshall(describePackageRequest.getNamespace(), NAMESPACE_BINDING); + protocolMarshaller.marshall(describePackageRequest.getPackage(), PACKAGE_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/DescribePackageRequestProtocolMarshaller.java+62 −0 added@@ -0,0 +1,62 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.Request; + +import com.amazonaws.http.HttpMethodName; +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.Marshaller; + +import com.amazonaws.protocol.*; +import com.amazonaws.protocol.Protocol; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * DescribePackageRequest Marshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class DescribePackageRequestProtocolMarshaller implements Marshaller<Request<DescribePackageRequest>, DescribePackageRequest> { + + private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/v1/package") + .httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSCodeArtifact").build(); + + private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory; + + public DescribePackageRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) { + this.protocolFactory = protocolFactory; + } + + public Request<DescribePackageRequest> marshall(DescribePackageRequest describePackageRequest) { + + if (describePackageRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + final ProtocolRequestMarshaller<DescribePackageRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING, + describePackageRequest); + + protocolMarshaller.startMarshalling(); + DescribePackageRequestMarshaller.getInstance().marshall(describePackageRequest, protocolMarshaller); + return protocolMarshaller.finishMarshalling(); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/DescribePackageResultJsonUnmarshaller.java+74 −0 added@@ -0,0 +1,74 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * DescribePackageResult JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class DescribePackageResultJsonUnmarshaller implements Unmarshaller<DescribePackageResult, JsonUnmarshallerContext> { + + public DescribePackageResult unmarshall(JsonUnmarshallerContext context) throws Exception { + DescribePackageResult describePackageResult = new DescribePackageResult(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return describePackageResult; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("package", targetDepth)) { + context.nextToken(); + describePackageResult.setPackage(PackageDescriptionJsonUnmarshaller.getInstance().unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return describePackageResult; + } + + private static DescribePackageResultJsonUnmarshaller instance; + + public static DescribePackageResultJsonUnmarshaller getInstance() { + if (instance == null) + instance = new DescribePackageResultJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/DomainEntryPointJsonUnmarshaller.java+78 −0 added@@ -0,0 +1,78 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * DomainEntryPoint JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class DomainEntryPointJsonUnmarshaller implements Unmarshaller<DomainEntryPoint, JsonUnmarshallerContext> { + + public DomainEntryPoint unmarshall(JsonUnmarshallerContext context) throws Exception { + DomainEntryPoint domainEntryPoint = new DomainEntryPoint(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("repositoryName", targetDepth)) { + context.nextToken(); + domainEntryPoint.setRepositoryName(context.getUnmarshaller(String.class).unmarshall(context)); + } + if (context.testExpression("externalConnectionName", targetDepth)) { + context.nextToken(); + domainEntryPoint.setExternalConnectionName(context.getUnmarshaller(String.class).unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return domainEntryPoint; + } + + private static DomainEntryPointJsonUnmarshaller instance; + + public static DomainEntryPointJsonUnmarshaller getInstance() { + if (instance == null) + instance = new DomainEntryPointJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/DomainEntryPointMarshaller.java+58 −0 added@@ -0,0 +1,58 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.codeartifact.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * DomainEntryPointMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class DomainEntryPointMarshaller { + + private static final MarshallingInfo<String> REPOSITORYNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("repositoryName").build(); + private static final MarshallingInfo<String> EXTERNALCONNECTIONNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("externalConnectionName").build(); + + private static final DomainEntryPointMarshaller instance = new DomainEntryPointMarshaller(); + + public static DomainEntryPointMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(DomainEntryPoint domainEntryPoint, ProtocolMarshaller protocolMarshaller) { + + if (domainEntryPoint == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(domainEntryPoint.getRepositoryName(), REPOSITORYNAME_BINDING); + protocolMarshaller.marshall(domainEntryPoint.getExternalConnectionName(), EXTERNALCONNECTIONNAME_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/ListPackagesRequestMarshaller.java+6 −0 modified@@ -43,6 +43,10 @@ public class ListPackagesRequestMarshaller { .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("max-results").build(); private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING) .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("next-token").build(); + private static final MarshallingInfo<String> PUBLISH_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("publish").build(); + private static final MarshallingInfo<String> UPSTREAM_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("upstream").build(); private static final ListPackagesRequestMarshaller instance = new ListPackagesRequestMarshaller(); @@ -68,6 +72,8 @@ public void marshall(ListPackagesRequest listPackagesRequest, ProtocolMarshaller protocolMarshaller.marshall(listPackagesRequest.getPackagePrefix(), PACKAGEPREFIX_BINDING); protocolMarshaller.marshall(listPackagesRequest.getMaxResults(), MAXRESULTS_BINDING); protocolMarshaller.marshall(listPackagesRequest.getNextToken(), NEXTTOKEN_BINDING); + protocolMarshaller.marshall(listPackagesRequest.getPublish(), PUBLISH_BINDING); + protocolMarshaller.marshall(listPackagesRequest.getUpstream(), UPSTREAM_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/ListPackageVersionsRequestMarshaller.java+3 −0 modified@@ -47,6 +47,8 @@ public class ListPackageVersionsRequestMarshaller { .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("max-results").build(); private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING) .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("next-token").build(); + private static final MarshallingInfo<String> ORIGINTYPE_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("originType").build(); private static final ListPackageVersionsRequestMarshaller instance = new ListPackageVersionsRequestMarshaller(); @@ -74,6 +76,7 @@ public void marshall(ListPackageVersionsRequest listPackageVersionsRequest, Prot protocolMarshaller.marshall(listPackageVersionsRequest.getSortBy(), SORTBY_BINDING); protocolMarshaller.marshall(listPackageVersionsRequest.getMaxResults(), MAXRESULTS_BINDING); protocolMarshaller.marshall(listPackageVersionsRequest.getNextToken(), NEXTTOKEN_BINDING); + protocolMarshaller.marshall(listPackageVersionsRequest.getOriginType(), ORIGINTYPE_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageDescriptionJsonUnmarshaller.java+86 −0 added@@ -0,0 +1,86 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * PackageDescription JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageDescriptionJsonUnmarshaller implements Unmarshaller<PackageDescription, JsonUnmarshallerContext> { + + public PackageDescription unmarshall(JsonUnmarshallerContext context) throws Exception { + PackageDescription packageDescription = new PackageDescription(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("format", targetDepth)) { + context.nextToken(); + packageDescription.setFormat(context.getUnmarshaller(String.class).unmarshall(context)); + } + if (context.testExpression("namespace", targetDepth)) { + context.nextToken(); + packageDescription.setNamespace(context.getUnmarshaller(String.class).unmarshall(context)); + } + if (context.testExpression("name", targetDepth)) { + context.nextToken(); + packageDescription.setName(context.getUnmarshaller(String.class).unmarshall(context)); + } + if (context.testExpression("originConfiguration", targetDepth)) { + context.nextToken(); + packageDescription.setOriginConfiguration(PackageOriginConfigurationJsonUnmarshaller.getInstance().unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return packageDescription; + } + + private static PackageDescriptionJsonUnmarshaller instance; + + public static PackageDescriptionJsonUnmarshaller getInstance() { + if (instance == null) + instance = new PackageDescriptionJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageDescriptionMarshaller.java+64 −0 added@@ -0,0 +1,64 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.codeartifact.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * PackageDescriptionMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class PackageDescriptionMarshaller { + + private static final MarshallingInfo<String> FORMAT_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("format").build(); + private static final MarshallingInfo<String> NAMESPACE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("namespace").build(); + private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("name").build(); + private static final MarshallingInfo<StructuredPojo> ORIGINCONFIGURATION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("originConfiguration").build(); + + private static final PackageDescriptionMarshaller instance = new PackageDescriptionMarshaller(); + + public static PackageDescriptionMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(PackageDescription packageDescription, ProtocolMarshaller protocolMarshaller) { + + if (packageDescription == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(packageDescription.getFormat(), FORMAT_BINDING); + protocolMarshaller.marshall(packageDescription.getNamespace(), NAMESPACE_BINDING); + protocolMarshaller.marshall(packageDescription.getName(), NAME_BINDING); + protocolMarshaller.marshall(packageDescription.getOriginConfiguration(), ORIGINCONFIGURATION_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageOriginConfigurationJsonUnmarshaller.java+74 −0 added@@ -0,0 +1,74 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * PackageOriginConfiguration JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageOriginConfigurationJsonUnmarshaller implements Unmarshaller<PackageOriginConfiguration, JsonUnmarshallerContext> { + + public PackageOriginConfiguration unmarshall(JsonUnmarshallerContext context) throws Exception { + PackageOriginConfiguration packageOriginConfiguration = new PackageOriginConfiguration(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("restrictions", targetDepth)) { + context.nextToken(); + packageOriginConfiguration.setRestrictions(PackageOriginRestrictionsJsonUnmarshaller.getInstance().unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return packageOriginConfiguration; + } + + private static PackageOriginConfigurationJsonUnmarshaller instance; + + public static PackageOriginConfigurationJsonUnmarshaller getInstance() { + if (instance == null) + instance = new PackageOriginConfigurationJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageOriginConfigurationMarshaller.java+55 −0 added@@ -0,0 +1,55 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.codeartifact.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * PackageOriginConfigurationMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class PackageOriginConfigurationMarshaller { + + private static final MarshallingInfo<StructuredPojo> RESTRICTIONS_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("restrictions").build(); + + private static final PackageOriginConfigurationMarshaller instance = new PackageOriginConfigurationMarshaller(); + + public static PackageOriginConfigurationMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(PackageOriginConfiguration packageOriginConfiguration, ProtocolMarshaller protocolMarshaller) { + + if (packageOriginConfiguration == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(packageOriginConfiguration.getRestrictions(), RESTRICTIONS_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageOriginRestrictionsJsonUnmarshaller.java+78 −0 added@@ -0,0 +1,78 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * PackageOriginRestrictions JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageOriginRestrictionsJsonUnmarshaller implements Unmarshaller<PackageOriginRestrictions, JsonUnmarshallerContext> { + + public PackageOriginRestrictions unmarshall(JsonUnmarshallerContext context) throws Exception { + PackageOriginRestrictions packageOriginRestrictions = new PackageOriginRestrictions(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("publish", targetDepth)) { + context.nextToken(); + packageOriginRestrictions.setPublish(context.getUnmarshaller(String.class).unmarshall(context)); + } + if (context.testExpression("upstream", targetDepth)) { + context.nextToken(); + packageOriginRestrictions.setUpstream(context.getUnmarshaller(String.class).unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return packageOriginRestrictions; + } + + private static PackageOriginRestrictionsJsonUnmarshaller instance; + + public static PackageOriginRestrictionsJsonUnmarshaller getInstance() { + if (instance == null) + instance = new PackageOriginRestrictionsJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageOriginRestrictionsMarshaller.java+58 −0 added@@ -0,0 +1,58 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.codeartifact.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * PackageOriginRestrictionsMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class PackageOriginRestrictionsMarshaller { + + private static final MarshallingInfo<String> PUBLISH_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("publish").build(); + private static final MarshallingInfo<String> UPSTREAM_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("upstream").build(); + + private static final PackageOriginRestrictionsMarshaller instance = new PackageOriginRestrictionsMarshaller(); + + public static PackageOriginRestrictionsMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(PackageOriginRestrictions packageOriginRestrictions, ProtocolMarshaller protocolMarshaller) { + + if (packageOriginRestrictions == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(packageOriginRestrictions.getPublish(), PUBLISH_BINDING); + protocolMarshaller.marshall(packageOriginRestrictions.getUpstream(), UPSTREAM_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageSummaryJsonUnmarshaller.java+4 −0 modified@@ -60,6 +60,10 @@ public PackageSummary unmarshall(JsonUnmarshallerContext context) throws Excepti context.nextToken(); packageSummary.setPackage(context.getUnmarshaller(String.class).unmarshall(context)); } + if (context.testExpression("originConfiguration", targetDepth)) { + context.nextToken(); + packageSummary.setOriginConfiguration(PackageOriginConfigurationJsonUnmarshaller.getInstance().unmarshall(context)); + } } else if (token == END_ARRAY || token == END_OBJECT) { if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { if (context.getCurrentDepth() <= originalDepth)
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageSummaryMarshaller.java+3 −0 modified@@ -33,6 +33,8 @@ public class PackageSummaryMarshaller { .marshallLocationName("namespace").build(); private static final MarshallingInfo<String> PACKAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) .marshallLocationName("package").build(); + private static final MarshallingInfo<StructuredPojo> ORIGINCONFIGURATION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("originConfiguration").build(); private static final PackageSummaryMarshaller instance = new PackageSummaryMarshaller(); @@ -53,6 +55,7 @@ public void marshall(PackageSummary packageSummary, ProtocolMarshaller protocolM protocolMarshaller.marshall(packageSummary.getFormat(), FORMAT_BINDING); protocolMarshaller.marshall(packageSummary.getNamespace(), NAMESPACE_BINDING); protocolMarshaller.marshall(packageSummary.getPackage(), PACKAGE_BINDING); + protocolMarshaller.marshall(packageSummary.getOriginConfiguration(), ORIGINCONFIGURATION_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageVersionDescriptionJsonUnmarshaller.java+4 −0 modified@@ -98,6 +98,10 @@ public PackageVersionDescription unmarshall(JsonUnmarshallerContext context) thr context.nextToken(); packageVersionDescription.setStatus(context.getUnmarshaller(String.class).unmarshall(context)); } + if (context.testExpression("origin", targetDepth)) { + context.nextToken(); + packageVersionDescription.setOrigin(PackageVersionOriginJsonUnmarshaller.getInstance().unmarshall(context)); + } } else if (token == END_ARRAY || token == END_OBJECT) { if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { if (context.getCurrentDepth() <= originalDepth)
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageVersionDescriptionMarshaller.java+3 −0 modified@@ -52,6 +52,8 @@ public class PackageVersionDescriptionMarshaller { .marshallLocationName("revision").build(); private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) .marshallLocationName("status").build(); + private static final MarshallingInfo<StructuredPojo> ORIGIN_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("origin").build(); private static final PackageVersionDescriptionMarshaller instance = new PackageVersionDescriptionMarshaller(); @@ -81,6 +83,7 @@ public void marshall(PackageVersionDescription packageVersionDescription, Protoc protocolMarshaller.marshall(packageVersionDescription.getLicenses(), LICENSES_BINDING); protocolMarshaller.marshall(packageVersionDescription.getRevision(), REVISION_BINDING); protocolMarshaller.marshall(packageVersionDescription.getStatus(), STATUS_BINDING); + protocolMarshaller.marshall(packageVersionDescription.getOrigin(), ORIGIN_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageVersionOriginJsonUnmarshaller.java+78 −0 added@@ -0,0 +1,78 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * PackageVersionOrigin JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PackageVersionOriginJsonUnmarshaller implements Unmarshaller<PackageVersionOrigin, JsonUnmarshallerContext> { + + public PackageVersionOrigin unmarshall(JsonUnmarshallerContext context) throws Exception { + PackageVersionOrigin packageVersionOrigin = new PackageVersionOrigin(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("domainEntryPoint", targetDepth)) { + context.nextToken(); + packageVersionOrigin.setDomainEntryPoint(DomainEntryPointJsonUnmarshaller.getInstance().unmarshall(context)); + } + if (context.testExpression("originType", targetDepth)) { + context.nextToken(); + packageVersionOrigin.setOriginType(context.getUnmarshaller(String.class).unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return packageVersionOrigin; + } + + private static PackageVersionOriginJsonUnmarshaller instance; + + public static PackageVersionOriginJsonUnmarshaller getInstance() { + if (instance == null) + instance = new PackageVersionOriginJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageVersionOriginMarshaller.java+58 −0 added@@ -0,0 +1,58 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.codeartifact.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * PackageVersionOriginMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class PackageVersionOriginMarshaller { + + private static final MarshallingInfo<StructuredPojo> DOMAINENTRYPOINT_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("domainEntryPoint").build(); + private static final MarshallingInfo<String> ORIGINTYPE_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("originType").build(); + + private static final PackageVersionOriginMarshaller instance = new PackageVersionOriginMarshaller(); + + public static PackageVersionOriginMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(PackageVersionOrigin packageVersionOrigin, ProtocolMarshaller protocolMarshaller) { + + if (packageVersionOrigin == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(packageVersionOrigin.getDomainEntryPoint(), DOMAINENTRYPOINT_BINDING); + protocolMarshaller.marshall(packageVersionOrigin.getOriginType(), ORIGINTYPE_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageVersionSummaryJsonUnmarshaller.java+4 −0 modified@@ -60,6 +60,10 @@ public PackageVersionSummary unmarshall(JsonUnmarshallerContext context) throws context.nextToken(); packageVersionSummary.setStatus(context.getUnmarshaller(String.class).unmarshall(context)); } + if (context.testExpression("origin", targetDepth)) { + context.nextToken(); + packageVersionSummary.setOrigin(PackageVersionOriginJsonUnmarshaller.getInstance().unmarshall(context)); + } } else if (token == END_ARRAY || token == END_OBJECT) { if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { if (context.getCurrentDepth() <= originalDepth)
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PackageVersionSummaryMarshaller.java+3 −0 modified@@ -33,6 +33,8 @@ public class PackageVersionSummaryMarshaller { .marshallLocationName("revision").build(); private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) .marshallLocationName("status").build(); + private static final MarshallingInfo<StructuredPojo> ORIGIN_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("origin").build(); private static final PackageVersionSummaryMarshaller instance = new PackageVersionSummaryMarshaller(); @@ -53,6 +55,7 @@ public void marshall(PackageVersionSummary packageVersionSummary, ProtocolMarsha protocolMarshaller.marshall(packageVersionSummary.getVersion(), VERSION_BINDING); protocolMarshaller.marshall(packageVersionSummary.getRevision(), REVISION_BINDING); protocolMarshaller.marshall(packageVersionSummary.getStatus(), STATUS_BINDING); + protocolMarshaller.marshall(packageVersionSummary.getOrigin(), ORIGIN_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PutPackageOriginConfigurationRequestMarshaller.java+73 −0 added@@ -0,0 +1,73 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.codeartifact.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * PutPackageOriginConfigurationRequestMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class PutPackageOriginConfigurationRequestMarshaller { + + private static final MarshallingInfo<String> DOMAIN_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("domain").build(); + private static final MarshallingInfo<String> DOMAINOWNER_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("domain-owner").build(); + private static final MarshallingInfo<String> REPOSITORY_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("repository").build(); + private static final MarshallingInfo<String> FORMAT_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("format").build(); + private static final MarshallingInfo<String> NAMESPACE_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("namespace").build(); + private static final MarshallingInfo<String> PACKAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("package").build(); + private static final MarshallingInfo<StructuredPojo> RESTRICTIONS_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("restrictions").build(); + + private static final PutPackageOriginConfigurationRequestMarshaller instance = new PutPackageOriginConfigurationRequestMarshaller(); + + public static PutPackageOriginConfigurationRequestMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(PutPackageOriginConfigurationRequest putPackageOriginConfigurationRequest, ProtocolMarshaller protocolMarshaller) { + + if (putPackageOriginConfigurationRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(putPackageOriginConfigurationRequest.getDomain(), DOMAIN_BINDING); + protocolMarshaller.marshall(putPackageOriginConfigurationRequest.getDomainOwner(), DOMAINOWNER_BINDING); + protocolMarshaller.marshall(putPackageOriginConfigurationRequest.getRepository(), REPOSITORY_BINDING); + protocolMarshaller.marshall(putPackageOriginConfigurationRequest.getFormat(), FORMAT_BINDING); + protocolMarshaller.marshall(putPackageOriginConfigurationRequest.getNamespace(), NAMESPACE_BINDING); + protocolMarshaller.marshall(putPackageOriginConfigurationRequest.getPackage(), PACKAGE_BINDING); + protocolMarshaller.marshall(putPackageOriginConfigurationRequest.getRestrictions(), RESTRICTIONS_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PutPackageOriginConfigurationRequestProtocolMarshaller.java+63 −0 added@@ -0,0 +1,63 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.Request; + +import com.amazonaws.http.HttpMethodName; +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.Marshaller; + +import com.amazonaws.protocol.*; +import com.amazonaws.protocol.Protocol; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * PutPackageOriginConfigurationRequest Marshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class PutPackageOriginConfigurationRequestProtocolMarshaller implements + Marshaller<Request<PutPackageOriginConfigurationRequest>, PutPackageOriginConfigurationRequest> { + + private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/v1/package") + .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSCodeArtifact").build(); + + private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory; + + public PutPackageOriginConfigurationRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) { + this.protocolFactory = protocolFactory; + } + + public Request<PutPackageOriginConfigurationRequest> marshall(PutPackageOriginConfigurationRequest putPackageOriginConfigurationRequest) { + + if (putPackageOriginConfigurationRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + final ProtocolRequestMarshaller<PutPackageOriginConfigurationRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller( + SDK_OPERATION_BINDING, putPackageOriginConfigurationRequest); + + protocolMarshaller.startMarshalling(); + PutPackageOriginConfigurationRequestMarshaller.getInstance().marshall(putPackageOriginConfigurationRequest, protocolMarshaller); + return protocolMarshaller.finishMarshalling(); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/transform/PutPackageOriginConfigurationResultJsonUnmarshaller.java+74 −0 added@@ -0,0 +1,74 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.codeartifact.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.codeartifact.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * PutPackageOriginConfigurationResult JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class PutPackageOriginConfigurationResultJsonUnmarshaller implements Unmarshaller<PutPackageOriginConfigurationResult, JsonUnmarshallerContext> { + + public PutPackageOriginConfigurationResult unmarshall(JsonUnmarshallerContext context) throws Exception { + PutPackageOriginConfigurationResult putPackageOriginConfigurationResult = new PutPackageOriginConfigurationResult(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return putPackageOriginConfigurationResult; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("originConfiguration", targetDepth)) { + context.nextToken(); + putPackageOriginConfigurationResult.setOriginConfiguration(PackageOriginConfigurationJsonUnmarshaller.getInstance().unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return putPackageOriginConfigurationResult; + } + + private static PutPackageOriginConfigurationResultJsonUnmarshaller instance; + + public static PutPackageOriginConfigurationResultJsonUnmarshaller getInstance() { + if (instance == null) + instance = new PutPackageOriginConfigurationResultJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/model/UpdatePackageVersionsStatusRequest.java+42 −35 modified@@ -53,23 +53,24 @@ public class UpdatePackageVersionsStatusRequest extends com.amazonaws.AmazonWebS private String format; /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version to be updated. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> @@ -302,44 +303,46 @@ public UpdatePackageVersionsStatusRequest withFormat(PackageFormat format) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version to be updated. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version to be updated. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -350,43 +353,45 @@ public void setNamespace(String namespace) { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version to be updated. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * - * @return The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * @return The namespace of the package version to be updated. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> */ @@ -397,44 +402,46 @@ public String getNamespace() { /** * <p> - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: + * The namespace of the package version to be updated. The package version component that specifies its namespace + * depends on its type. For example: * </p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those formats do + * not have a namespace. * </p> * </li> * </ul> * * @param namespace - * The namespace of the package. The package component that specifies its namespace depends on its type. For - * example: </p> + * The namespace of the package version to be updated. The package version component that specifies its + * namespace depends on its type. For example:</p> * <ul> * <li> * <p> - * The namespace of a Maven package is its <code>groupId</code>. + * The namespace of a Maven package version is its <code>groupId</code>. * </p> * </li> * <li> * <p> - * The namespace of an npm package is its <code>scope</code>. + * The namespace of an npm package version is its <code>scope</code>. * </p> * </li> * <li> * <p> - * A Python package does not contain a corresponding component, so Python packages do not have a namespace. + * Python and NuGet package versions do not contain a corresponding component, package versions of those + * formats do not have a namespace. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together.
aws-java-sdk-codeartifact/src/main/java/com/amazonaws/services/codeartifact/package-info.java+13 −0 modified@@ -172,6 +172,13 @@ * </li> * <li> * <p> + * <code>DescribePackage</code>: Returns a <a + * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageDescription.html" + * >PackageDescription</a> object that contains details about a package. + * </p> + * </li> + * <li> + * <p> * <code>DescribePackageVersion</code>: Returns a <a * href="https://docs.aws.amazon.com/codeartifact/latest/APIReference/API_PackageVersionDescription.html" * >PackageVersionDescription</a> object that contains details about a package version. @@ -293,6 +300,12 @@ * </li> * <li> * <p> + * <code>PutPackageOriginConfiguration</code>: Sets the package origin configuration for a package, which determine how + * new versions of the package can be added to a specific repository. + * </p> + * </li> + * <li> + * <p> * <code>PutRepositoryPermissionsPolicy</code>: Sets the resource policy on a repository that specifies permissions to * access it. * </p>
aws-java-sdk-codebuild/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codebuild</artifactId>
aws-java-sdk-codecommit/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codecommit</artifactId>
aws-java-sdk-codedeploy/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codedeploy</artifactId>
aws-java-sdk-code-generator/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-code-generator</artifactId>
aws-java-sdk-codegen-maven-plugin/pom.xml+1 −1 modified@@ -6,7 +6,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codegen-maven-plugin</artifactId>
aws-java-sdk-codeguruprofiler/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codeguruprofiler</artifactId>
aws-java-sdk-codegurureviewer/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codegurureviewer</artifactId>
aws-java-sdk-codepipeline/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codepipeline</artifactId>
aws-java-sdk-codestarconnections/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codestarconnections</artifactId>
aws-java-sdk-codestarnotifications/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codestarnotifications</artifactId>
aws-java-sdk-codestar/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-codestar</artifactId>
aws-java-sdk-cognitoidentity/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cognitoidentity</artifactId>
aws-java-sdk-cognitoidp/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cognitoidp</artifactId>
aws-java-sdk-cognitosync/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-cognitosync</artifactId>
aws-java-sdk-comprehendmedical/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-comprehendmedical</artifactId>
aws-java-sdk-comprehend/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-comprehend</artifactId>
aws-java-sdk-computeoptimizer/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-computeoptimizer</artifactId>
aws-java-sdk-config/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-config</artifactId>
aws-java-sdk-config/src/main/java/com/amazonaws/services/config/AmazonConfigAsync.java+24 −26 modified@@ -3412,12 +3412,9 @@ java.util.concurrent.Future<PutAggregationAuthorizationResult> putAggregationAut * this request. * </p> * <p> - * The maximum number of rules that Config supports is 150. - * </p> - * <p> - * For information about requesting a rule limit increase, see <a - * href="http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_config">Config Limits</a> in - * the <i>Amazon Web Services General Reference Guide</i>. + * For information on how many Config rules you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * For more information about developing and using Config rules, see <a @@ -3466,12 +3463,9 @@ java.util.concurrent.Future<PutAggregationAuthorizationResult> putAggregationAut * this request. * </p> * <p> - * The maximum number of rules that Config supports is 150. - * </p> - * <p> - * For information about requesting a rule limit increase, see <a - * href="http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_config">Config Limits</a> in - * the <i>Amazon Web Services General Reference Guide</i>. + * For information on how many Config rules you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * For more information about developing and using Config rules, see <a @@ -3633,7 +3627,10 @@ java.util.concurrent.Future<PutConfigurationRecorderResult> putConfigurationReco /** * <p> * Creates or updates a conformance pack. A conformance pack is a collection of Config rules that can be easily - * deployed in an account and a region and across Amazon Web Services Organization. + * deployed in an account and a region and across Amazon Web Services Organization. For information on how many + * conformance packs you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * This API creates a service linked role <code>AWSServiceRoleForConfigConforms</code> in your account. The service @@ -3658,7 +3655,10 @@ java.util.concurrent.Future<PutConfigurationRecorderResult> putConfigurationReco /** * <p> * Creates or updates a conformance pack. A conformance pack is a collection of Config rules that can be easily - * deployed in an account and a region and across Amazon Web Services Organization. + * deployed in an account and a region and across Amazon Web Services Organization. For information on how many + * conformance packs you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * This API creates a service linked role <code>AWSServiceRoleForConfigConforms</code> in your account. The service @@ -3817,12 +3817,15 @@ java.util.concurrent.Future<PutExternalEvaluationResult> putExternalEvaluationAs /** * <p> * Adds or updates organization Config rule for your entire organization evaluating whether your Amazon Web Services - * resources comply with your desired configurations. + * resources comply with your desired configurations. For information on how many organization Config rules you can + * have per account, see <a href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> + * <b>Service Limits</b> </a> in the Config Developer Guide. * </p> * <p> * Only a master account and a delegated administrator can create or update an organization Config rule. When * calling this API with a delegated administrator, you must ensure Organizations - * <code>ListDelegatedAdministrator</code> permissions are added. + * <code>ListDelegatedAdministrator</code> permissions are added. An organization can have up to 3 delegated + * administrators. * </p> * <p> * This API enables organization service access through the <code>EnableAWSServiceAccess</code> action and creates a @@ -3843,10 +3846,6 @@ java.util.concurrent.Future<PutExternalEvaluationResult> putExternalEvaluationAs * to Config, you must specify the Amazon Resource Name (ARN) that Lambda assigns to the function. If you are adding * an Config managed rule, specify the rule's identifier for the <code>RuleIdentifier</code> key. * </p> - * <p> - * The maximum number of organization Config rules that Config supports is 150 and 3 delegated administrator per - * organization. - * </p> * <note> * <p> * Prerequisite: Ensure you call <code>EnableAllFeatures</code> API to enable all features in an organization. @@ -3868,12 +3867,15 @@ java.util.concurrent.Future<PutOrganizationConfigRuleResult> putOrganizationConf /** * <p> * Adds or updates organization Config rule for your entire organization evaluating whether your Amazon Web Services - * resources comply with your desired configurations. + * resources comply with your desired configurations. For information on how many organization Config rules you can + * have per account, see <a href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> + * <b>Service Limits</b> </a> in the Config Developer Guide. * </p> * <p> * Only a master account and a delegated administrator can create or update an organization Config rule. When * calling this API with a delegated administrator, you must ensure Organizations - * <code>ListDelegatedAdministrator</code> permissions are added. + * <code>ListDelegatedAdministrator</code> permissions are added. An organization can have up to 3 delegated + * administrators. * </p> * <p> * This API enables organization service access through the <code>EnableAWSServiceAccess</code> action and creates a @@ -3894,10 +3896,6 @@ java.util.concurrent.Future<PutOrganizationConfigRuleResult> putOrganizationConf * to Config, you must specify the Amazon Resource Name (ARN) that Lambda assigns to the function. If you are adding * an Config managed rule, specify the rule's identifier for the <code>RuleIdentifier</code> key. * </p> - * <p> - * The maximum number of organization Config rules that Config supports is 150 and 3 delegated administrator per - * organization. - * </p> * <note> * <p> * Prerequisite: Ensure you call <code>EnableAllFeatures</code> API to enable all features in an organization.
aws-java-sdk-config/src/main/java/com/amazonaws/services/config/AmazonConfigClient.java+12 −13 modified@@ -5889,12 +5889,9 @@ final PutAggregationAuthorizationResult executePutAggregationAuthorization(PutAg * this request. * </p> * <p> - * The maximum number of rules that Config supports is 150. - * </p> - * <p> - * For information about requesting a rule limit increase, see <a - * href="http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_config">Config Limits</a> in - * the <i>Amazon Web Services General Reference Guide</i>. + * For information on how many Config rules you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * For more information about developing and using Config rules, see <a @@ -6255,7 +6252,10 @@ final PutConfigurationRecorderResult executePutConfigurationRecorder(PutConfigur /** * <p> * Creates or updates a conformance pack. A conformance pack is a collection of Config rules that can be easily - * deployed in an account and a region and across Amazon Web Services Organization. + * deployed in an account and a region and across Amazon Web Services Organization. For information on how many + * conformance packs you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * This API creates a service linked role <code>AWSServiceRoleForConfigConforms</code> in your account. The service @@ -6625,12 +6625,15 @@ final PutExternalEvaluationResult executePutExternalEvaluation(PutExternalEvalua /** * <p> * Adds or updates organization Config rule for your entire organization evaluating whether your Amazon Web Services - * resources comply with your desired configurations. + * resources comply with your desired configurations. For information on how many organization Config rules you can + * have per account, see <a href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> + * <b>Service Limits</b> </a> in the Config Developer Guide. * </p> * <p> * Only a master account and a delegated administrator can create or update an organization Config rule. When * calling this API with a delegated administrator, you must ensure Organizations - * <code>ListDelegatedAdministrator</code> permissions are added. + * <code>ListDelegatedAdministrator</code> permissions are added. An organization can have up to 3 delegated + * administrators. * </p> * <p> * This API enables organization service access through the <code>EnableAWSServiceAccess</code> action and creates a @@ -6651,10 +6654,6 @@ final PutExternalEvaluationResult executePutExternalEvaluation(PutExternalEvalua * to Config, you must specify the Amazon Resource Name (ARN) that Lambda assigns to the function. If you are adding * an Config managed rule, specify the rule's identifier for the <code>RuleIdentifier</code> key. * </p> - * <p> - * The maximum number of organization Config rules that Config supports is 150 and 3 delegated administrator per - * organization. - * </p> * <note> * <p> * Prerequisite: Ensure you call <code>EnableAllFeatures</code> API to enable all features in an organization.
aws-java-sdk-config/src/main/java/com/amazonaws/services/config/AmazonConfig.java+12 −13 modified@@ -2657,12 +2657,9 @@ GetOrganizationConformancePackDetailedStatusResult getOrganizationConformancePac * this request. * </p> * <p> - * The maximum number of rules that Config supports is 150. - * </p> - * <p> - * For information about requesting a rule limit increase, see <a - * href="http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_config">Config Limits</a> in - * the <i>Amazon Web Services General Reference Guide</i>. + * For information on how many Config rules you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * For more information about developing and using Config rules, see <a @@ -2893,7 +2890,10 @@ GetOrganizationConformancePackDetailedStatusResult getOrganizationConformancePac /** * <p> * Creates or updates a conformance pack. A conformance pack is a collection of Config rules that can be easily - * deployed in an account and a region and across Amazon Web Services Organization. + * deployed in an account and a region and across Amazon Web Services Organization. For information on how many + * conformance packs you can have per account, see <a + * href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> <b>Service Limits</b> </a> in + * the Config Developer Guide. * </p> * <p> * This API creates a service linked role <code>AWSServiceRoleForConfigConforms</code> in your account. The service @@ -3094,12 +3094,15 @@ GetOrganizationConformancePackDetailedStatusResult getOrganizationConformancePac /** * <p> * Adds or updates organization Config rule for your entire organization evaluating whether your Amazon Web Services - * resources comply with your desired configurations. + * resources comply with your desired configurations. For information on how many organization Config rules you can + * have per account, see <a href="https://docs.aws.amazon.com/config/latest/developerguide/configlimits.html"> + * <b>Service Limits</b> </a> in the Config Developer Guide. * </p> * <p> * Only a master account and a delegated administrator can create or update an organization Config rule. When * calling this API with a delegated administrator, you must ensure Organizations - * <code>ListDelegatedAdministrator</code> permissions are added. + * <code>ListDelegatedAdministrator</code> permissions are added. An organization can have up to 3 delegated + * administrators. * </p> * <p> * This API enables organization service access through the <code>EnableAWSServiceAccess</code> action and creates a @@ -3120,10 +3123,6 @@ GetOrganizationConformancePackDetailedStatusResult getOrganizationConformancePac * to Config, you must specify the Amazon Resource Name (ARN) that Lambda assigns to the function. If you are adding * an Config managed rule, specify the rule's identifier for the <code>RuleIdentifier</code> key. * </p> - * <p> - * The maximum number of organization Config rules that Config supports is 150 and 3 delegated administrator per - * organization. - * </p> * <note> * <p> * Prerequisite: Ensure you call <code>EnableAllFeatures</code> API to enable all features in an organization.
aws-java-sdk-config/src/main/java/com/amazonaws/services/config/model/ResourceType.java+16 −1 modified@@ -139,7 +139,22 @@ public enum ResourceType { AWSECRPublicRepository("AWS::ECR::PublicRepository"), AWSGuardDutyDetector("AWS::GuardDuty::Detector"), AWSEMRSecurityConfiguration("AWS::EMR::SecurityConfiguration"), - AWSSageMakerCodeRepository("AWS::SageMaker::CodeRepository"); + AWSSageMakerCodeRepository("AWS::SageMaker::CodeRepository"), + AWSRoute53ResolverResolverEndpoint("AWS::Route53Resolver::ResolverEndpoint"), + AWSRoute53ResolverResolverRule("AWS::Route53Resolver::ResolverRule"), + AWSRoute53ResolverResolverRuleAssociation("AWS::Route53Resolver::ResolverRuleAssociation"), + AWSDMSReplicationSubnetGroup("AWS::DMS::ReplicationSubnetGroup"), + AWSDMSEventSubscription("AWS::DMS::EventSubscription"), + AWSMSKCluster("AWS::MSK::Cluster"), + AWSStepFunctionsActivity("AWS::StepFunctions::Activity"), + AWSWorkSpacesWorkspace("AWS::WorkSpaces::Workspace"), + AWSWorkSpacesConnectionAlias("AWS::WorkSpaces::ConnectionAlias"), + AWSSageMakerModel("AWS::SageMaker::Model"), + AWSElasticLoadBalancingV2Listener("AWS::ElasticLoadBalancingV2::Listener"), + AWSStepFunctionsStateMachine("AWS::StepFunctions::StateMachine"), + AWSBatchJobQueue("AWS::Batch::JobQueue"), + AWSBatchComputeEnvironment("AWS::Batch::ComputeEnvironment"), + AWSAccessAnalyzerAnalyzer("AWS::AccessAnalyzer::Analyzer"); private String value;
aws-java-sdk-connectcampaign/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-connectcampaign</artifactId>
aws-java-sdk-connectcontactlens/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-connectcontactlens</artifactId>
aws-java-sdk-connectparticipant/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-connectparticipant</artifactId>
aws-java-sdk-connect/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-connect</artifactId>
aws-java-sdk-connectwisdom/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-connectwisdom</artifactId>
aws-java-sdk-core/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-core</artifactId>
aws-java-sdk-core/src/main/resources/com/amazonaws/partitions/endpoints.json+39 −0 modified@@ -12260,6 +12260,29 @@ "us-west-2" : { } } }, + "sso" : { + "endpoints" : { + "ap-east-1" : { }, + "ap-northeast-1" : { }, + "ap-northeast-2" : { }, + "ap-northeast-3" : { }, + "ap-south-1" : { }, + "ap-southeast-1" : { }, + "ap-southeast-2" : { }, + "ca-central-1" : { }, + "eu-central-1" : { }, + "eu-north-1" : { }, + "eu-south-1" : { }, + "eu-west-1" : { }, + "eu-west-2" : { }, + "eu-west-3" : { }, + "me-south-1" : { }, + "sa-east-1" : { }, + "us-east-1" : { }, + "us-east-2" : { }, + "us-west-2" : { } + } + }, "states" : { "endpoints" : { "af-south-1" : { }, @@ -18439,6 +18462,22 @@ } } }, + "sso" : { + "endpoints" : { + "us-gov-east-1" : { + "credentialScope" : { + "region" : "us-gov-east-1" + }, + "hostname" : "sso.us-gov-east-1.amazonaws.com" + }, + "us-gov-west-1" : { + "credentialScope" : { + "region" : "us-gov-west-1" + }, + "hostname" : "sso.us-gov-west-1.amazonaws.com" + } + } + }, "states" : { "endpoints" : { "fips-us-gov-east-1" : {
aws-java-sdk-core/src/main/resources/com/amazonaws/sdk/versionInfo.properties+3 −3 modified@@ -1,4 +1,4 @@ -#Wed Jul 13 19:34:38 UTC 2022 +#Thu Jul 14 19:12:21 UTC 2022 platform=java -version=1.12.260 -internalVersion=6087806706 +version=1.12.261 +internalVersion=6087964231
aws-java-sdk-costandusagereport/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-costandusagereport</artifactId>
aws-java-sdk-costexplorer/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-costexplorer</artifactId>
aws-java-sdk-customerprofiles/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-customerprofiles</artifactId>
aws-java-sdk-dataexchange/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-dataexchange</artifactId>
aws-java-sdk-datapipeline/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-datapipeline</artifactId>
aws-java-sdk-datasync/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-datasync</artifactId>
aws-java-sdk-dax/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-dax</artifactId>
aws-java-sdk-detective/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-detective</artifactId>
aws-java-sdk-devicefarm/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-devicefarm</artifactId>
aws-java-sdk-devopsguru/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-devopsguru</artifactId>
aws-java-sdk-directconnect/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-directconnect</artifactId>
aws-java-sdk-directory/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-directory</artifactId>
aws-java-sdk-discovery/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-discovery</artifactId>
aws-java-sdk-dlm/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-dlm</artifactId>
aws-java-sdk-dms/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-dms</artifactId>
aws-java-sdk-docdb/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-docdb</artifactId>
aws-java-sdk-drs/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-drs</artifactId>
aws-java-sdk-dynamodb/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-dynamodb</artifactId>
aws-java-sdk-ebs/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ebs</artifactId>
aws-java-sdk-ec2instanceconnect/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ec2instanceconnect</artifactId>
aws-java-sdk-ec2/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ec2</artifactId>
aws-java-sdk-ec2/src/main/java/com/amazonaws/services/ec2/model/FlowLogsResourceType.java+3 −1 modified@@ -22,7 +22,9 @@ public enum FlowLogsResourceType { VPC("VPC"), Subnet("Subnet"), - NetworkInterface("NetworkInterface"); + NetworkInterface("NetworkInterface"), + TransitGateway("TransitGateway"), + TransitGatewayAttachment("TransitGatewayAttachment"); private String value;
aws-java-sdk-ecr/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ecr</artifactId>
aws-java-sdk-ecrpublic/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ecrpublic</artifactId>
aws-java-sdk-ecs/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ecs</artifactId>
aws-java-sdk-efs/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-efs</artifactId>
aws-java-sdk-eks/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-eks</artifactId>
aws-java-sdk-elasticache/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-elasticache</artifactId>
aws-java-sdk-elasticbeanstalk/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-elasticbeanstalk</artifactId>
aws-java-sdk-elasticinference/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-elasticinference</artifactId>
aws-java-sdk-elasticloadbalancing/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-elasticloadbalancing</artifactId>
aws-java-sdk-elasticloadbalancingv2/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-elasticloadbalancingv2</artifactId>
aws-java-sdk-elasticsearch/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-elasticsearch</artifactId>
aws-java-sdk-elastictranscoder/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-elastictranscoder</artifactId>
aws-java-sdk-emrcontainers/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-emrcontainers</artifactId>
aws-java-sdk-emr/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-emr</artifactId>
aws-java-sdk-emrserverless/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-emrserverless</artifactId>
aws-java-sdk-eventbridge/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-eventbridge</artifactId>
aws-java-sdk-events/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-events</artifactId>
aws-java-sdk-finspacedata/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-finspacedata</artifactId>
aws-java-sdk-finspace/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-finspace</artifactId>
aws-java-sdk-fis/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-fis</artifactId>
aws-java-sdk-fms/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-fms</artifactId>
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/GetThirdPartyFirewallAssociationStatusResult.java+18 −18 modified@@ -63,13 +63,13 @@ public class GetThirdPartyFirewallAssociationStatusResult extends com.amazonaws. private String thirdPartyFirewallStatus; /** * <p> - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace. + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace. * </p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the third-party - * firewall service in the AWS Marketplace. + * firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -401,13 +401,13 @@ public GetThirdPartyFirewallAssociationStatusResult withThirdPartyFirewallStatus /** * <p> - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace. + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace. * </p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the third-party - * firewall service in the AWS Marketplace. + * firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -425,12 +425,12 @@ public GetThirdPartyFirewallAssociationStatusResult withThirdPartyFirewallStatus * </ul> * * @param marketplaceOnboardingStatus - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace.</p> + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace.</p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the - * third-party firewall service in the AWS Marketplace. + * third-party firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -455,13 +455,13 @@ public void setMarketplaceOnboardingStatus(String marketplaceOnboardingStatus) { /** * <p> - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace. + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace. * </p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the third-party - * firewall service in the AWS Marketplace. + * firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -478,12 +478,12 @@ public void setMarketplaceOnboardingStatus(String marketplaceOnboardingStatus) { * </li> * </ul> * - * @return The status for subscribing to the third-party firewall vendor in the AWS Marketplace.</p> + * @return The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace.</p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the - * third-party firewall service in the AWS Marketplace. + * third-party firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -508,13 +508,13 @@ public String getMarketplaceOnboardingStatus() { /** * <p> - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace. + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace. * </p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the third-party - * firewall service in the AWS Marketplace. + * firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -532,12 +532,12 @@ public String getMarketplaceOnboardingStatus() { * </ul> * * @param marketplaceOnboardingStatus - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace.</p> + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace.</p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the - * third-party firewall service in the AWS Marketplace. + * third-party firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -564,13 +564,13 @@ public GetThirdPartyFirewallAssociationStatusResult withMarketplaceOnboardingSta /** * <p> - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace. + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace. * </p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the third-party - * firewall service in the AWS Marketplace. + * firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li> @@ -588,12 +588,12 @@ public GetThirdPartyFirewallAssociationStatusResult withMarketplaceOnboardingSta * </ul> * * @param marketplaceOnboardingStatus - * The status for subscribing to the third-party firewall vendor in the AWS Marketplace.</p> + * The status for subscribing to the third-party firewall vendor in the Amazon Web Services Marketplace.</p> * <ul> * <li> * <p> * <code>NO_SUBSCRIPTION</code> - The Firewall Manager policy administrator isn't subscribed to the - * third-party firewall service in the AWS Marketplace. + * third-party firewall service in the Amazon Web Services Marketplace. * </p> * </li> * <li>
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/NetworkFirewallPolicyDescription.java+374 −1 modified@@ -58,6 +58,45 @@ public class NetworkFirewallPolicyDescription implements Serializable, Cloneable * </p> */ private java.util.List<StatefulRuleGroup> statefulRuleGroups; + /** + * <p> + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action is + * optional, and is only valid when using the strict rule order. + * </p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + * </ul> + */ + private java.util.List<String> statefulDefaultActions; + /** + * <p> + * Additional options governing how Network Firewall handles stateful rules. The stateful rule groups that you use + * in your policy must have stateful rule options settings that are compatible with these settings. + * </p> + */ + private StatefulEngineOptions statefulEngineOptions; /** * <p> @@ -409,6 +448,326 @@ public NetworkFirewallPolicyDescription withStatefulRuleGroups(java.util.Collect return this; } + /** + * <p> + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action is + * optional, and is only valid when using the strict rule order. + * </p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + * </ul> + * + * @return The default actions to take on a packet that doesn't match any stateful rules. The stateful default + * action is optional, and is only valid when using the strict rule order.</p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + */ + + public java.util.List<String> getStatefulDefaultActions() { + return statefulDefaultActions; + } + + /** + * <p> + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action is + * optional, and is only valid when using the strict rule order. + * </p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + * </ul> + * + * @param statefulDefaultActions + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action + * is optional, and is only valid when using the strict rule order.</p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + */ + + public void setStatefulDefaultActions(java.util.Collection<String> statefulDefaultActions) { + if (statefulDefaultActions == null) { + this.statefulDefaultActions = null; + return; + } + + this.statefulDefaultActions = new java.util.ArrayList<String>(statefulDefaultActions); + } + + /** + * <p> + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action is + * optional, and is only valid when using the strict rule order. + * </p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + * </ul> + * <p> + * <b>NOTE:</b> This method appends the values to the existing list (if any). Use + * {@link #setStatefulDefaultActions(java.util.Collection)} or + * {@link #withStatefulDefaultActions(java.util.Collection)} if you want to override the existing values. + * </p> + * + * @param statefulDefaultActions + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action + * is optional, and is only valid when using the strict rule order.</p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public NetworkFirewallPolicyDescription withStatefulDefaultActions(String... statefulDefaultActions) { + if (this.statefulDefaultActions == null) { + setStatefulDefaultActions(new java.util.ArrayList<String>(statefulDefaultActions.length)); + } + for (String ele : statefulDefaultActions) { + this.statefulDefaultActions.add(ele); + } + return this; + } + + /** + * <p> + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action is + * optional, and is only valid when using the strict rule order. + * </p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + * </ul> + * + * @param statefulDefaultActions + * The default actions to take on a packet that doesn't match any stateful rules. The stateful default action + * is optional, and is only valid when using the strict rule order.</p> + * <p> + * Valid values of the stateful default action: + * </p> + * <ul> + * <li> + * <p> + * aws:drop_strict + * </p> + * </li> + * <li> + * <p> + * aws:drop_established + * </p> + * </li> + * <li> + * <p> + * aws:alert_strict + * </p> + * </li> + * <li> + * <p> + * aws:alert_established + * </p> + * </li> + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public NetworkFirewallPolicyDescription withStatefulDefaultActions(java.util.Collection<String> statefulDefaultActions) { + setStatefulDefaultActions(statefulDefaultActions); + return this; + } + + /** + * <p> + * Additional options governing how Network Firewall handles stateful rules. The stateful rule groups that you use + * in your policy must have stateful rule options settings that are compatible with these settings. + * </p> + * + * @param statefulEngineOptions + * Additional options governing how Network Firewall handles stateful rules. The stateful rule groups that + * you use in your policy must have stateful rule options settings that are compatible with these settings. + */ + + public void setStatefulEngineOptions(StatefulEngineOptions statefulEngineOptions) { + this.statefulEngineOptions = statefulEngineOptions; + } + + /** + * <p> + * Additional options governing how Network Firewall handles stateful rules. The stateful rule groups that you use + * in your policy must have stateful rule options settings that are compatible with these settings. + * </p> + * + * @return Additional options governing how Network Firewall handles stateful rules. The stateful rule groups that + * you use in your policy must have stateful rule options settings that are compatible with these settings. + */ + + public StatefulEngineOptions getStatefulEngineOptions() { + return this.statefulEngineOptions; + } + + /** + * <p> + * Additional options governing how Network Firewall handles stateful rules. The stateful rule groups that you use + * in your policy must have stateful rule options settings that are compatible with these settings. + * </p> + * + * @param statefulEngineOptions + * Additional options governing how Network Firewall handles stateful rules. The stateful rule groups that + * you use in your policy must have stateful rule options settings that are compatible with these settings. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public NetworkFirewallPolicyDescription withStatefulEngineOptions(StatefulEngineOptions statefulEngineOptions) { + setStatefulEngineOptions(statefulEngineOptions); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -430,7 +789,11 @@ public String toString() { if (getStatelessCustomActions() != null) sb.append("StatelessCustomActions: ").append(getStatelessCustomActions()).append(","); if (getStatefulRuleGroups() != null) - sb.append("StatefulRuleGroups: ").append(getStatefulRuleGroups()); + sb.append("StatefulRuleGroups: ").append(getStatefulRuleGroups()).append(","); + if (getStatefulDefaultActions() != null) + sb.append("StatefulDefaultActions: ").append(getStatefulDefaultActions()).append(","); + if (getStatefulEngineOptions() != null) + sb.append("StatefulEngineOptions: ").append(getStatefulEngineOptions()); sb.append("}"); return sb.toString(); } @@ -466,6 +829,14 @@ public boolean equals(Object obj) { return false; if (other.getStatefulRuleGroups() != null && other.getStatefulRuleGroups().equals(this.getStatefulRuleGroups()) == false) return false; + if (other.getStatefulDefaultActions() == null ^ this.getStatefulDefaultActions() == null) + return false; + if (other.getStatefulDefaultActions() != null && other.getStatefulDefaultActions().equals(this.getStatefulDefaultActions()) == false) + return false; + if (other.getStatefulEngineOptions() == null ^ this.getStatefulEngineOptions() == null) + return false; + if (other.getStatefulEngineOptions() != null && other.getStatefulEngineOptions().equals(this.getStatefulEngineOptions()) == false) + return false; return true; } @@ -479,6 +850,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getStatelessFragmentDefaultActions() == null) ? 0 : getStatelessFragmentDefaultActions().hashCode()); hashCode = prime * hashCode + ((getStatelessCustomActions() == null) ? 0 : getStatelessCustomActions().hashCode()); hashCode = prime * hashCode + ((getStatefulRuleGroups() == null) ? 0 : getStatefulRuleGroups().hashCode()); + hashCode = prime * hashCode + ((getStatefulDefaultActions() == null) ? 0 : getStatefulDefaultActions().hashCode()); + hashCode = prime * hashCode + ((getStatefulEngineOptions() == null) ? 0 : getStatefulEngineOptions().hashCode()); return hashCode; }
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/PolicyOption.java+2 −1 modified@@ -19,7 +19,8 @@ /** * <p> - * Contains the Network Firewall firewall policy options to configure a centralized deployment model. + * Contains the Network Firewall firewall policy options to configure the policy's deployment model and third-party + * firewall policy settings. * </p> * * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/PolicyOption" target="_top">AWS API
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/RuleOrder.java+60 −0 added@@ -0,0 +1,60 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.fms.model; + +import javax.annotation.Generated; + +/** + * + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public enum RuleOrder { + + STRICT_ORDER("STRICT_ORDER"), + DEFAULT_ACTION_ORDER("DEFAULT_ACTION_ORDER"); + + private String value; + + private RuleOrder(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.value; + } + + /** + * Use this in place of valueOf. + * + * @param value + * real value + * @return RuleOrder corresponding to the value + * + * @throws IllegalArgumentException + * If the specified value does not map to one of the known values in this enum. + */ + public static RuleOrder fromValue(String value) { + if (value == null || "".equals(value)) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } + + for (RuleOrder enumEntry : RuleOrder.values()) { + if (enumEntry.toString().equals(value)) { + return enumEntry; + } + } + + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } +}
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/SecurityServicePolicyData.java+410 −141 modifiedaws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/StatefulEngineOptions.java+195 −0 added@@ -0,0 +1,195 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.fms.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Configuration settings for the handling of the stateful rule groups in a Network Firewall firewall policy. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/StatefulEngineOptions" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class StatefulEngineOptions implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * Indicates how to manage the order of stateful rule evaluation for the policy. <code>DEFAULT_ACTION_ORDER</code> + * is the default behavior. Stateful rules are provided to the rule engine as Suricata compatible strings, and + * Suricata evaluates them based on certain settings. For more information, see <a + * href="https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * </p> + */ + private String ruleOrder; + + /** + * <p> + * Indicates how to manage the order of stateful rule evaluation for the policy. <code>DEFAULT_ACTION_ORDER</code> + * is the default behavior. Stateful rules are provided to the rule engine as Suricata compatible strings, and + * Suricata evaluates them based on certain settings. For more information, see <a + * href="https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * </p> + * + * @param ruleOrder + * Indicates how to manage the order of stateful rule evaluation for the policy. + * <code>DEFAULT_ACTION_ORDER</code> is the default behavior. Stateful rules are provided to the rule engine + * as Suricata compatible strings, and Suricata evaluates them based on certain settings. For more + * information, see <a href= + * "https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * @see RuleOrder + */ + + public void setRuleOrder(String ruleOrder) { + this.ruleOrder = ruleOrder; + } + + /** + * <p> + * Indicates how to manage the order of stateful rule evaluation for the policy. <code>DEFAULT_ACTION_ORDER</code> + * is the default behavior. Stateful rules are provided to the rule engine as Suricata compatible strings, and + * Suricata evaluates them based on certain settings. For more information, see <a + * href="https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * </p> + * + * @return Indicates how to manage the order of stateful rule evaluation for the policy. + * <code>DEFAULT_ACTION_ORDER</code> is the default behavior. Stateful rules are provided to the rule engine + * as Suricata compatible strings, and Suricata evaluates them based on certain settings. For more + * information, see <a href= + * "https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * @see RuleOrder + */ + + public String getRuleOrder() { + return this.ruleOrder; + } + + /** + * <p> + * Indicates how to manage the order of stateful rule evaluation for the policy. <code>DEFAULT_ACTION_ORDER</code> + * is the default behavior. Stateful rules are provided to the rule engine as Suricata compatible strings, and + * Suricata evaluates them based on certain settings. For more information, see <a + * href="https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * </p> + * + * @param ruleOrder + * Indicates how to manage the order of stateful rule evaluation for the policy. + * <code>DEFAULT_ACTION_ORDER</code> is the default behavior. Stateful rules are provided to the rule engine + * as Suricata compatible strings, and Suricata evaluates them based on certain settings. For more + * information, see <a href= + * "https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * @return Returns a reference to this object so that method calls can be chained together. + * @see RuleOrder + */ + + public StatefulEngineOptions withRuleOrder(String ruleOrder) { + setRuleOrder(ruleOrder); + return this; + } + + /** + * <p> + * Indicates how to manage the order of stateful rule evaluation for the policy. <code>DEFAULT_ACTION_ORDER</code> + * is the default behavior. Stateful rules are provided to the rule engine as Suricata compatible strings, and + * Suricata evaluates them based on certain settings. For more information, see <a + * href="https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * </p> + * + * @param ruleOrder + * Indicates how to manage the order of stateful rule evaluation for the policy. + * <code>DEFAULT_ACTION_ORDER</code> is the default behavior. Stateful rules are provided to the rule engine + * as Suricata compatible strings, and Suricata evaluates them based on certain settings. For more + * information, see <a href= + * "https://docs.aws.amazon.com/network-firewall/latest/developerguide/suricata-rule-evaluation-order.html" + * >Evaluation order for stateful rules</a> in the <i>Network Firewall Developer Guide</i>. + * @return Returns a reference to this object so that method calls can be chained together. + * @see RuleOrder + */ + + public StatefulEngineOptions withRuleOrder(RuleOrder ruleOrder) { + this.ruleOrder = ruleOrder.toString(); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getRuleOrder() != null) + sb.append("RuleOrder: ").append(getRuleOrder()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof StatefulEngineOptions == false) + return false; + StatefulEngineOptions other = (StatefulEngineOptions) obj; + if (other.getRuleOrder() == null ^ this.getRuleOrder() == null) + return false; + if (other.getRuleOrder() != null && other.getRuleOrder().equals(this.getRuleOrder()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getRuleOrder() == null) ? 0 : getRuleOrder().hashCode()); + return hashCode; + } + + @Override + public StatefulEngineOptions clone() { + try { + return (StatefulEngineOptions) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.fms.model.transform.StatefulEngineOptionsMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/StatefulRuleGroup.java+124 −1 modified@@ -40,6 +40,22 @@ public class StatefulRuleGroup implements Serializable, Cloneable, StructuredPoj * </p> */ private String resourceId; + /** + * <p> + * An integer setting that indicates the order in which to run the stateful rule groups in a single Network Firewall + * firewall policy. This setting only applies to firewall policies that specify the <code>STRICT_ORDER</code> rule + * order in the stateful engine options settings. + * </p> + * <p> + * Network Firewall evalutes each stateful rule group against a packet starting with the group that has the lowest + * priority setting. You must ensure that the priority settings are unique within each policy. For information about + * </p> + * <p> + * You can change the priority settings of your rule groups at any time. To make it easier to insert rule groups + * later, number them so there's a wide range in between, for example use 100, 200, and so on. + * </p> + */ + private Integer priority; /** * <p> @@ -121,6 +137,106 @@ public StatefulRuleGroup withResourceId(String resourceId) { return this; } + /** + * <p> + * An integer setting that indicates the order in which to run the stateful rule groups in a single Network Firewall + * firewall policy. This setting only applies to firewall policies that specify the <code>STRICT_ORDER</code> rule + * order in the stateful engine options settings. + * </p> + * <p> + * Network Firewall evalutes each stateful rule group against a packet starting with the group that has the lowest + * priority setting. You must ensure that the priority settings are unique within each policy. For information about + * </p> + * <p> + * You can change the priority settings of your rule groups at any time. To make it easier to insert rule groups + * later, number them so there's a wide range in between, for example use 100, 200, and so on. + * </p> + * + * @param priority + * An integer setting that indicates the order in which to run the stateful rule groups in a single Network + * Firewall firewall policy. This setting only applies to firewall policies that specify the + * <code>STRICT_ORDER</code> rule order in the stateful engine options settings.</p> + * <p> + * Network Firewall evalutes each stateful rule group against a packet starting with the group that has the + * lowest priority setting. You must ensure that the priority settings are unique within each policy. For + * information about + * </p> + * <p> + * You can change the priority settings of your rule groups at any time. To make it easier to insert rule + * groups later, number them so there's a wide range in between, for example use 100, 200, and so on. + */ + + public void setPriority(Integer priority) { + this.priority = priority; + } + + /** + * <p> + * An integer setting that indicates the order in which to run the stateful rule groups in a single Network Firewall + * firewall policy. This setting only applies to firewall policies that specify the <code>STRICT_ORDER</code> rule + * order in the stateful engine options settings. + * </p> + * <p> + * Network Firewall evalutes each stateful rule group against a packet starting with the group that has the lowest + * priority setting. You must ensure that the priority settings are unique within each policy. For information about + * </p> + * <p> + * You can change the priority settings of your rule groups at any time. To make it easier to insert rule groups + * later, number them so there's a wide range in between, for example use 100, 200, and so on. + * </p> + * + * @return An integer setting that indicates the order in which to run the stateful rule groups in a single Network + * Firewall firewall policy. This setting only applies to firewall policies that specify the + * <code>STRICT_ORDER</code> rule order in the stateful engine options settings.</p> + * <p> + * Network Firewall evalutes each stateful rule group against a packet starting with the group that has the + * lowest priority setting. You must ensure that the priority settings are unique within each policy. For + * information about + * </p> + * <p> + * You can change the priority settings of your rule groups at any time. To make it easier to insert rule + * groups later, number them so there's a wide range in between, for example use 100, 200, and so on. + */ + + public Integer getPriority() { + return this.priority; + } + + /** + * <p> + * An integer setting that indicates the order in which to run the stateful rule groups in a single Network Firewall + * firewall policy. This setting only applies to firewall policies that specify the <code>STRICT_ORDER</code> rule + * order in the stateful engine options settings. + * </p> + * <p> + * Network Firewall evalutes each stateful rule group against a packet starting with the group that has the lowest + * priority setting. You must ensure that the priority settings are unique within each policy. For information about + * </p> + * <p> + * You can change the priority settings of your rule groups at any time. To make it easier to insert rule groups + * later, number them so there's a wide range in between, for example use 100, 200, and so on. + * </p> + * + * @param priority + * An integer setting that indicates the order in which to run the stateful rule groups in a single Network + * Firewall firewall policy. This setting only applies to firewall policies that specify the + * <code>STRICT_ORDER</code> rule order in the stateful engine options settings.</p> + * <p> + * Network Firewall evalutes each stateful rule group against a packet starting with the group that has the + * lowest priority setting. You must ensure that the priority settings are unique within each policy. For + * information about + * </p> + * <p> + * You can change the priority settings of your rule groups at any time. To make it easier to insert rule + * groups later, number them so there's a wide range in between, for example use 100, 200, and so on. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public StatefulRuleGroup withPriority(Integer priority) { + setPriority(priority); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -136,7 +252,9 @@ public String toString() { if (getRuleGroupName() != null) sb.append("RuleGroupName: ").append(getRuleGroupName()).append(","); if (getResourceId() != null) - sb.append("ResourceId: ").append(getResourceId()); + sb.append("ResourceId: ").append(getResourceId()).append(","); + if (getPriority() != null) + sb.append("Priority: ").append(getPriority()); sb.append("}"); return sb.toString(); } @@ -159,6 +277,10 @@ public boolean equals(Object obj) { return false; if (other.getResourceId() != null && other.getResourceId().equals(this.getResourceId()) == false) return false; + if (other.getPriority() == null ^ this.getPriority() == null) + return false; + if (other.getPriority() != null && other.getPriority().equals(this.getPriority()) == false) + return false; return true; } @@ -169,6 +291,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getRuleGroupName() == null) ? 0 : getRuleGroupName().hashCode()); hashCode = prime * hashCode + ((getResourceId() == null) ? 0 : getResourceId().hashCode()); + hashCode = prime * hashCode + ((getPriority() == null) ? 0 : getPriority().hashCode()); return hashCode; }
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/ThirdPartyFirewallFirewallPolicy.java+1 −2 modified@@ -19,8 +19,7 @@ /** * <p> - * Configures the firewall policy deployment model for a third-party firewall. The deployment model can either be - * distributed or centralized. + * Configures the third-party firewall's firewall policy. * </p> * * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/ThirdPartyFirewallFirewallPolicy"
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/ThirdPartyFirewallPolicy.java+10 −10 modified@@ -19,7 +19,7 @@ /** * <p> - * Configures the policy for the third-party firewall. + * Configures the deployment model for the third-party firewall. * </p> * * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/ThirdPartyFirewallPolicy" target="_top">AWS API @@ -30,18 +30,18 @@ public class ThirdPartyFirewallPolicy implements Serializable, Cloneable, Struct /** * <p> - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * </p> */ private String firewallDeploymentModel; /** * <p> - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * </p> * * @param firewallDeploymentModel - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * @see FirewallDeploymentModel */ @@ -51,10 +51,10 @@ public void setFirewallDeploymentModel(String firewallDeploymentModel) { /** * <p> - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * </p> * - * @return Defines the deployment model to use for the third-party firewall. + * @return Defines the deployment model to use for the third-party firewall policy. * @see FirewallDeploymentModel */ @@ -64,11 +64,11 @@ public String getFirewallDeploymentModel() { /** * <p> - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * </p> * * @param firewallDeploymentModel - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * @return Returns a reference to this object so that method calls can be chained together. * @see FirewallDeploymentModel */ @@ -80,11 +80,11 @@ public ThirdPartyFirewallPolicy withFirewallDeploymentModel(String firewallDeplo /** * <p> - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * </p> * * @param firewallDeploymentModel - * Defines the deployment model to use for the third-party firewall. + * Defines the deployment model to use for the third-party firewall policy. * @return Returns a reference to this object so that method calls can be chained together. * @see FirewallDeploymentModel */
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/transform/NetworkFirewallPolicyDescriptionJsonUnmarshaller.java+10 −0 modified@@ -80,6 +80,16 @@ public NetworkFirewallPolicyDescription unmarshall(JsonUnmarshallerContext conte .unmarshall(context)); } + if (context.testExpression("StatefulDefaultActions", targetDepth)) { + context.nextToken(); + networkFirewallPolicyDescription.setStatefulDefaultActions(new ListUnmarshaller<String>(context.getUnmarshaller(String.class)) + + .unmarshall(context)); + } + if (context.testExpression("StatefulEngineOptions", targetDepth)) { + context.nextToken(); + networkFirewallPolicyDescription.setStatefulEngineOptions(StatefulEngineOptionsJsonUnmarshaller.getInstance().unmarshall(context)); + } } else if (token == END_ARRAY || token == END_OBJECT) { if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { if (context.getCurrentDepth() <= originalDepth)
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/transform/NetworkFirewallPolicyDescriptionMarshaller.java+6 −0 modified@@ -38,6 +38,10 @@ public class NetworkFirewallPolicyDescriptionMarshaller { .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("StatelessCustomActions").build(); private static final MarshallingInfo<List> STATEFULRULEGROUPS_BINDING = MarshallingInfo.builder(MarshallingType.LIST) .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("StatefulRuleGroups").build(); + private static final MarshallingInfo<List> STATEFULDEFAULTACTIONS_BINDING = MarshallingInfo.builder(MarshallingType.LIST) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("StatefulDefaultActions").build(); + private static final MarshallingInfo<StructuredPojo> STATEFULENGINEOPTIONS_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("StatefulEngineOptions").build(); private static final NetworkFirewallPolicyDescriptionMarshaller instance = new NetworkFirewallPolicyDescriptionMarshaller(); @@ -60,6 +64,8 @@ public void marshall(NetworkFirewallPolicyDescription networkFirewallPolicyDescr protocolMarshaller.marshall(networkFirewallPolicyDescription.getStatelessFragmentDefaultActions(), STATELESSFRAGMENTDEFAULTACTIONS_BINDING); protocolMarshaller.marshall(networkFirewallPolicyDescription.getStatelessCustomActions(), STATELESSCUSTOMACTIONS_BINDING); protocolMarshaller.marshall(networkFirewallPolicyDescription.getStatefulRuleGroups(), STATEFULRULEGROUPS_BINDING); + protocolMarshaller.marshall(networkFirewallPolicyDescription.getStatefulDefaultActions(), STATEFULDEFAULTACTIONS_BINDING); + protocolMarshaller.marshall(networkFirewallPolicyDescription.getStatefulEngineOptions(), STATEFULENGINEOPTIONS_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/transform/StatefulEngineOptionsJsonUnmarshaller.java+74 −0 added@@ -0,0 +1,74 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.fms.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.fms.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * StatefulEngineOptions JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class StatefulEngineOptionsJsonUnmarshaller implements Unmarshaller<StatefulEngineOptions, JsonUnmarshallerContext> { + + public StatefulEngineOptions unmarshall(JsonUnmarshallerContext context) throws Exception { + StatefulEngineOptions statefulEngineOptions = new StatefulEngineOptions(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("RuleOrder", targetDepth)) { + context.nextToken(); + statefulEngineOptions.setRuleOrder(context.getUnmarshaller(String.class).unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return statefulEngineOptions; + } + + private static StatefulEngineOptionsJsonUnmarshaller instance; + + public static StatefulEngineOptionsJsonUnmarshaller getInstance() { + if (instance == null) + instance = new StatefulEngineOptionsJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/transform/StatefulEngineOptionsMarshaller.java+55 −0 added@@ -0,0 +1,55 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.fms.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.fms.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * StatefulEngineOptionsMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class StatefulEngineOptionsMarshaller { + + private static final MarshallingInfo<String> RULEORDER_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("RuleOrder").build(); + + private static final StatefulEngineOptionsMarshaller instance = new StatefulEngineOptionsMarshaller(); + + public static StatefulEngineOptionsMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(StatefulEngineOptions statefulEngineOptions, ProtocolMarshaller protocolMarshaller) { + + if (statefulEngineOptions == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(statefulEngineOptions.getRuleOrder(), RULEORDER_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/transform/StatefulRuleGroupJsonUnmarshaller.java+4 −0 modified@@ -56,6 +56,10 @@ public StatefulRuleGroup unmarshall(JsonUnmarshallerContext context) throws Exce context.nextToken(); statefulRuleGroup.setResourceId(context.getUnmarshaller(String.class).unmarshall(context)); } + if (context.testExpression("Priority", targetDepth)) { + context.nextToken(); + statefulRuleGroup.setPriority(context.getUnmarshaller(Integer.class).unmarshall(context)); + } } else if (token == END_ARRAY || token == END_OBJECT) { if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { if (context.getCurrentDepth() <= originalDepth)
aws-java-sdk-fms/src/main/java/com/amazonaws/services/fms/model/transform/StatefulRuleGroupMarshaller.java+3 −0 modified@@ -31,6 +31,8 @@ public class StatefulRuleGroupMarshaller { .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("RuleGroupName").build(); private static final MarshallingInfo<String> RESOURCEID_BINDING = MarshallingInfo.builder(MarshallingType.STRING) .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("ResourceId").build(); + private static final MarshallingInfo<Integer> PRIORITY_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("Priority").build(); private static final StatefulRuleGroupMarshaller instance = new StatefulRuleGroupMarshaller(); @@ -50,6 +52,7 @@ public void marshall(StatefulRuleGroup statefulRuleGroup, ProtocolMarshaller pro try { protocolMarshaller.marshall(statefulRuleGroup.getRuleGroupName(), RULEGROUPNAME_BINDING); protocolMarshaller.marshall(statefulRuleGroup.getResourceId(), RESOURCEID_BINDING); + protocolMarshaller.marshall(statefulRuleGroup.getPriority(), PRIORITY_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-forecast/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-forecast</artifactId>
aws-java-sdk-forecastquery/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-forecastquery</artifactId>
aws-java-sdk-frauddetector/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-frauddetector</artifactId>
aws-java-sdk-fsx/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-fsx</artifactId>
aws-java-sdk-gamelift/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-gamelift</artifactId>
aws-java-sdk-gamesparks/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-gamesparks</artifactId>
aws-java-sdk-glacier/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-glacier</artifactId>
aws-java-sdk-globalaccelerator/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-globalaccelerator</artifactId>
aws-java-sdk-gluedatabrew/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-gluedatabrew</artifactId>
aws-java-sdk-glue/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-glue</artifactId>
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/AWSGlueAsync.java+6 −6 modified@@ -583,7 +583,7 @@ java.util.concurrent.Future<CancelMLTaskRunResult> cancelMLTaskRunAsync(CancelML /** * <p> - * Cancels the statement.. + * Cancels the statement. * </p> * * @param cancelStatementRequest @@ -596,7 +596,7 @@ java.util.concurrent.Future<CancelMLTaskRunResult> cancelMLTaskRunAsync(CancelML /** * <p> - * Cancels the statement.. + * Cancels the statement. * </p> * * @param cancelStatementRequest @@ -4661,7 +4661,7 @@ java.util.concurrent.Future<ListSchemasResult> listSchemasAsync(ListSchemasReque /** * <p> - * Retrieve a session.. + * Retrieve a list of sessions. * </p> * * @param listSessionsRequest @@ -4674,7 +4674,7 @@ java.util.concurrent.Future<ListSchemasResult> listSchemasAsync(ListSchemasReque /** * <p> - * Retrieve a session.. + * Retrieve a list of sessions. * </p> * * @param listSessionsRequest @@ -6142,7 +6142,7 @@ java.util.concurrent.Future<UpdateDevEndpointResult> updateDevEndpointAsync(Upda /** * <p> - * Updates an existing job definition. + * Updates an existing job definition. The previous job definition is completely overwritten by this information. * </p> * * @param updateJobRequest @@ -6155,7 +6155,7 @@ java.util.concurrent.Future<UpdateDevEndpointResult> updateDevEndpointAsync(Upda /** * <p> - * Updates an existing job definition. + * Updates an existing job definition. The previous job definition is completely overwritten by this information. * </p> * * @param updateJobRequest
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/AWSGlueClient.java+5 −3 modified@@ -1248,7 +1248,7 @@ final CancelMLTaskRunResult executeCancelMLTaskRun(CancelMLTaskRunRequest cancel /** * <p> - * Cancels the statement.. + * Cancels the statement. * </p> * * @param cancelStatementRequest @@ -9014,7 +9014,7 @@ final ListSchemasResult executeListSchemas(ListSchemasRequest listSchemasRequest /** * <p> - * Retrieve a session.. + * Retrieve a list of sessions. * </p> * * @param listSessionsRequest @@ -10037,6 +10037,7 @@ final SearchTablesResult executeSearchTables(SearchTablesRequest searchTablesReq * @throws EntityNotFoundException * A specified entity does not exist * @throws IllegalBlueprintStateException + * The blueprint is in an invalid state to perform a requested operation. * @sample AWSGlue.StartBlueprintRun * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/glue-2017-03-31/StartBlueprintRun" target="_top">AWS API * Documentation</a> @@ -11206,6 +11207,7 @@ final UntagResourceResult executeUntagResource(UntagResourceRequest untagResourc * @throws InternalServiceException * An internal service error occurred. * @throws IllegalBlueprintStateException + * The blueprint is in an invalid state to perform a requested operation. * @sample AWSGlue.UpdateBlueprint * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/glue-2017-03-31/UpdateBlueprint" target="_top">AWS API * Documentation</a> @@ -11789,7 +11791,7 @@ final UpdateDevEndpointResult executeUpdateDevEndpoint(UpdateDevEndpointRequest /** * <p> - * Updates an existing job definition. + * Updates an existing job definition. The previous job definition is completely overwritten by this information. * </p> * * @param updateJobRequest
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/AWSGlue.java+5 −3 modified@@ -401,7 +401,7 @@ public interface AWSGlue { /** * <p> - * Cancels the statement.. + * Cancels the statement. * </p> * * @param cancelStatementRequest @@ -3167,7 +3167,7 @@ DeleteColumnStatisticsForPartitionResult deleteColumnStatisticsForPartition( /** * <p> - * Retrieve a session.. + * Retrieve a list of sessions. * </p> * * @param listSessionsRequest @@ -3548,6 +3548,7 @@ DeleteColumnStatisticsForPartitionResult deleteColumnStatisticsForPartition( * @throws EntityNotFoundException * A specified entity does not exist * @throws IllegalBlueprintStateException + * The blueprint is in an invalid state to perform a requested operation. * @sample AWSGlue.StartBlueprintRun * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/glue-2017-03-31/StartBlueprintRun" target="_top">AWS API * Documentation</a> @@ -3995,6 +3996,7 @@ StartMLLabelingSetGenerationTaskRunResult startMLLabelingSetGenerationTaskRun( * @throws InternalServiceException * An internal service error occurred. * @throws IllegalBlueprintStateException + * The blueprint is in an invalid state to perform a requested operation. * @sample AWSGlue.UpdateBlueprint * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/glue-2017-03-31/UpdateBlueprint" target="_top">AWS API * Documentation</a> @@ -4195,7 +4197,7 @@ UpdateColumnStatisticsForPartitionResult updateColumnStatisticsForPartition( /** * <p> - * Updates an existing job definition. + * Updates an existing job definition. The previous job definition is completely overwritten by this information. * </p> * * @param updateJobRequest
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/CreateJobRequest.java+139 −58 modified@@ -70,6 +70,10 @@ public class CreateJobRequest extends com.amazonaws.AmazonWebServiceRequest impl * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -104,9 +108,9 @@ public class CreateJobRequest extends com.amazonaws.AmazonWebServiceRequest impl * This parameter is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> */ @@ -143,7 +147,7 @@ public class CreateJobRequest extends com.amazonaws.AmazonWebServiceRequest impl * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -192,14 +196,12 @@ public class CreateJobRequest extends com.amazonaws.AmazonWebServiceRequest impl * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> */ private Integer numberOfWorkers; /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -220,6 +222,13 @@ public class CreateJobRequest extends com.amazonaws.AmazonWebServiceRequest impl * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> */ private String workerType; @@ -480,6 +489,10 @@ public CreateJobRequest withCommand(JobCommand command) { * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -496,6 +509,11 @@ public CreateJobRequest withCommand(JobCommand command) { * Glue itself consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue + * Connection, Secrets Manager or other secret management mechanism if you intend to keep them within the + * Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue * APIs in Python</a> topic in the developer guide. @@ -519,6 +537,10 @@ public java.util.Map<String, String> getDefaultArguments() { * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -536,6 +558,11 @@ public java.util.Map<String, String> getDefaultArguments() { * itself consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue + * Connection, Secrets Manager or other secret management mechanism if you intend to keep them within the + * Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue * APIs in Python</a> topic in the developer guide. @@ -559,6 +586,10 @@ public void setDefaultArguments(java.util.Map<String, String> defaultArguments) * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -576,6 +607,11 @@ public void setDefaultArguments(java.util.Map<String, String> defaultArguments) * itself consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue + * Connection, Secrets Manager or other secret management mechanism if you intend to keep them within the + * Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue * APIs in Python</a> topic in the developer guide. @@ -773,16 +809,16 @@ public CreateJobRequest withMaxRetries(Integer maxRetries) { * This parameter is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> * * @param allocatedCapacity * This parameter is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. @@ -797,15 +833,15 @@ public void setAllocatedCapacity(Integer allocatedCapacity) { * This parameter is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> * * @return This parameter is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. @@ -820,16 +856,16 @@ public Integer getAllocatedCapacity() { * This parameter is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> * * @param allocatedCapacity * This parameter is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) to allocate to this Job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. @@ -911,7 +947,7 @@ public CreateJobRequest withTimeout(Integer timeout) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -943,8 +979,8 @@ public CreateJobRequest withTimeout(Integer timeout) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The - * default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. + * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -981,7 +1017,7 @@ public void setMaxCapacity(Double maxCapacity) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1012,7 +1048,7 @@ public void setMaxCapacity(Double maxCapacity) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1050,7 +1086,7 @@ public Double getMaxCapacity() { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1082,8 +1118,8 @@ public Double getMaxCapacity() { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The - * default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. + * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -1348,14 +1384,9 @@ public CreateJobRequest withGlueVersion(String glueVersion) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public void setNumberOfWorkers(Integer numberOfWorkers) { @@ -1366,13 +1397,8 @@ public void setNumberOfWorkers(Integer numberOfWorkers) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * - * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public Integer getNumberOfWorkers() { @@ -1383,14 +1409,9 @@ public Integer getNumberOfWorkers() { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -1401,7 +1422,8 @@ public CreateJobRequest withNumberOfWorkers(Integer numberOfWorkers) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1422,11 +1444,18 @@ public CreateJobRequest withNumberOfWorkers(Integer numberOfWorkers) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1446,6 +1475,13 @@ public CreateJobRequest withNumberOfWorkers(Integer numberOfWorkers) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1455,7 +1491,8 @@ public void setWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1476,10 +1513,17 @@ public void setWorkerType(String workerType) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * - * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1499,6 +1543,13 @@ public void setWorkerType(String workerType) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1508,7 +1559,8 @@ public String getWorkerType() { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1529,11 +1581,18 @@ public String getWorkerType() { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1553,6 +1612,13 @@ public String getWorkerType() { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -1564,7 +1630,8 @@ public CreateJobRequest withWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1585,11 +1652,18 @@ public CreateJobRequest withWorkerType(String workerType) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1609,6 +1683,13 @@ public CreateJobRequest withWorkerType(String workerType) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/CreateSessionRequest.java+285 −37 modified@@ -78,21 +78,49 @@ public class CreateSessionRequest extends com.amazonaws.AmazonWebServiceRequest private ConnectionsList connections; /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> */ private Double maxCapacity; /** * <p> - * The number of workers to use for the session. + * The number of workers of a defined <code>WorkerType</code> to use for the session. * </p> */ private Integer numberOfWorkers; /** * <p> - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, G.2X, + * or G.025X. * </p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 + * executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> + * </ul> */ private String workerType; /** @@ -103,8 +131,8 @@ public class CreateSessionRequest extends com.amazonaws.AmazonWebServiceRequest private String securityConfiguration; /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> */ private String glueVersion; @@ -471,12 +499,12 @@ public CreateSessionRequest withConnections(ConnectionsList connections) { /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> * * @param maxCapacity - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a * relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. */ @@ -486,11 +514,11 @@ public void setMaxCapacity(Double maxCapacity) { /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> * - * @return The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a + * @return The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a * relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. */ @@ -500,12 +528,12 @@ public Double getMaxCapacity() { /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> * * @param maxCapacity - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a * relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -517,11 +545,11 @@ public CreateSessionRequest withMaxCapacity(Double maxCapacity) { /** * <p> - * The number of workers to use for the session. + * The number of workers of a defined <code>WorkerType</code> to use for the session. * </p> * * @param numberOfWorkers - * The number of workers to use for the session. + * The number of workers of a defined <code>WorkerType</code> to use for the session. */ public void setNumberOfWorkers(Integer numberOfWorkers) { @@ -530,10 +558,10 @@ public void setNumberOfWorkers(Integer numberOfWorkers) { /** * <p> - * The number of workers to use for the session. + * The number of workers of a defined <code>WorkerType</code> to use for the session. * </p> * - * @return The number of workers to use for the session. + * @return The number of workers of a defined <code>WorkerType</code> to use for the session. */ public Integer getNumberOfWorkers() { @@ -542,11 +570,11 @@ public Integer getNumberOfWorkers() { /** * <p> - * The number of workers to use for the session. + * The number of workers of a defined <code>WorkerType</code> to use for the session. * </p> * * @param numberOfWorkers - * The number of workers to use for the session. + * The number of workers of a defined <code>WorkerType</code> to use for the session. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -557,11 +585,66 @@ public CreateSessionRequest withNumberOfWorkers(Integer numberOfWorkers) { /** * <p> - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, G.2X, + * or G.025X. + * </p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 + * executors per worker. * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> + * </ul> * * @param workerType - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, + * G.2X, or G.025X.</p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, + * and 2 executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -571,10 +654,65 @@ public void setWorkerType(String workerType) { /** * <p> - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, G.2X, + * or G.025X. + * </p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 + * executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> + * </ul> * - * @return The Worker Type. Can be one of G.1X, G.2X, Standard + * @return The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, + * G.1X, G.2X, or G.025X.</p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, + * and 2 executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -584,11 +722,66 @@ public String getWorkerType() { /** * <p> - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, G.2X, + * or G.025X. + * </p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 + * executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> + * </ul> * * @param workerType - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, + * G.2X, or G.025X.</p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, + * and 2 executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -600,11 +793,66 @@ public CreateSessionRequest withWorkerType(String workerType) { /** * <p> - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, G.2X, + * or G.025X. + * </p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 + * executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and + * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. * </p> + * </li> + * </ul> * * @param workerType - * The Worker Type. Can be one of G.1X, G.2X, Standard + * The type of predefined worker that is allocated to use for the session. Accepts a value of Standard, G.1X, + * G.2X, or G.025X.</p> + * <ul> + * <li> + * <p> + * For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, + * and 2 executors per worker. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.1X</code> worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.2X</code> worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), + * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. + * </p> + * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -656,13 +904,13 @@ public CreateSessionRequest withSecurityConfiguration(String securityConfigurati /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> * * @param glueVersion - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The - * GlueVersion must be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion + * must be greater than 2.0. */ public void setGlueVersion(String glueVersion) { @@ -671,12 +919,12 @@ public void setGlueVersion(String glueVersion) { /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> * - * @return The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The - * GlueVersion must be greater than 2.0. + * @return The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion + * must be greater than 2.0. */ public String getGlueVersion() { @@ -685,13 +933,13 @@ public String getGlueVersion() { /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> * * @param glueVersion - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The - * GlueVersion must be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion + * must be greater than 2.0. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/Edge.java+2 −1 modified@@ -19,7 +19,8 @@ /** * <p> - * An edge represents a directed connection between two components on a workflow graph. + * An edge represents a directed connection between two Glue components that are part of the workflow the edge belongs + * to. * </p> * * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/glue-2017-03-31/Edge" target="_top">AWS API Documentation</a>
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/IllegalBlueprintStateException.java+3 −1 modified@@ -15,7 +15,9 @@ import javax.annotation.Generated; /** - * + * <p> + * The blueprint is in an invalid state to perform a requested operation. + * </p> */ @Generated("com.amazonaws:aws-java-sdk-code-generator") public class IllegalBlueprintStateException extends com.amazonaws.services.glue.model.AWSGlueException {
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/Job.java+103 −53 modified@@ -118,7 +118,7 @@ public class Job implements Serializable, Cloneable, StructuredPojo { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute * capacity and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue * pricing page</a>. @@ -158,7 +158,7 @@ public class Job implements Serializable, Cloneable, StructuredPojo { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -171,7 +171,8 @@ public class Job implements Serializable, Cloneable, StructuredPojo { private Double maxCapacity; /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -192,16 +193,20 @@ public class Job implements Serializable, Cloneable, StructuredPojo { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> */ private String workerType; /** * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> */ private Integer numberOfWorkers; /** @@ -860,7 +865,7 @@ public Job withMaxRetries(Integer maxRetries) { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute * capacity and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue * pricing page</a>. @@ -871,8 +876,8 @@ public Job withMaxRetries(Integer maxRetries) { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate from 2 to - * 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of + * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate a minimum + * of 2 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. * </p> @@ -887,7 +892,7 @@ public void setAllocatedCapacity(Integer allocatedCapacity) { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute * capacity and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue * pricing page</a>. @@ -897,8 +902,8 @@ public void setAllocatedCapacity(Integer allocatedCapacity) { * @return This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate from 2 to - * 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of + * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate a minimum + * of 2 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. * </p> @@ -913,7 +918,7 @@ public Integer getAllocatedCapacity() { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute * capacity and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue * pricing page</a>. @@ -924,8 +929,8 @@ public Integer getAllocatedCapacity() { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate from 2 to - * 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of + * The number of Glue data processing units (DPUs) allocated to runs of this job. You can allocate a minimum + * of 2 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. * </p> @@ -1007,7 +1012,7 @@ public Job withTimeout(Integer timeout) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1039,8 +1044,8 @@ public Job withTimeout(Integer timeout) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The - * default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. + * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -1077,7 +1082,7 @@ public void setMaxCapacity(Double maxCapacity) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1108,7 +1113,7 @@ public void setMaxCapacity(Double maxCapacity) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1146,7 +1151,7 @@ public Double getMaxCapacity() { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1178,8 +1183,8 @@ public Double getMaxCapacity() { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The - * default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. + * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -1196,7 +1201,8 @@ public Job withMaxCapacity(Double maxCapacity) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1217,11 +1223,18 @@ public Job withMaxCapacity(Double maxCapacity) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1241,6 +1254,13 @@ public Job withMaxCapacity(Double maxCapacity) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1250,7 +1270,8 @@ public void setWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1271,10 +1292,17 @@ public void setWorkerType(String workerType) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * - * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1294,6 +1322,13 @@ public void setWorkerType(String workerType) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1303,7 +1338,8 @@ public String getWorkerType() { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1324,11 +1360,18 @@ public String getWorkerType() { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1348,6 +1391,13 @@ public String getWorkerType() { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -1359,7 +1409,8 @@ public Job withWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1380,11 +1431,18 @@ public Job withWorkerType(String workerType) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1404,6 +1462,13 @@ public Job withWorkerType(String workerType) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -1417,14 +1482,9 @@ public Job withWorkerType(WorkerType workerType) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public void setNumberOfWorkers(Integer numberOfWorkers) { @@ -1435,13 +1495,8 @@ public void setNumberOfWorkers(Integer numberOfWorkers) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * - * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public Integer getNumberOfWorkers() { @@ -1452,14 +1507,9 @@ public Integer getNumberOfWorkers() { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/JobRun.java+98 −48 modified@@ -166,16 +166,17 @@ public class JobRun implements Serializable, Cloneable, StructuredPojo { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> */ private Double maxCapacity; /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -196,16 +197,20 @@ public class JobRun implements Serializable, Cloneable, StructuredPojo { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> */ private String workerType; /** * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> */ private Integer numberOfWorkers; /** @@ -1109,8 +1114,8 @@ public JobRun withTimeout(Integer timeout) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -1135,8 +1140,8 @@ public JobRun withTimeout(Integer timeout) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 - * to 100 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a + * minimum of 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> */ @@ -1167,8 +1172,8 @@ public void setMaxCapacity(Double maxCapacity) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -1192,8 +1197,8 @@ public void setMaxCapacity(Double maxCapacity) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from - * 2 to 100 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a + * minimum of 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> */ @@ -1224,8 +1229,8 @@ public Double getMaxCapacity() { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -1250,8 +1255,8 @@ public Double getMaxCapacity() { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 - * to 100 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a + * minimum of 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -1264,7 +1269,8 @@ public JobRun withMaxCapacity(Double maxCapacity) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1285,11 +1291,18 @@ public JobRun withMaxCapacity(Double maxCapacity) { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1309,6 +1322,13 @@ public JobRun withMaxCapacity(Double maxCapacity) { * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1318,7 +1338,8 @@ public void setWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1339,10 +1360,17 @@ public void setWorkerType(String workerType) { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * - * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1362,6 +1390,13 @@ public void setWorkerType(String workerType) { * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1371,7 +1406,8 @@ public String getWorkerType() { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1392,11 +1428,18 @@ public String getWorkerType() { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1416,6 +1459,13 @@ public String getWorkerType() { * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -1427,7 +1477,8 @@ public JobRun withWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1448,11 +1499,18 @@ public JobRun withWorkerType(String workerType) { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1472,6 +1530,13 @@ public JobRun withWorkerType(String workerType) { * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -1485,14 +1550,9 @@ public JobRun withWorkerType(WorkerType workerType) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public void setNumberOfWorkers(Integer numberOfWorkers) { @@ -1503,13 +1563,8 @@ public void setNumberOfWorkers(Integer numberOfWorkers) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * - * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public Integer getNumberOfWorkers() { @@ -1520,14 +1575,9 @@ public Integer getNumberOfWorkers() { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/JobUpdate.java+108 −58 modified@@ -102,9 +102,9 @@ public class JobUpdate implements Serializable, Cloneable, StructuredPojo { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> */ @@ -141,7 +141,7 @@ public class JobUpdate implements Serializable, Cloneable, StructuredPojo { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -154,7 +154,8 @@ public class JobUpdate implements Serializable, Cloneable, StructuredPojo { private Double maxCapacity; /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -175,16 +176,20 @@ public class JobUpdate implements Serializable, Cloneable, StructuredPojo { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> */ private String workerType; /** * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> */ private Integer numberOfWorkers; /** @@ -720,16 +725,16 @@ public JobUpdate withMaxRetries(Integer maxRetries) { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> * * @param allocatedCapacity * This field is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. @@ -744,15 +749,15 @@ public void setAllocatedCapacity(Integer allocatedCapacity) { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> * * @return This field is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. @@ -767,16 +772,16 @@ public Integer getAllocatedCapacity() { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate from 2 to 100 DPUs; the - * default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and - * 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing + * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate a minimum of 2 DPUs; + * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity + * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> * * @param allocatedCapacity * This field is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate from 2 to 100 + * The number of Glue data processing units (DPUs) to allocate to this job. You can allocate a minimum of 2 * DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. @@ -858,7 +863,7 @@ public JobUpdate withTimeout(Integer timeout) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -890,8 +895,8 @@ public JobUpdate withTimeout(Integer timeout) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The - * default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. + * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -928,7 +933,7 @@ public void setMaxCapacity(Double maxCapacity) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -959,7 +964,7 @@ public void setMaxCapacity(Double maxCapacity) { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -997,7 +1002,7 @@ public Double getMaxCapacity() { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark streaming ETL - * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The default is 10 DPUs. + * job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. The default is 10 DPUs. * This job type cannot have a fractional DPU allocation. * </p> * </li> @@ -1029,8 +1034,8 @@ public Double getMaxCapacity() { * <li> * <p> * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl") or Apache Spark - * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate from 2 to 100 DPUs. The - * default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * streaming ETL job (<code>JobCommand.Name</code>="gluestreaming"), you can allocate a minimum of 2 DPUs. + * The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -1047,7 +1052,8 @@ public JobUpdate withMaxCapacity(Double maxCapacity) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1068,11 +1074,18 @@ public JobUpdate withMaxCapacity(Double maxCapacity) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1092,6 +1105,13 @@ public JobUpdate withMaxCapacity(Double maxCapacity) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1101,7 +1121,8 @@ public void setWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1122,10 +1143,17 @@ public void setWorkerType(String workerType) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * - * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1145,6 +1173,13 @@ public void setWorkerType(String workerType) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -1154,7 +1189,8 @@ public String getWorkerType() { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1175,11 +1211,18 @@ public String getWorkerType() { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1199,6 +1242,13 @@ public String getWorkerType() { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -1210,7 +1260,8 @@ public JobUpdate withWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -1231,11 +1282,18 @@ public JobUpdate withWorkerType(String workerType) { * provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -1255,6 +1313,13 @@ public JobUpdate withWorkerType(String workerType) { * and provides 1 executor per worker. We recommend this worker type for memory-intensive jobs. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -1268,14 +1333,9 @@ public JobUpdate withWorkerType(WorkerType workerType) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public void setNumberOfWorkers(Integer numberOfWorkers) { @@ -1286,13 +1346,8 @@ public void setNumberOfWorkers(Integer numberOfWorkers) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * - * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public Integer getNumberOfWorkers() { @@ -1303,14 +1358,9 @@ public Integer getNumberOfWorkers() { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/ListSessionsResult.java+9 −9 modified@@ -25,7 +25,7 @@ public class ListSessionsResult extends com.amazonaws.AmazonWebServiceResult<com /** * <p> - * Returns the Id of the session. + * Returns the ID of the session. * </p> */ private java.util.List<String> ids; @@ -44,10 +44,10 @@ public class ListSessionsResult extends com.amazonaws.AmazonWebServiceResult<com /** * <p> - * Returns the Id of the session. + * Returns the ID of the session. * </p> * - * @return Returns the Id of the session. + * @return Returns the ID of the session. */ public java.util.List<String> getIds() { @@ -56,11 +56,11 @@ public java.util.List<String> getIds() { /** * <p> - * Returns the Id of the session. + * Returns the ID of the session. * </p> * * @param ids - * Returns the Id of the session. + * Returns the ID of the session. */ public void setIds(java.util.Collection<String> ids) { @@ -74,7 +74,7 @@ public void setIds(java.util.Collection<String> ids) { /** * <p> - * Returns the Id of the session. + * Returns the ID of the session. * </p> * <p> * <b>NOTE:</b> This method appends the values to the existing list (if any). Use @@ -83,7 +83,7 @@ public void setIds(java.util.Collection<String> ids) { * </p> * * @param ids - * Returns the Id of the session. + * Returns the ID of the session. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -99,11 +99,11 @@ public ListSessionsResult withIds(String... ids) { /** * <p> - * Returns the Id of the session. + * Returns the ID of the session. * </p> * * @param ids - * Returns the Id of the session. + * Returns the ID of the session. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/ListStatementsRequest.java+20 −2 modified@@ -37,7 +37,11 @@ public class ListStatementsRequest extends com.amazonaws.AmazonWebServiceRequest * </p> */ private String requestOrigin; - + /** + * <p> + * A continuation token, if this is a continuation call. + * </p> + */ private String nextToken; /** @@ -121,23 +125,37 @@ public ListStatementsRequest withRequestOrigin(String requestOrigin) { } /** + * <p> + * A continuation token, if this is a continuation call. + * </p> + * * @param nextToken + * A continuation token, if this is a continuation call. */ public void setNextToken(String nextToken) { this.nextToken = nextToken; } /** - * @return + * <p> + * A continuation token, if this is a continuation call. + * </p> + * + * @return A continuation token, if this is a continuation call. */ public String getNextToken() { return this.nextToken; } /** + * <p> + * A continuation token, if this is a continuation call. + * </p> + * * @param nextToken + * A continuation token, if this is a continuation call. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/ListStatementsResult.java+20 −2 modified@@ -29,7 +29,11 @@ public class ListStatementsResult extends com.amazonaws.AmazonWebServiceResult<c * </p> */ private java.util.List<Statement> statements; - + /** + * <p> + * A continuation token, if not all statements have yet been returned. + * </p> + */ private String nextToken; /** @@ -103,23 +107,37 @@ public ListStatementsResult withStatements(java.util.Collection<Statement> state } /** + * <p> + * A continuation token, if not all statements have yet been returned. + * </p> + * * @param nextToken + * A continuation token, if not all statements have yet been returned. */ public void setNextToken(String nextToken) { this.nextToken = nextToken; } /** - * @return + * <p> + * A continuation token, if not all statements have yet been returned. + * </p> + * + * @return A continuation token, if not all statements have yet been returned. */ public String getNextToken() { return this.nextToken; } /** + * <p> + * A continuation token, if not all statements have yet been returned. + * </p> + * * @param nextToken + * A continuation token, if not all statements have yet been returned. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/SessionCommand.java+7 −7 modified@@ -30,7 +30,7 @@ public class SessionCommand implements Serializable, Cloneable, StructuredPojo { /** * <p> - * Specifies the name of the SessionCommand.Can be 'glueetl' or 'gluestreaming'. + * Specifies the name of the SessionCommand. Can be 'glueetl' or 'gluestreaming'. * </p> */ private String name; @@ -43,11 +43,11 @@ public class SessionCommand implements Serializable, Cloneable, StructuredPojo { /** * <p> - * Specifies the name of the SessionCommand.Can be 'glueetl' or 'gluestreaming'. + * Specifies the name of the SessionCommand. Can be 'glueetl' or 'gluestreaming'. * </p> * * @param name - * Specifies the name of the SessionCommand.Can be 'glueetl' or 'gluestreaming'. + * Specifies the name of the SessionCommand. Can be 'glueetl' or 'gluestreaming'. */ public void setName(String name) { @@ -56,10 +56,10 @@ public void setName(String name) { /** * <p> - * Specifies the name of the SessionCommand.Can be 'glueetl' or 'gluestreaming'. + * Specifies the name of the SessionCommand. Can be 'glueetl' or 'gluestreaming'. * </p> * - * @return Specifies the name of the SessionCommand.Can be 'glueetl' or 'gluestreaming'. + * @return Specifies the name of the SessionCommand. Can be 'glueetl' or 'gluestreaming'. */ public String getName() { @@ -68,11 +68,11 @@ public String getName() { /** * <p> - * Specifies the name of the SessionCommand.Can be 'glueetl' or 'gluestreaming'. + * Specifies the name of the SessionCommand. Can be 'glueetl' or 'gluestreaming'. * </p> * * @param name - * Specifies the name of the SessionCommand.Can be 'glueetl' or 'gluestreaming'. + * Specifies the name of the SessionCommand. Can be 'glueetl' or 'gluestreaming'. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/Session.java+21 −21 modified@@ -89,7 +89,7 @@ public class Session implements Serializable, Cloneable, StructuredPojo { private Double progress; /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> */ @@ -102,8 +102,8 @@ public class Session implements Serializable, Cloneable, StructuredPojo { private String securityConfiguration; /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> */ private String glueVersion; @@ -557,12 +557,12 @@ public Session withProgress(Double progress) { /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> * * @param maxCapacity - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a * relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. */ @@ -572,11 +572,11 @@ public void setMaxCapacity(Double maxCapacity) { /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> * - * @return The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a + * @return The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a * relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. */ @@ -586,12 +586,12 @@ public Double getMaxCapacity() { /** * <p> - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a relative * measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * </p> * * @param maxCapacity - * The number of AWS Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a + * The number of Glue data processing units (DPUs) that can be allocated when the job runs. A DPU is a * relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB memory. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -643,13 +643,13 @@ public Session withSecurityConfiguration(String securityConfiguration) { /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> * * @param glueVersion - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The - * GlueVersion must be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion + * must be greater than 2.0. */ public void setGlueVersion(String glueVersion) { @@ -658,12 +658,12 @@ public void setGlueVersion(String glueVersion) { /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> * - * @return The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The - * GlueVersion must be greater than 2.0. + * @return The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion + * must be greater than 2.0. */ public String getGlueVersion() { @@ -672,13 +672,13 @@ public String getGlueVersion() { /** * <p> - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The GlueVersion must - * be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion must be + * greater than 2.0. * </p> * * @param glueVersion - * The Glue version determines the versions of Apache Spark and Python that AWS Glue supports. The - * GlueVersion must be greater than 2.0. + * The Glue version determines the versions of Apache Spark and Python that Glue supports. The GlueVersion + * must be greater than 2.0. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/StartJobRunRequest.java+139 −58 modified@@ -47,6 +47,10 @@ public class StartJobRunRequest extends com.amazonaws.AmazonWebServiceRequest im * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -63,7 +67,7 @@ public class StartJobRunRequest extends com.amazonaws.AmazonWebServiceRequest im * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be allocated; + * The number of Glue data processing units (DPUs) to allocate to this JobRun. You can allocate a minimum of 2 DPUs; * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. @@ -101,8 +105,8 @@ public class StartJobRunRequest extends com.amazonaws.AmazonWebServiceRequest im * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -122,7 +126,8 @@ public class StartJobRunRequest extends com.amazonaws.AmazonWebServiceRequest im private NotificationProperty notificationProperty; /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -143,16 +148,20 @@ public class StartJobRunRequest extends com.amazonaws.AmazonWebServiceRequest im * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> */ private String workerType; /** * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> */ private Integer numberOfWorkers; @@ -246,6 +255,10 @@ public StartJobRunRequest withJobRunId(String jobRunId) { * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -263,6 +276,11 @@ public StartJobRunRequest withJobRunId(String jobRunId) { * Glue itself consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue + * Connection, Secrets Manager or other secret management mechanism if you intend to keep them within the + * Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue * APIs in Python</a> topic in the developer guide. @@ -287,6 +305,10 @@ public java.util.Map<String, String> getArguments() { * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -305,6 +327,11 @@ public java.util.Map<String, String> getArguments() { * itself consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue + * Connection, Secrets Manager or other secret management mechanism if you intend to keep them within the + * Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue * APIs in Python</a> topic in the developer guide. @@ -329,6 +356,10 @@ public void setArguments(java.util.Map<String, String> arguments) { * consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue Connection, + * Secrets Manager or other secret management mechanism if you intend to keep them within the Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue APIs in * Python</a> topic in the developer guide. @@ -347,6 +378,11 @@ public void setArguments(java.util.Map<String, String> arguments) { * itself consumes. * </p> * <p> + * Job arguments may be logged. Do not pass plaintext secrets as arguments. Retrieve secrets from a Glue + * Connection, Secrets Manager or other secret management mechanism if you intend to keep them within the + * Job. + * </p> + * <p> * For information about how to specify and consume your own Job arguments, see the <a * href="https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html">Calling Glue * APIs in Python</a> topic in the developer guide. @@ -396,7 +432,7 @@ public StartJobRunRequest clearArgumentsEntries() { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be allocated; + * The number of Glue data processing units (DPUs) to allocate to this JobRun. You can allocate a minimum of 2 DPUs; * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. @@ -405,8 +441,8 @@ public StartJobRunRequest clearArgumentsEntries() { * @param allocatedCapacity * This field is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be - * allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of + * The number of Glue data processing units (DPUs) to allocate to this JobRun. You can allocate a minimum of + * 2 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. */ @@ -420,16 +456,16 @@ public void setAllocatedCapacity(Integer allocatedCapacity) { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be allocated; + * The number of Glue data processing units (DPUs) to allocate to this JobRun. You can allocate a minimum of 2 DPUs; * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. * </p> * * @return This field is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be - * allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of + * The number of Glue data processing units (DPUs) to allocate to this JobRun. You can allocate a minimum of + * 2 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. */ @@ -443,7 +479,7 @@ public Integer getAllocatedCapacity() { * This field is deprecated. Use <code>MaxCapacity</code> instead. * </p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be allocated; + * The number of Glue data processing units (DPUs) to allocate to this JobRun. You can allocate a minimum of 2 DPUs; * the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity * and 16 GB of memory. For more information, see the <a href="https://aws.amazon.com/glue/pricing/">Glue pricing * page</a>. @@ -452,8 +488,8 @@ public Integer getAllocatedCapacity() { * @param allocatedCapacity * This field is deprecated. Use <code>MaxCapacity</code> instead.</p> * <p> - * The number of Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be - * allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of + * The number of Glue data processing units (DPUs) to allocate to this JobRun. You can allocate a minimum of + * 2 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of * compute capacity and 16 GB of memory. For more information, see the <a * href="https://aws.amazon.com/glue/pricing/">Glue pricing page</a>. * @return Returns a reference to this object so that method calls can be chained together. @@ -538,8 +574,8 @@ public StartJobRunRequest withTimeout(Integer timeout) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -564,8 +600,8 @@ public StartJobRunRequest withTimeout(Integer timeout) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 - * to 100 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a + * minimum of 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> */ @@ -596,8 +632,8 @@ public void setMaxCapacity(Double maxCapacity) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -621,8 +657,8 @@ public void setMaxCapacity(Double maxCapacity) { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from - * 2 to 100 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a + * minimum of 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> */ @@ -653,8 +689,8 @@ public Double getMaxCapacity() { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 to 100 - * DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a minimum of + * 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * </ul> @@ -679,8 +715,8 @@ public Double getMaxCapacity() { * </li> * <li> * <p> - * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate from 2 - * to 100 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. + * When you specify an Apache Spark ETL job (<code>JobCommand.Name</code>="glueetl"), you can allocate a + * minimum of 2 DPUs. The default is 10 DPUs. This job type cannot have a fractional DPU allocation. * </p> * </li> * @return Returns a reference to this object so that method calls can be chained together. @@ -773,7 +809,8 @@ public StartJobRunRequest withNotificationProperty(NotificationProperty notifica /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -794,11 +831,18 @@ public StartJobRunRequest withNotificationProperty(NotificationProperty notifica * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -818,6 +862,13 @@ public StartJobRunRequest withNotificationProperty(NotificationProperty notifica * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -827,7 +878,8 @@ public void setWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -848,10 +900,17 @@ public void setWorkerType(String workerType) { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * - * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * @return The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -871,6 +930,13 @@ public void setWorkerType(String workerType) { * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @see WorkerType */ @@ -880,7 +946,8 @@ public String getWorkerType() { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -901,11 +968,18 @@ public String getWorkerType() { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -925,6 +999,13 @@ public String getWorkerType() { * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -936,7 +1017,8 @@ public StartJobRunRequest withWorkerType(String workerType) { /** * <p> - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or G.2X. + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or + * G.025X. * </p> * <ul> * <li> @@ -957,11 +1039,18 @@ public StartJobRunRequest withWorkerType(String workerType) { * executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB disk), and + * provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. This worker type is + * only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * </ul> * * @param workerType - * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, or - * G.2X.</p> + * The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, + * or G.025X.</p> * <ul> * <li> * <p> @@ -981,6 +1070,13 @@ public StartJobRunRequest withWorkerType(String workerType) { * 1 executor per worker. * </p> * </li> + * <li> + * <p> + * For the <code>G.025X</code> worker type, each worker maps to 0.25 DPU (2 vCPU, 4 GB of memory, 64 GB + * disk), and provides 1 executor per worker. We recommend this worker type for low volume streaming jobs. + * This worker type is only available for Glue version 3.0 streaming jobs. + * </p> + * </li> * @return Returns a reference to this object so that method calls can be chained together. * @see WorkerType */ @@ -994,14 +1090,9 @@ public StartJobRunRequest withWorkerType(WorkerType workerType) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public void setNumberOfWorkers(Integer numberOfWorkers) { @@ -1012,13 +1103,8 @@ public void setNumberOfWorkers(Integer numberOfWorkers) { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * - * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * @return The number of workers of a defined <code>workerType</code> that are allocated when a job runs. */ public Integer getNumberOfWorkers() { @@ -1029,14 +1115,9 @@ public Integer getNumberOfWorkers() { * <p> * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * </p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. - * </p> * * @param numberOfWorkers - * The number of workers of a defined <code>workerType</code> that are allocated when a job runs.</p> - * <p> - * The maximum number of workers you can define are 299 for <code>G.1X</code>, and 149 for <code>G.2X</code>. + * The number of workers of a defined <code>workerType</code> that are allocated when a job runs. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/UpdateJobRequest.java+14 −7 modified@@ -33,7 +33,8 @@ public class UpdateJobRequest extends com.amazonaws.AmazonWebServiceRequest impl private String jobName; /** * <p> - * Specifies the values with which to update the job definition. + * Specifies the values with which to update the job definition. Unspecified configuration is removed or reset to + * default values. * </p> */ private JobUpdate jobUpdate; @@ -80,11 +81,13 @@ public UpdateJobRequest withJobName(String jobName) { /** * <p> - * Specifies the values with which to update the job definition. + * Specifies the values with which to update the job definition. Unspecified configuration is removed or reset to + * default values. * </p> * * @param jobUpdate - * Specifies the values with which to update the job definition. + * Specifies the values with which to update the job definition. Unspecified configuration is removed or + * reset to default values. */ public void setJobUpdate(JobUpdate jobUpdate) { @@ -93,10 +96,12 @@ public void setJobUpdate(JobUpdate jobUpdate) { /** * <p> - * Specifies the values with which to update the job definition. + * Specifies the values with which to update the job definition. Unspecified configuration is removed or reset to + * default values. * </p> * - * @return Specifies the values with which to update the job definition. + * @return Specifies the values with which to update the job definition. Unspecified configuration is removed or + * reset to default values. */ public JobUpdate getJobUpdate() { @@ -105,11 +110,13 @@ public JobUpdate getJobUpdate() { /** * <p> - * Specifies the values with which to update the job definition. + * Specifies the values with which to update the job definition. Unspecified configuration is removed or reset to + * default values. * </p> * * @param jobUpdate - * Specifies the values with which to update the job definition. + * Specifies the values with which to update the job definition. Unspecified configuration is removed or + * reset to default values. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-glue/src/main/java/com/amazonaws/services/glue/model/WorkerType.java+2 −1 modified@@ -22,7 +22,8 @@ public enum WorkerType { Standard("Standard"), G1X("G.1X"), - G2X("G.2X"); + G2X("G.2X"), + G025X("G.025X"); private String value;
aws-java-sdk-greengrass/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-greengrass</artifactId>
aws-java-sdk-greengrassv2/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-greengrassv2</artifactId>
aws-java-sdk-groundstation/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-groundstation</artifactId>
aws-java-sdk-guardduty/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-guardduty</artifactId>
aws-java-sdk-healthlake/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-healthlake</artifactId>
aws-java-sdk-health/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-health</artifactId>
aws-java-sdk-honeycode/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-honeycode</artifactId>
aws-java-sdk-iam/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iam</artifactId>
aws-java-sdk-iamrolesanywhere/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iamrolesanywhere</artifactId>
aws-java-sdk-identitystore/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-identitystore</artifactId>
aws-java-sdk-imagebuilder/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-imagebuilder</artifactId>
aws-java-sdk-importexport/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-importexport</artifactId>
aws-java-sdk-inspector2/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-inspector2</artifactId>
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/AbstractAWSInspector2Async.java+26 −0 modified@@ -198,6 +198,19 @@ public java.util.concurrent.Future<EnableDelegatedAdminAccountResult> enableDele throw new java.lang.UnsupportedOperationException(); } + @Override + public java.util.concurrent.Future<GetConfigurationResult> getConfigurationAsync(GetConfigurationRequest request) { + + return getConfigurationAsync(request, null); + } + + @Override + public java.util.concurrent.Future<GetConfigurationResult> getConfigurationAsync(GetConfigurationRequest request, + com.amazonaws.handlers.AsyncHandler<GetConfigurationRequest, GetConfigurationResult> asyncHandler) { + + throw new java.lang.UnsupportedOperationException(); + } + @Override public java.util.concurrent.Future<GetDelegatedAdminAccountResult> getDelegatedAdminAccountAsync(GetDelegatedAdminAccountRequest request) { @@ -393,6 +406,19 @@ public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(Untag throw new java.lang.UnsupportedOperationException(); } + @Override + public java.util.concurrent.Future<UpdateConfigurationResult> updateConfigurationAsync(UpdateConfigurationRequest request) { + + return updateConfigurationAsync(request, null); + } + + @Override + public java.util.concurrent.Future<UpdateConfigurationResult> updateConfigurationAsync(UpdateConfigurationRequest request, + com.amazonaws.handlers.AsyncHandler<UpdateConfigurationRequest, UpdateConfigurationResult> asyncHandler) { + + throw new java.lang.UnsupportedOperationException(); + } + @Override public java.util.concurrent.Future<UpdateFilterResult> updateFilterAsync(UpdateFilterRequest request) {
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/AbstractAWSInspector2.java+10 −0 modified@@ -92,6 +92,11 @@ public EnableDelegatedAdminAccountResult enableDelegatedAdminAccount(EnableDeleg throw new java.lang.UnsupportedOperationException(); } + @Override + public GetConfigurationResult getConfiguration(GetConfigurationRequest request) { + throw new java.lang.UnsupportedOperationException(); + } + @Override public GetDelegatedAdminAccountResult getDelegatedAdminAccount(GetDelegatedAdminAccountRequest request) { throw new java.lang.UnsupportedOperationException(); @@ -167,6 +172,11 @@ public UntagResourceResult untagResource(UntagResourceRequest request) { throw new java.lang.UnsupportedOperationException(); } + @Override + public UpdateConfigurationResult updateConfiguration(UpdateConfigurationRequest request) { + throw new java.lang.UnsupportedOperationException(); + } + @Override public UpdateFilterResult updateFilter(UpdateFilterRequest request) { throw new java.lang.UnsupportedOperationException();
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/AWSInspector2AsyncClient.java+66 −0 modified@@ -505,6 +505,39 @@ public EnableDelegatedAdminAccountResult call() throws Exception { }); } + @Override + public java.util.concurrent.Future<GetConfigurationResult> getConfigurationAsync(GetConfigurationRequest request) { + + return getConfigurationAsync(request, null); + } + + @Override + public java.util.concurrent.Future<GetConfigurationResult> getConfigurationAsync(final GetConfigurationRequest request, + final com.amazonaws.handlers.AsyncHandler<GetConfigurationRequest, GetConfigurationResult> asyncHandler) { + final GetConfigurationRequest finalRequest = beforeClientExecution(request); + + return executorService.submit(new java.util.concurrent.Callable<GetConfigurationResult>() { + @Override + public GetConfigurationResult call() throws Exception { + GetConfigurationResult result = null; + + try { + result = executeGetConfiguration(finalRequest); + } catch (Exception ex) { + if (asyncHandler != null) { + asyncHandler.onError(ex); + } + throw ex; + } + + if (asyncHandler != null) { + asyncHandler.onSuccess(finalRequest, result); + } + return result; + } + }); + } + @Override public java.util.concurrent.Future<GetDelegatedAdminAccountResult> getDelegatedAdminAccountAsync(GetDelegatedAdminAccountRequest request) { @@ -1000,6 +1033,39 @@ public UntagResourceResult call() throws Exception { }); } + @Override + public java.util.concurrent.Future<UpdateConfigurationResult> updateConfigurationAsync(UpdateConfigurationRequest request) { + + return updateConfigurationAsync(request, null); + } + + @Override + public java.util.concurrent.Future<UpdateConfigurationResult> updateConfigurationAsync(final UpdateConfigurationRequest request, + final com.amazonaws.handlers.AsyncHandler<UpdateConfigurationRequest, UpdateConfigurationResult> asyncHandler) { + final UpdateConfigurationRequest finalRequest = beforeClientExecution(request); + + return executorService.submit(new java.util.concurrent.Callable<UpdateConfigurationResult>() { + @Override + public UpdateConfigurationResult call() throws Exception { + UpdateConfigurationResult result = null; + + try { + result = executeUpdateConfiguration(finalRequest); + } catch (Exception ex) { + if (asyncHandler != null) { + asyncHandler.onError(ex); + } + throw ex; + } + + if (asyncHandler != null) { + asyncHandler.onSuccess(finalRequest, result); + } + return result; + } + }); + } + @Override public java.util.concurrent.Future<UpdateFilterResult> updateFilterAsync(UpdateFilterRequest request) {
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/AWSInspector2Async.java+66 −0 modified@@ -448,6 +448,37 @@ java.util.concurrent.Future<EnableDelegatedAdminAccountResult> enableDelegatedAd EnableDelegatedAdminAccountRequest enableDelegatedAdminAccountRequest, com.amazonaws.handlers.AsyncHandler<EnableDelegatedAdminAccountRequest, EnableDelegatedAdminAccountResult> asyncHandler); + /** + * <p> + * Retrieves setting configurations for Inspector scans. + * </p> + * + * @param getConfigurationRequest + * @return A Java Future containing the result of the GetConfiguration operation returned by the service. + * @sample AWSInspector2Async.GetConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/GetConfiguration" target="_top">AWS + * API Documentation</a> + */ + java.util.concurrent.Future<GetConfigurationResult> getConfigurationAsync(GetConfigurationRequest getConfigurationRequest); + + /** + * <p> + * Retrieves setting configurations for Inspector scans. + * </p> + * + * @param getConfigurationRequest + * @param asyncHandler + * Asynchronous callback handler for events in the lifecycle of the request. Users can provide an + * implementation of the callback methods in this interface to receive notification of successful or + * unsuccessful completion of the operation. + * @return A Java Future containing the result of the GetConfiguration operation returned by the service. + * @sample AWSInspector2AsyncHandler.GetConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/GetConfiguration" target="_top">AWS + * API Documentation</a> + */ + java.util.concurrent.Future<GetConfigurationResult> getConfigurationAsync(GetConfigurationRequest getConfigurationRequest, + com.amazonaws.handlers.AsyncHandler<GetConfigurationRequest, GetConfigurationResult> asyncHandler); + /** * <p> * Retrieves information about the Amazon Inspector delegated administrator for your organization. @@ -915,6 +946,41 @@ java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceReque java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest untagResourceRequest, com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler); + /** + * <p> + * Updates setting configurations for your Amazon Inspector account. When you use this API as an Amazon Inspector + * delegated administrator this updates the setting for all accounts you manage. Member accounts in an organization + * cannot update this setting. + * </p> + * + * @param updateConfigurationRequest + * @return A Java Future containing the result of the UpdateConfiguration operation returned by the service. + * @sample AWSInspector2Async.UpdateConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/UpdateConfiguration" target="_top">AWS + * API Documentation</a> + */ + java.util.concurrent.Future<UpdateConfigurationResult> updateConfigurationAsync(UpdateConfigurationRequest updateConfigurationRequest); + + /** + * <p> + * Updates setting configurations for your Amazon Inspector account. When you use this API as an Amazon Inspector + * delegated administrator this updates the setting for all accounts you manage. Member accounts in an organization + * cannot update this setting. + * </p> + * + * @param updateConfigurationRequest + * @param asyncHandler + * Asynchronous callback handler for events in the lifecycle of the request. Users can provide an + * implementation of the callback methods in this interface to receive notification of successful or + * unsuccessful completion of the operation. + * @return A Java Future containing the result of the UpdateConfiguration operation returned by the service. + * @sample AWSInspector2AsyncHandler.UpdateConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/UpdateConfiguration" target="_top">AWS + * API Documentation</a> + */ + java.util.concurrent.Future<UpdateConfigurationResult> updateConfigurationAsync(UpdateConfigurationRequest updateConfigurationRequest, + com.amazonaws.handlers.AsyncHandler<UpdateConfigurationRequest, UpdateConfigurationResult> asyncHandler); + /** * <p> * Specifies the action that is to be applied to the findings that match the filter.
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/AWSInspector2Client.java+135 −9 modified@@ -78,27 +78,27 @@ public class AWSInspector2Client extends AmazonWebServiceClient implements AWSIn .withSupportsCbor(false) .withSupportsIon(false) .withContentTypeOverride("application/json") - .addErrorMetadata( - new JsonErrorShapeMetadata().withErrorCode("ThrottlingException").withExceptionUnmarshaller( - com.amazonaws.services.inspector2.model.transform.ThrottlingExceptionUnmarshaller.getInstance())) .addErrorMetadata( new JsonErrorShapeMetadata().withErrorCode("ServiceQuotaExceededException").withExceptionUnmarshaller( com.amazonaws.services.inspector2.model.transform.ServiceQuotaExceededExceptionUnmarshaller.getInstance())) .addErrorMetadata( new JsonErrorShapeMetadata().withErrorCode("InternalServerException").withExceptionUnmarshaller( com.amazonaws.services.inspector2.model.transform.InternalServerExceptionUnmarshaller.getInstance())) - .addErrorMetadata( - new JsonErrorShapeMetadata().withErrorCode("AccessDeniedException").withExceptionUnmarshaller( - com.amazonaws.services.inspector2.model.transform.AccessDeniedExceptionUnmarshaller.getInstance())) - .addErrorMetadata( - new JsonErrorShapeMetadata().withErrorCode("ConflictException").withExceptionUnmarshaller( - com.amazonaws.services.inspector2.model.transform.ConflictExceptionUnmarshaller.getInstance())) .addErrorMetadata( new JsonErrorShapeMetadata().withErrorCode("ResourceNotFoundException").withExceptionUnmarshaller( com.amazonaws.services.inspector2.model.transform.ResourceNotFoundExceptionUnmarshaller.getInstance())) .addErrorMetadata( new JsonErrorShapeMetadata().withErrorCode("ValidationException").withExceptionUnmarshaller( com.amazonaws.services.inspector2.model.transform.ValidationExceptionUnmarshaller.getInstance())) + .addErrorMetadata( + new JsonErrorShapeMetadata().withErrorCode("ThrottlingException").withExceptionUnmarshaller( + com.amazonaws.services.inspector2.model.transform.ThrottlingExceptionUnmarshaller.getInstance())) + .addErrorMetadata( + new JsonErrorShapeMetadata().withErrorCode("AccessDeniedException").withExceptionUnmarshaller( + com.amazonaws.services.inspector2.model.transform.AccessDeniedExceptionUnmarshaller.getInstance())) + .addErrorMetadata( + new JsonErrorShapeMetadata().withErrorCode("ConflictException").withExceptionUnmarshaller( + com.amazonaws.services.inspector2.model.transform.ConflictExceptionUnmarshaller.getInstance())) .addErrorMetadata( new JsonErrorShapeMetadata().withErrorCode("BadRequestException").withExceptionUnmarshaller( com.amazonaws.services.inspector2.model.transform.BadRequestExceptionUnmarshaller.getInstance())) @@ -1004,6 +1004,67 @@ final EnableDelegatedAdminAccountResult executeEnableDelegatedAdminAccount(Enabl } } + /** + * <p> + * Retrieves setting configurations for Inspector scans. + * </p> + * + * @param getConfigurationRequest + * @return Result of the GetConfiguration operation returned by the service. + * @throws ResourceNotFoundException + * The operation tried to access an invalid resource. Make sure the resource is specified correctly. + * @throws ThrottlingException + * The limit on the number of requests per second was exceeded. + * @throws InternalServerException + * The request has failed due to an internal failure of the Amazon Inspector service. + * @sample AWSInspector2.GetConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/GetConfiguration" target="_top">AWS + * API Documentation</a> + */ + @Override + public GetConfigurationResult getConfiguration(GetConfigurationRequest request) { + request = beforeClientExecution(request); + return executeGetConfiguration(request); + } + + @SdkInternalApi + final GetConfigurationResult executeGetConfiguration(GetConfigurationRequest getConfigurationRequest) { + + ExecutionContext executionContext = createExecutionContext(getConfigurationRequest); + AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics(); + awsRequestMetrics.startEvent(Field.ClientExecuteTime); + Request<GetConfigurationRequest> request = null; + Response<GetConfigurationResult> response = null; + + try { + awsRequestMetrics.startEvent(Field.RequestMarshallTime); + try { + request = new GetConfigurationRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(getConfigurationRequest)); + // Binds the request metrics to the current request. + request.setAWSRequestMetrics(awsRequestMetrics); + request.addHandlerContext(HandlerContextKey.CLIENT_ENDPOINT, endpoint); + request.addHandlerContext(HandlerContextKey.ENDPOINT_OVERRIDDEN, isEndpointOverridden()); + request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion()); + request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Inspector2"); + request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "GetConfiguration"); + request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig); + + } finally { + awsRequestMetrics.endEvent(Field.RequestMarshallTime); + } + + HttpResponseHandler<AmazonWebServiceResponse<GetConfigurationResult>> responseHandler = protocolFactory.createResponseHandler( + new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new GetConfigurationResultJsonUnmarshaller()); + response = invoke(request, responseHandler, executionContext); + + return response.getAwsResponse(); + + } finally { + + endClientExecution(awsRequestMetrics, request, response); + } + } + /** * <p> * Retrieves information about the Amazon Inspector delegated administrator for your organization. @@ -1959,6 +2020,71 @@ final UntagResourceResult executeUntagResource(UntagResourceRequest untagResourc } } + /** + * <p> + * Updates setting configurations for your Amazon Inspector account. When you use this API as an Amazon Inspector + * delegated administrator this updates the setting for all accounts you manage. Member accounts in an organization + * cannot update this setting. + * </p> + * + * @param updateConfigurationRequest + * @return Result of the UpdateConfiguration operation returned by the service. + * @throws ValidationException + * The request has failed validation due to missing required fields or having invalid inputs. + * @throws AccessDeniedException + * You do not have sufficient access to perform this action. + * @throws ThrottlingException + * The limit on the number of requests per second was exceeded. + * @throws InternalServerException + * The request has failed due to an internal failure of the Amazon Inspector service. + * @sample AWSInspector2.UpdateConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/UpdateConfiguration" target="_top">AWS + * API Documentation</a> + */ + @Override + public UpdateConfigurationResult updateConfiguration(UpdateConfigurationRequest request) { + request = beforeClientExecution(request); + return executeUpdateConfiguration(request); + } + + @SdkInternalApi + final UpdateConfigurationResult executeUpdateConfiguration(UpdateConfigurationRequest updateConfigurationRequest) { + + ExecutionContext executionContext = createExecutionContext(updateConfigurationRequest); + AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics(); + awsRequestMetrics.startEvent(Field.ClientExecuteTime); + Request<UpdateConfigurationRequest> request = null; + Response<UpdateConfigurationResult> response = null; + + try { + awsRequestMetrics.startEvent(Field.RequestMarshallTime); + try { + request = new UpdateConfigurationRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(updateConfigurationRequest)); + // Binds the request metrics to the current request. + request.setAWSRequestMetrics(awsRequestMetrics); + request.addHandlerContext(HandlerContextKey.CLIENT_ENDPOINT, endpoint); + request.addHandlerContext(HandlerContextKey.ENDPOINT_OVERRIDDEN, isEndpointOverridden()); + request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion()); + request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Inspector2"); + request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "UpdateConfiguration"); + request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig); + + } finally { + awsRequestMetrics.endEvent(Field.RequestMarshallTime); + } + + HttpResponseHandler<AmazonWebServiceResponse<UpdateConfigurationResult>> responseHandler = protocolFactory.createResponseHandler( + new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new UpdateConfigurationResultJsonUnmarshaller()); + response = invoke(request, responseHandler, executionContext); + + return response.getAwsResponse(); + + } finally { + + endClientExecution(awsRequestMetrics, request, response); + } + } + /** * <p> * Specifies the action that is to be applied to the findings that match the filter.
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/AWSInspector2.java+42 −0 modified@@ -341,6 +341,25 @@ public interface AWSInspector2 { */ EnableDelegatedAdminAccountResult enableDelegatedAdminAccount(EnableDelegatedAdminAccountRequest enableDelegatedAdminAccountRequest); + /** + * <p> + * Retrieves setting configurations for Inspector scans. + * </p> + * + * @param getConfigurationRequest + * @return Result of the GetConfiguration operation returned by the service. + * @throws ResourceNotFoundException + * The operation tried to access an invalid resource. Make sure the resource is specified correctly. + * @throws ThrottlingException + * The limit on the number of requests per second was exceeded. + * @throws InternalServerException + * The request has failed due to an internal failure of the Amazon Inspector service. + * @sample AWSInspector2.GetConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/GetConfiguration" target="_top">AWS + * API Documentation</a> + */ + GetConfigurationResult getConfiguration(GetConfigurationRequest getConfigurationRequest); + /** * <p> * Retrieves information about the Amazon Inspector delegated administrator for your organization. @@ -656,6 +675,29 @@ public interface AWSInspector2 { */ UntagResourceResult untagResource(UntagResourceRequest untagResourceRequest); + /** + * <p> + * Updates setting configurations for your Amazon Inspector account. When you use this API as an Amazon Inspector + * delegated administrator this updates the setting for all accounts you manage. Member accounts in an organization + * cannot update this setting. + * </p> + * + * @param updateConfigurationRequest + * @return Result of the UpdateConfiguration operation returned by the service. + * @throws ValidationException + * The request has failed validation due to missing required fields or having invalid inputs. + * @throws AccessDeniedException + * You do not have sufficient access to perform this action. + * @throws ThrottlingException + * The limit on the number of requests per second was exceeded. + * @throws InternalServerException + * The request has failed due to an internal failure of the Amazon Inspector service. + * @sample AWSInspector2.UpdateConfiguration + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/UpdateConfiguration" target="_top">AWS + * API Documentation</a> + */ + UpdateConfigurationResult updateConfiguration(UpdateConfigurationRequest updateConfigurationRequest); + /** * <p> * Specifies the action that is to be applied to the findings that match the filter.
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/CoverageFilterCriteria.java+18 −9 modified@@ -60,7 +60,8 @@ public class CoverageFilterCriteria implements Serializable, Cloneable, Structur private java.util.List<CoverageStringFilter> resourceId; /** * <p> - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. * </p> */ private java.util.List<CoverageStringFilter> resourceType; @@ -435,10 +436,12 @@ public CoverageFilterCriteria withResourceId(java.util.Collection<CoverageString /** * <p> - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. * </p> * - * @return An array of Amazon Web Services resource types to return coverage statistics for. + * @return An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. */ public java.util.List<CoverageStringFilter> getResourceType() { @@ -447,11 +450,13 @@ public java.util.List<CoverageStringFilter> getResourceType() { /** * <p> - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. * </p> * * @param resourceType - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. */ public void setResourceType(java.util.Collection<CoverageStringFilter> resourceType) { @@ -465,7 +470,8 @@ public void setResourceType(java.util.Collection<CoverageStringFilter> resourceT /** * <p> - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. * </p> * <p> * <b>NOTE:</b> This method appends the values to the existing list (if any). Use @@ -474,7 +480,8 @@ public void setResourceType(java.util.Collection<CoverageStringFilter> resourceT * </p> * * @param resourceType - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. * @return Returns a reference to this object so that method calls can be chained together. */ @@ -490,11 +497,13 @@ public CoverageFilterCriteria withResourceType(CoverageStringFilter... resourceT /** * <p> - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. * </p> * * @param resourceType - * An array of Amazon Web Services resource types to return coverage statistics for. + * An array of Amazon Web Services resource types to return coverage statistics for. The values can be + * <code>AWS_EC2_INSTANCE</code> or <code>AWS_ECR_REPOSITORY</code>. * @return Returns a reference to this object so that method calls can be chained together. */
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/CreateFilterRequest.java+53 −0 modified@@ -50,6 +50,12 @@ public class CreateFilterRequest extends com.amazonaws.AmazonWebServiceRequest i * </p> */ private String name; + /** + * <p> + * The reason for creating the filter. + * </p> + */ + private String reason; /** * <p> * A list of tags for the filter. @@ -242,6 +248,46 @@ public CreateFilterRequest withName(String name) { return this; } + /** + * <p> + * The reason for creating the filter. + * </p> + * + * @param reason + * The reason for creating the filter. + */ + + public void setReason(String reason) { + this.reason = reason; + } + + /** + * <p> + * The reason for creating the filter. + * </p> + * + * @return The reason for creating the filter. + */ + + public String getReason() { + return this.reason; + } + + /** + * <p> + * The reason for creating the filter. + * </p> + * + * @param reason + * The reason for creating the filter. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public CreateFilterRequest withReason(String reason) { + setReason(reason); + return this; + } + /** * <p> * A list of tags for the filter. @@ -330,6 +376,8 @@ public String toString() { sb.append("FilterCriteria: ").append(getFilterCriteria()).append(","); if (getName() != null) sb.append("Name: ").append(getName()).append(","); + if (getReason() != null) + sb.append("Reason: ").append(getReason()).append(","); if (getTags() != null) sb.append("Tags: ").append(getTags()); sb.append("}"); @@ -362,6 +410,10 @@ public boolean equals(Object obj) { return false; if (other.getName() != null && other.getName().equals(this.getName()) == false) return false; + if (other.getReason() == null ^ this.getReason() == null) + return false; + if (other.getReason() != null && other.getReason().equals(this.getReason()) == false) + return false; if (other.getTags() == null ^ this.getTags() == null) return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) @@ -378,6 +430,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getFilterCriteria() == null) ? 0 : getFilterCriteria().hashCode()); hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode()); + hashCode = prime * hashCode + ((getReason() == null) ? 0 : getReason().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); return hashCode; }
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/EcrConfiguration.java+177 −0 added@@ -0,0 +1,177 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Details about the ECR automated re-scan duration setting for your environment + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/EcrConfiguration" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class EcrConfiguration implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + */ + private String rescanDuration; + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @param rescanDuration + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are scheduled + * for closure. + * @see EcrRescanDuration + */ + + public void setRescanDuration(String rescanDuration) { + this.rescanDuration = rescanDuration; + } + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @return The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are + * scheduled for closure. + * @see EcrRescanDuration + */ + + public String getRescanDuration() { + return this.rescanDuration; + } + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @param rescanDuration + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are scheduled + * for closure. + * @return Returns a reference to this object so that method calls can be chained together. + * @see EcrRescanDuration + */ + + public EcrConfiguration withRescanDuration(String rescanDuration) { + setRescanDuration(rescanDuration); + return this; + } + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @param rescanDuration + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are scheduled + * for closure. + * @return Returns a reference to this object so that method calls can be chained together. + * @see EcrRescanDuration + */ + + public EcrConfiguration withRescanDuration(EcrRescanDuration rescanDuration) { + this.rescanDuration = rescanDuration.toString(); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getRescanDuration() != null) + sb.append("RescanDuration: ").append(getRescanDuration()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof EcrConfiguration == false) + return false; + EcrConfiguration other = (EcrConfiguration) obj; + if (other.getRescanDuration() == null ^ this.getRescanDuration() == null) + return false; + if (other.getRescanDuration() != null && other.getRescanDuration().equals(this.getRescanDuration()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getRescanDuration() == null) ? 0 : getRescanDuration().hashCode()); + return hashCode; + } + + @Override + public EcrConfiguration clone() { + try { + return (EcrConfiguration) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.inspector2.model.transform.EcrConfigurationMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/EcrConfigurationState.java+136 −0 added@@ -0,0 +1,136 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Details about the state of the ECR scans for your environment. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/EcrConfigurationState" target="_top">AWS + * API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class EcrConfigurationState implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * An object that contains details about the state of the ECR automated re-scan setting. + * </p> + */ + private EcrRescanDurationState rescanDurationState; + + /** + * <p> + * An object that contains details about the state of the ECR automated re-scan setting. + * </p> + * + * @param rescanDurationState + * An object that contains details about the state of the ECR automated re-scan setting. + */ + + public void setRescanDurationState(EcrRescanDurationState rescanDurationState) { + this.rescanDurationState = rescanDurationState; + } + + /** + * <p> + * An object that contains details about the state of the ECR automated re-scan setting. + * </p> + * + * @return An object that contains details about the state of the ECR automated re-scan setting. + */ + + public EcrRescanDurationState getRescanDurationState() { + return this.rescanDurationState; + } + + /** + * <p> + * An object that contains details about the state of the ECR automated re-scan setting. + * </p> + * + * @param rescanDurationState + * An object that contains details about the state of the ECR automated re-scan setting. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public EcrConfigurationState withRescanDurationState(EcrRescanDurationState rescanDurationState) { + setRescanDurationState(rescanDurationState); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getRescanDurationState() != null) + sb.append("RescanDurationState: ").append(getRescanDurationState()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof EcrConfigurationState == false) + return false; + EcrConfigurationState other = (EcrConfigurationState) obj; + if (other.getRescanDurationState() == null ^ this.getRescanDurationState() == null) + return false; + if (other.getRescanDurationState() != null && other.getRescanDurationState().equals(this.getRescanDurationState()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getRescanDurationState() == null) ? 0 : getRescanDurationState().hashCode()); + return hashCode; + } + + @Override + public EcrConfigurationState clone() { + try { + return (EcrConfigurationState) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.inspector2.model.transform.EcrConfigurationStateMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/EcrRescanDuration.java+61 −0 added@@ -0,0 +1,61 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import javax.annotation.Generated; + +/** + * + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public enum EcrRescanDuration { + + LIFETIME("LIFETIME"), + DAYS_30("DAYS_30"), + DAYS_180("DAYS_180"); + + private String value; + + private EcrRescanDuration(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.value; + } + + /** + * Use this in place of valueOf. + * + * @param value + * real value + * @return EcrRescanDuration corresponding to the value + * + * @throws IllegalArgumentException + * If the specified value does not map to one of the known values in this enum. + */ + public static EcrRescanDuration fromValue(String value) { + if (value == null || "".equals(value)) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } + + for (EcrRescanDuration enumEntry : EcrRescanDuration.values()) { + if (enumEntry.toString().equals(value)) { + return enumEntry; + } + } + + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/EcrRescanDurationState.java+302 −0 added@@ -0,0 +1,302 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import java.io.Serializable; +import javax.annotation.Generated; +import com.amazonaws.protocol.StructuredPojo; +import com.amazonaws.protocol.ProtocolMarshaller; + +/** + * <p> + * Details about the state of any changes to the ECR automated re-scan duration setting. + * </p> + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/EcrRescanDurationState" target="_top">AWS + * API Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class EcrRescanDurationState implements Serializable, Cloneable, StructuredPojo { + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + */ + private String rescanDuration; + /** + * <p> + * The status of changes to the ECR automated re-scan duration. + * </p> + */ + private String status; + /** + * <p> + * A timestamp representing when the last time the ECR scan duration setting was changed. + * </p> + */ + private java.util.Date updatedAt; + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @param rescanDuration + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are scheduled + * for closure. + * @see EcrRescanDuration + */ + + public void setRescanDuration(String rescanDuration) { + this.rescanDuration = rescanDuration; + } + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @return The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are + * scheduled for closure. + * @see EcrRescanDuration + */ + + public String getRescanDuration() { + return this.rescanDuration; + } + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @param rescanDuration + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are scheduled + * for closure. + * @return Returns a reference to this object so that method calls can be chained together. + * @see EcrRescanDuration + */ + + public EcrRescanDurationState withRescanDuration(String rescanDuration) { + setRescanDuration(rescanDuration); + return this; + } + + /** + * <p> + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon Inspector. + * When the number of days since an image was last pushed exceeds the automated re-scan duration the monitoring + * state of that image becomes <code>inactive</code> and all associated findings are scheduled for closure. + * </p> + * + * @param rescanDuration + * The ECR automated re-scan duration defines how long an ECR image will be actively scanned by Amazon + * Inspector. When the number of days since an image was last pushed exceeds the automated re-scan duration + * the monitoring state of that image becomes <code>inactive</code> and all associated findings are scheduled + * for closure. + * @return Returns a reference to this object so that method calls can be chained together. + * @see EcrRescanDuration + */ + + public EcrRescanDurationState withRescanDuration(EcrRescanDuration rescanDuration) { + this.rescanDuration = rescanDuration.toString(); + return this; + } + + /** + * <p> + * The status of changes to the ECR automated re-scan duration. + * </p> + * + * @param status + * The status of changes to the ECR automated re-scan duration. + * @see EcrRescanDurationStatus + */ + + public void setStatus(String status) { + this.status = status; + } + + /** + * <p> + * The status of changes to the ECR automated re-scan duration. + * </p> + * + * @return The status of changes to the ECR automated re-scan duration. + * @see EcrRescanDurationStatus + */ + + public String getStatus() { + return this.status; + } + + /** + * <p> + * The status of changes to the ECR automated re-scan duration. + * </p> + * + * @param status + * The status of changes to the ECR automated re-scan duration. + * @return Returns a reference to this object so that method calls can be chained together. + * @see EcrRescanDurationStatus + */ + + public EcrRescanDurationState withStatus(String status) { + setStatus(status); + return this; + } + + /** + * <p> + * The status of changes to the ECR automated re-scan duration. + * </p> + * + * @param status + * The status of changes to the ECR automated re-scan duration. + * @return Returns a reference to this object so that method calls can be chained together. + * @see EcrRescanDurationStatus + */ + + public EcrRescanDurationState withStatus(EcrRescanDurationStatus status) { + this.status = status.toString(); + return this; + } + + /** + * <p> + * A timestamp representing when the last time the ECR scan duration setting was changed. + * </p> + * + * @param updatedAt + * A timestamp representing when the last time the ECR scan duration setting was changed. + */ + + public void setUpdatedAt(java.util.Date updatedAt) { + this.updatedAt = updatedAt; + } + + /** + * <p> + * A timestamp representing when the last time the ECR scan duration setting was changed. + * </p> + * + * @return A timestamp representing when the last time the ECR scan duration setting was changed. + */ + + public java.util.Date getUpdatedAt() { + return this.updatedAt; + } + + /** + * <p> + * A timestamp representing when the last time the ECR scan duration setting was changed. + * </p> + * + * @param updatedAt + * A timestamp representing when the last time the ECR scan duration setting was changed. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public EcrRescanDurationState withUpdatedAt(java.util.Date updatedAt) { + setUpdatedAt(updatedAt); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getRescanDuration() != null) + sb.append("RescanDuration: ").append(getRescanDuration()).append(","); + if (getStatus() != null) + sb.append("Status: ").append(getStatus()).append(","); + if (getUpdatedAt() != null) + sb.append("UpdatedAt: ").append(getUpdatedAt()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof EcrRescanDurationState == false) + return false; + EcrRescanDurationState other = (EcrRescanDurationState) obj; + if (other.getRescanDuration() == null ^ this.getRescanDuration() == null) + return false; + if (other.getRescanDuration() != null && other.getRescanDuration().equals(this.getRescanDuration()) == false) + return false; + if (other.getStatus() == null ^ this.getStatus() == null) + return false; + if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false) + return false; + if (other.getUpdatedAt() == null ^ this.getUpdatedAt() == null) + return false; + if (other.getUpdatedAt() != null && other.getUpdatedAt().equals(this.getUpdatedAt()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getRescanDuration() == null) ? 0 : getRescanDuration().hashCode()); + hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode()); + hashCode = prime * hashCode + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode()); + return hashCode; + } + + @Override + public EcrRescanDurationState clone() { + try { + return (EcrRescanDurationState) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + + @com.amazonaws.annotation.SdkInternalApi + @Override + public void marshall(ProtocolMarshaller protocolMarshaller) { + com.amazonaws.services.inspector2.model.transform.EcrRescanDurationStateMarshaller.getInstance().marshall(this, protocolMarshaller); + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/EcrRescanDurationStatus.java+61 −0 added@@ -0,0 +1,61 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import javax.annotation.Generated; + +/** + * + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public enum EcrRescanDurationStatus { + + SUCCESS("SUCCESS"), + PENDING("PENDING"), + FAILED("FAILED"); + + private String value; + + private EcrRescanDurationStatus(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.value; + } + + /** + * Use this in place of valueOf. + * + * @param value + * real value + * @return EcrRescanDurationStatus corresponding to the value + * + * @throws IllegalArgumentException + * If the specified value does not map to one of the known values in this enum. + */ + public static EcrRescanDurationStatus fromValue(String value) { + if (value == null || "".equals(value)) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } + + for (EcrRescanDurationStatus enumEntry : EcrRescanDurationStatus.values()) { + if (enumEntry.toString().equals(value)) { + return enumEntry; + } + } + + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/ErrorCode.java+2 −1 modified@@ -32,7 +32,8 @@ public enum ErrorCode { EVENTBRIDGE_UNAVAILABLE("EVENTBRIDGE_UNAVAILABLE"), EVENTBRIDGE_THROTTLED("EVENTBRIDGE_THROTTLED"), RESOURCE_SCAN_NOT_DISABLED("RESOURCE_SCAN_NOT_DISABLED"), - DISASSOCIATE_ALL_MEMBERS("DISASSOCIATE_ALL_MEMBERS"); + DISASSOCIATE_ALL_MEMBERS("DISASSOCIATE_ALL_MEMBERS"), + ACCOUNT_IS_ISOLATED("ACCOUNT_IS_ISOLATED"); private String value;
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/GetConfigurationRequest.java+70 −0 added@@ -0,0 +1,70 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +import com.amazonaws.AmazonWebServiceRequest; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/GetConfiguration" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class GetConfigurationRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable { + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof GetConfigurationRequest == false) + return false; + GetConfigurationRequest other = (GetConfigurationRequest) obj; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + return hashCode; + } + + @Override + public GetConfigurationRequest clone() { + return (GetConfigurationRequest) super.clone(); + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/GetConfigurationResult.java+126 −0 added@@ -0,0 +1,126 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/GetConfiguration" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class GetConfigurationResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable { + + /** + * <p> + * Specifies how the ECR automated re-scan duration is currently configured for your environment. + * </p> + */ + private EcrConfigurationState ecrConfiguration; + + /** + * <p> + * Specifies how the ECR automated re-scan duration is currently configured for your environment. + * </p> + * + * @param ecrConfiguration + * Specifies how the ECR automated re-scan duration is currently configured for your environment. + */ + + public void setEcrConfiguration(EcrConfigurationState ecrConfiguration) { + this.ecrConfiguration = ecrConfiguration; + } + + /** + * <p> + * Specifies how the ECR automated re-scan duration is currently configured for your environment. + * </p> + * + * @return Specifies how the ECR automated re-scan duration is currently configured for your environment. + */ + + public EcrConfigurationState getEcrConfiguration() { + return this.ecrConfiguration; + } + + /** + * <p> + * Specifies how the ECR automated re-scan duration is currently configured for your environment. + * </p> + * + * @param ecrConfiguration + * Specifies how the ECR automated re-scan duration is currently configured for your environment. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public GetConfigurationResult withEcrConfiguration(EcrConfigurationState ecrConfiguration) { + setEcrConfiguration(ecrConfiguration); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getEcrConfiguration() != null) + sb.append("EcrConfiguration: ").append(getEcrConfiguration()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof GetConfigurationResult == false) + return false; + GetConfigurationResult other = (GetConfigurationResult) obj; + if (other.getEcrConfiguration() == null ^ this.getEcrConfiguration() == null) + return false; + if (other.getEcrConfiguration() != null && other.getEcrConfiguration().equals(this.getEcrConfiguration()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getEcrConfiguration() == null) ? 0 : getEcrConfiguration().hashCode()); + return hashCode; + } + + @Override + public GetConfigurationResult clone() { + try { + return (GetConfigurationResult) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/PackageManager.java+5 −1 modified@@ -31,7 +31,11 @@ public enum PackageManager { GOBINARY("GOBINARY"), GOMOD("GOMOD"), JAR("JAR"), - OS("OS"); + OS("OS"), + PIP("PIP"), + PYTHONPKG("PYTHONPKG"), + NODEPKG("NODEPKG"), + POM("POM"); private String value;
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/ReportingErrorCode.java+5 −1 modified@@ -21,7 +21,11 @@ public enum ReportingErrorCode { INTERNAL_ERROR("INTERNAL_ERROR"), - INVALID_PERMISSIONS("INVALID_PERMISSIONS"); + INVALID_PERMISSIONS("INVALID_PERMISSIONS"), + NO_FINDINGS_FOUND("NO_FINDINGS_FOUND"), + BUCKET_NOT_FOUND("BUCKET_NOT_FOUND"), + INCOMPATIBLE_BUCKET_REGION("INCOMPATIBLE_BUCKET_REGION"), + MALFORMED_KMS_KEY("MALFORMED_KMS_KEY"); private String value;
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/ScanStatusReason.java+2 −1 modified@@ -32,7 +32,8 @@ public enum ScanStatusReason { IMAGE_SIZE_EXCEEDED("IMAGE_SIZE_EXCEEDED"), SCAN_FREQUENCY_MANUAL("SCAN_FREQUENCY_MANUAL"), SCAN_FREQUENCY_SCAN_ON_PUSH("SCAN_FREQUENCY_SCAN_ON_PUSH"), - EC2_INSTANCE_STOPPED("EC2_INSTANCE_STOPPED"); + EC2_INSTANCE_STOPPED("EC2_INSTANCE_STOPPED"), + PENDING_DISABLE("PENDING_DISABLE"); private String value;
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/CreateFilterRequestMarshaller.java+3 −0 modified@@ -37,6 +37,8 @@ public class CreateFilterRequestMarshaller { .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("filterCriteria").build(); private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) .marshallLocationName("name").build(); + private static final MarshallingInfo<String> REASON_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("reason").build(); private static final MarshallingInfo<Map> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.MAP).marshallLocation(MarshallLocation.PAYLOAD) .marshallLocationName("tags").build(); @@ -60,6 +62,7 @@ public void marshall(CreateFilterRequest createFilterRequest, ProtocolMarshaller protocolMarshaller.marshall(createFilterRequest.getDescription(), DESCRIPTION_BINDING); protocolMarshaller.marshall(createFilterRequest.getFilterCriteria(), FILTERCRITERIA_BINDING); protocolMarshaller.marshall(createFilterRequest.getName(), NAME_BINDING); + protocolMarshaller.marshall(createFilterRequest.getReason(), REASON_BINDING); protocolMarshaller.marshall(createFilterRequest.getTags(), TAGS_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/EcrConfigurationJsonUnmarshaller.java+74 −0 added@@ -0,0 +1,74 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.inspector2.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * EcrConfiguration JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class EcrConfigurationJsonUnmarshaller implements Unmarshaller<EcrConfiguration, JsonUnmarshallerContext> { + + public EcrConfiguration unmarshall(JsonUnmarshallerContext context) throws Exception { + EcrConfiguration ecrConfiguration = new EcrConfiguration(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("rescanDuration", targetDepth)) { + context.nextToken(); + ecrConfiguration.setRescanDuration(context.getUnmarshaller(String.class).unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return ecrConfiguration; + } + + private static EcrConfigurationJsonUnmarshaller instance; + + public static EcrConfigurationJsonUnmarshaller getInstance() { + if (instance == null) + instance = new EcrConfigurationJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/EcrConfigurationMarshaller.java+55 −0 added@@ -0,0 +1,55 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.inspector2.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * EcrConfigurationMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class EcrConfigurationMarshaller { + + private static final MarshallingInfo<String> RESCANDURATION_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("rescanDuration").build(); + + private static final EcrConfigurationMarshaller instance = new EcrConfigurationMarshaller(); + + public static EcrConfigurationMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(EcrConfiguration ecrConfiguration, ProtocolMarshaller protocolMarshaller) { + + if (ecrConfiguration == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(ecrConfiguration.getRescanDuration(), RESCANDURATION_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/EcrConfigurationStateJsonUnmarshaller.java+74 −0 added@@ -0,0 +1,74 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.inspector2.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * EcrConfigurationState JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class EcrConfigurationStateJsonUnmarshaller implements Unmarshaller<EcrConfigurationState, JsonUnmarshallerContext> { + + public EcrConfigurationState unmarshall(JsonUnmarshallerContext context) throws Exception { + EcrConfigurationState ecrConfigurationState = new EcrConfigurationState(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("rescanDurationState", targetDepth)) { + context.nextToken(); + ecrConfigurationState.setRescanDurationState(EcrRescanDurationStateJsonUnmarshaller.getInstance().unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return ecrConfigurationState; + } + + private static EcrConfigurationStateJsonUnmarshaller instance; + + public static EcrConfigurationStateJsonUnmarshaller getInstance() { + if (instance == null) + instance = new EcrConfigurationStateJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/EcrConfigurationStateMarshaller.java+55 −0 added@@ -0,0 +1,55 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.inspector2.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * EcrConfigurationStateMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class EcrConfigurationStateMarshaller { + + private static final MarshallingInfo<StructuredPojo> RESCANDURATIONSTATE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("rescanDurationState").build(); + + private static final EcrConfigurationStateMarshaller instance = new EcrConfigurationStateMarshaller(); + + public static EcrConfigurationStateMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(EcrConfigurationState ecrConfigurationState, ProtocolMarshaller protocolMarshaller) { + + if (ecrConfigurationState == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(ecrConfigurationState.getRescanDurationState(), RESCANDURATIONSTATE_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/EcrRescanDurationStateJsonUnmarshaller.java+82 −0 added@@ -0,0 +1,82 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.inspector2.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * EcrRescanDurationState JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class EcrRescanDurationStateJsonUnmarshaller implements Unmarshaller<EcrRescanDurationState, JsonUnmarshallerContext> { + + public EcrRescanDurationState unmarshall(JsonUnmarshallerContext context) throws Exception { + EcrRescanDurationState ecrRescanDurationState = new EcrRescanDurationState(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return null; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("rescanDuration", targetDepth)) { + context.nextToken(); + ecrRescanDurationState.setRescanDuration(context.getUnmarshaller(String.class).unmarshall(context)); + } + if (context.testExpression("status", targetDepth)) { + context.nextToken(); + ecrRescanDurationState.setStatus(context.getUnmarshaller(String.class).unmarshall(context)); + } + if (context.testExpression("updatedAt", targetDepth)) { + context.nextToken(); + ecrRescanDurationState.setUpdatedAt(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return ecrRescanDurationState; + } + + private static EcrRescanDurationStateJsonUnmarshaller instance; + + public static EcrRescanDurationStateJsonUnmarshaller getInstance() { + if (instance == null) + instance = new EcrRescanDurationStateJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/EcrRescanDurationStateMarshaller.java+61 −0 added@@ -0,0 +1,61 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.inspector2.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * EcrRescanDurationStateMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class EcrRescanDurationStateMarshaller { + + private static final MarshallingInfo<String> RESCANDURATION_BINDING = MarshallingInfo.builder(MarshallingType.STRING) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("rescanDuration").build(); + private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("status").build(); + private static final MarshallingInfo<java.util.Date> UPDATEDAT_BINDING = MarshallingInfo.builder(MarshallingType.DATE) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("updatedAt").timestampFormat("unixTimestamp").build(); + + private static final EcrRescanDurationStateMarshaller instance = new EcrRescanDurationStateMarshaller(); + + public static EcrRescanDurationStateMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(EcrRescanDurationState ecrRescanDurationState, ProtocolMarshaller protocolMarshaller) { + + if (ecrRescanDurationState == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(ecrRescanDurationState.getRescanDuration(), RESCANDURATION_BINDING); + protocolMarshaller.marshall(ecrRescanDurationState.getStatus(), STATUS_BINDING); + protocolMarshaller.marshall(ecrRescanDurationState.getUpdatedAt(), UPDATEDAT_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/GetConfigurationRequestMarshaller.java+51 −0 added@@ -0,0 +1,51 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.inspector2.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * GetConfigurationRequestMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class GetConfigurationRequestMarshaller { + + private static final GetConfigurationRequestMarshaller instance = new GetConfigurationRequestMarshaller(); + + public static GetConfigurationRequestMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(GetConfigurationRequest getConfigurationRequest, ProtocolMarshaller protocolMarshaller) { + + if (getConfigurationRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/GetConfigurationRequestProtocolMarshaller.java+62 −0 added@@ -0,0 +1,62 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.Request; + +import com.amazonaws.http.HttpMethodName; +import com.amazonaws.services.inspector2.model.*; +import com.amazonaws.transform.Marshaller; + +import com.amazonaws.protocol.*; +import com.amazonaws.protocol.Protocol; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * GetConfigurationRequest Marshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class GetConfigurationRequestProtocolMarshaller implements Marshaller<Request<GetConfigurationRequest>, GetConfigurationRequest> { + + private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/configuration/get") + .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSInspector2").build(); + + private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory; + + public GetConfigurationRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) { + this.protocolFactory = protocolFactory; + } + + public Request<GetConfigurationRequest> marshall(GetConfigurationRequest getConfigurationRequest) { + + if (getConfigurationRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + final ProtocolRequestMarshaller<GetConfigurationRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING, + getConfigurationRequest); + + protocolMarshaller.startMarshalling(); + GetConfigurationRequestMarshaller.getInstance().marshall(getConfigurationRequest, protocolMarshaller); + return protocolMarshaller.finishMarshalling(); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/GetConfigurationResultJsonUnmarshaller.java+74 −0 added@@ -0,0 +1,74 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.inspector2.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import com.fasterxml.jackson.core.JsonToken; +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * GetConfigurationResult JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class GetConfigurationResultJsonUnmarshaller implements Unmarshaller<GetConfigurationResult, JsonUnmarshallerContext> { + + public GetConfigurationResult unmarshall(JsonUnmarshallerContext context) throws Exception { + GetConfigurationResult getConfigurationResult = new GetConfigurationResult(); + + int originalDepth = context.getCurrentDepth(); + String currentParentElement = context.getCurrentParentElement(); + int targetDepth = originalDepth + 1; + + JsonToken token = context.getCurrentToken(); + if (token == null) + token = context.nextToken(); + if (token == VALUE_NULL) { + return getConfigurationResult; + } + + while (true) { + if (token == null) + break; + + if (token == FIELD_NAME || token == START_OBJECT) { + if (context.testExpression("ecrConfiguration", targetDepth)) { + context.nextToken(); + getConfigurationResult.setEcrConfiguration(EcrConfigurationStateJsonUnmarshaller.getInstance().unmarshall(context)); + } + } else if (token == END_ARRAY || token == END_OBJECT) { + if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) { + if (context.getCurrentDepth() <= originalDepth) + break; + } + } + token = context.nextToken(); + } + + return getConfigurationResult; + } + + private static GetConfigurationResultJsonUnmarshaller instance; + + public static GetConfigurationResultJsonUnmarshaller getInstance() { + if (instance == null) + instance = new GetConfigurationResultJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/UpdateConfigurationRequestMarshaller.java+55 −0 added@@ -0,0 +1,55 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.services.inspector2.model.*; + +import com.amazonaws.protocol.*; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * UpdateConfigurationRequestMarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class UpdateConfigurationRequestMarshaller { + + private static final MarshallingInfo<StructuredPojo> ECRCONFIGURATION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED) + .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("ecrConfiguration").build(); + + private static final UpdateConfigurationRequestMarshaller instance = new UpdateConfigurationRequestMarshaller(); + + public static UpdateConfigurationRequestMarshaller getInstance() { + return instance; + } + + /** + * Marshall the given parameter object. + */ + public void marshall(UpdateConfigurationRequest updateConfigurationRequest, ProtocolMarshaller protocolMarshaller) { + + if (updateConfigurationRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + protocolMarshaller.marshall(updateConfigurationRequest.getEcrConfiguration(), ECRCONFIGURATION_BINDING); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/UpdateConfigurationRequestProtocolMarshaller.java+62 −0 added@@ -0,0 +1,62 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import javax.annotation.Generated; + +import com.amazonaws.SdkClientException; +import com.amazonaws.Request; + +import com.amazonaws.http.HttpMethodName; +import com.amazonaws.services.inspector2.model.*; +import com.amazonaws.transform.Marshaller; + +import com.amazonaws.protocol.*; +import com.amazonaws.protocol.Protocol; +import com.amazonaws.annotation.SdkInternalApi; + +/** + * UpdateConfigurationRequest Marshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +@SdkInternalApi +public class UpdateConfigurationRequestProtocolMarshaller implements Marshaller<Request<UpdateConfigurationRequest>, UpdateConfigurationRequest> { + + private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/configuration/update") + .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSInspector2").build(); + + private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory; + + public UpdateConfigurationRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) { + this.protocolFactory = protocolFactory; + } + + public Request<UpdateConfigurationRequest> marshall(UpdateConfigurationRequest updateConfigurationRequest) { + + if (updateConfigurationRequest == null) { + throw new SdkClientException("Invalid argument passed to marshall(...)"); + } + + try { + final ProtocolRequestMarshaller<UpdateConfigurationRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING, + updateConfigurationRequest); + + protocolMarshaller.startMarshalling(); + UpdateConfigurationRequestMarshaller.getInstance().marshall(updateConfigurationRequest, protocolMarshaller); + return protocolMarshaller.finishMarshalling(); + } catch (Exception e) { + throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/UpdateConfigurationResultJsonUnmarshaller.java+44 −0 added@@ -0,0 +1,44 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model.transform; + +import java.math.*; + +import javax.annotation.Generated; + +import com.amazonaws.services.inspector2.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; + +import static com.fasterxml.jackson.core.JsonToken.*; + +/** + * UpdateConfigurationResult JSON Unmarshaller + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class UpdateConfigurationResultJsonUnmarshaller implements Unmarshaller<UpdateConfigurationResult, JsonUnmarshallerContext> { + + public UpdateConfigurationResult unmarshall(JsonUnmarshallerContext context) throws Exception { + UpdateConfigurationResult updateConfigurationResult = new UpdateConfigurationResult(); + + return updateConfigurationResult; + } + + private static UpdateConfigurationResultJsonUnmarshaller instance; + + public static UpdateConfigurationResultJsonUnmarshaller getInstance() { + if (instance == null) + instance = new UpdateConfigurationResultJsonUnmarshaller(); + return instance; + } +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/transform/UpdateFilterRequestMarshaller.java+3 −0 modified@@ -37,6 +37,8 @@ public class UpdateFilterRequestMarshaller { .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("filterCriteria").build(); private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) .marshallLocationName("name").build(); + private static final MarshallingInfo<String> REASON_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD) + .marshallLocationName("reason").build(); private static final UpdateFilterRequestMarshaller instance = new UpdateFilterRequestMarshaller(); @@ -59,6 +61,7 @@ public void marshall(UpdateFilterRequest updateFilterRequest, ProtocolMarshaller protocolMarshaller.marshall(updateFilterRequest.getFilterArn(), FILTERARN_BINDING); protocolMarshaller.marshall(updateFilterRequest.getFilterCriteria(), FILTERCRITERIA_BINDING); protocolMarshaller.marshall(updateFilterRequest.getName(), NAME_BINDING); + protocolMarshaller.marshall(updateFilterRequest.getReason(), REASON_BINDING); } catch (Exception e) { throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e); }
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/UpdateConfigurationRequest.java+124 −0 added@@ -0,0 +1,124 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +import com.amazonaws.AmazonWebServiceRequest; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/UpdateConfiguration" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class UpdateConfigurationRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable { + + /** + * <p> + * Specifies how the ECR automated re-scan will be updated for your environment. + * </p> + */ + private EcrConfiguration ecrConfiguration; + + /** + * <p> + * Specifies how the ECR automated re-scan will be updated for your environment. + * </p> + * + * @param ecrConfiguration + * Specifies how the ECR automated re-scan will be updated for your environment. + */ + + public void setEcrConfiguration(EcrConfiguration ecrConfiguration) { + this.ecrConfiguration = ecrConfiguration; + } + + /** + * <p> + * Specifies how the ECR automated re-scan will be updated for your environment. + * </p> + * + * @return Specifies how the ECR automated re-scan will be updated for your environment. + */ + + public EcrConfiguration getEcrConfiguration() { + return this.ecrConfiguration; + } + + /** + * <p> + * Specifies how the ECR automated re-scan will be updated for your environment. + * </p> + * + * @param ecrConfiguration + * Specifies how the ECR automated re-scan will be updated for your environment. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public UpdateConfigurationRequest withEcrConfiguration(EcrConfiguration ecrConfiguration) { + setEcrConfiguration(ecrConfiguration); + return this; + } + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getEcrConfiguration() != null) + sb.append("EcrConfiguration: ").append(getEcrConfiguration()); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof UpdateConfigurationRequest == false) + return false; + UpdateConfigurationRequest other = (UpdateConfigurationRequest) obj; + if (other.getEcrConfiguration() == null ^ this.getEcrConfiguration() == null) + return false; + if (other.getEcrConfiguration() != null && other.getEcrConfiguration().equals(this.getEcrConfiguration()) == false) + return false; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getEcrConfiguration() == null) ? 0 : getEcrConfiguration().hashCode()); + return hashCode; + } + + @Override + public UpdateConfigurationRequest clone() { + return (UpdateConfigurationRequest) super.clone(); + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/UpdateConfigurationResult.java+72 −0 added@@ -0,0 +1,72 @@ +/* + * Copyright 2017-2022 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 com.amazonaws.services.inspector2.model; + +import java.io.Serializable; +import javax.annotation.Generated; + +/** + * + * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/inspector2-2020-06-08/UpdateConfiguration" target="_top">AWS API + * Documentation</a> + */ +@Generated("com.amazonaws:aws-java-sdk-code-generator") +public class UpdateConfigurationResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable { + + /** + * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be + * redacted from this string using a placeholder value. + * + * @return A string representation of this object. + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + sb.append("}"); + return sb.toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof UpdateConfigurationResult == false) + return false; + UpdateConfigurationResult other = (UpdateConfigurationResult) obj; + return true; + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + return hashCode; + } + + @Override + public UpdateConfigurationResult clone() { + try { + return (UpdateConfigurationResult) super.clone(); + } catch (CloneNotSupportedException e) { + throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e); + } + } + +}
aws-java-sdk-inspector2/src/main/java/com/amazonaws/services/inspector2/model/UpdateFilterRequest.java+54 −1 modified@@ -55,6 +55,12 @@ public class UpdateFilterRequest extends com.amazonaws.AmazonWebServiceRequest i * </p> */ private String name; + /** + * <p> + * The reason the filter was updated. + * </p> + */ + private String reason; /** * <p> @@ -275,6 +281,46 @@ public UpdateFilterRequest withName(String name) { return this; } + /** + * <p> + * The reason the filter was updated. + * </p> + * + * @param reason + * The reason the filter was updated. + */ + + public void setReason(String reason) { + this.reason = reason; + } + + /** + * <p> + * The reason the filter was updated. + * </p> + * + * @return The reason the filter was updated. + */ + + public String getReason() { + return this.reason; + } + + /** + * <p> + * The reason the filter was updated. + * </p> + * + * @param reason + * The reason the filter was updated. + * @return Returns a reference to this object so that method calls can be chained together. + */ + + public UpdateFilterRequest withReason(String reason) { + setReason(reason); + return this; + } + /** * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be * redacted from this string using a placeholder value. @@ -296,7 +342,9 @@ public String toString() { if (getFilterCriteria() != null) sb.append("FilterCriteria: ").append(getFilterCriteria()).append(","); if (getName() != null) - sb.append("Name: ").append(getName()); + sb.append("Name: ").append(getName()).append(","); + if (getReason() != null) + sb.append("Reason: ").append(getReason()); sb.append("}"); return sb.toString(); } @@ -331,6 +379,10 @@ public boolean equals(Object obj) { return false; if (other.getName() != null && other.getName().equals(this.getName()) == false) return false; + if (other.getReason() == null ^ this.getReason() == null) + return false; + if (other.getReason() != null && other.getReason().equals(this.getReason()) == false) + return false; return true; } @@ -344,6 +396,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getFilterArn() == null) ? 0 : getFilterArn().hashCode()); hashCode = prime * hashCode + ((getFilterCriteria() == null) ? 0 : getFilterCriteria().hashCode()); hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode()); + hashCode = prime * hashCode + ((getReason() == null) ? 0 : getReason().hashCode()); return hashCode; }
aws-java-sdk-inspector/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-inspector</artifactId>
aws-java-sdk-iot1clickdevices/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iot1clickdevices</artifactId>
aws-java-sdk-iot1clickprojects/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iot1clickprojects</artifactId>
aws-java-sdk-iotanalytics/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iotanalytics</artifactId>
aws-java-sdk-iotdeviceadvisor/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iotdeviceadvisor</artifactId>
aws-java-sdk-ioteventsdata/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-ioteventsdata</artifactId>
aws-java-sdk-iotevents/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iotevents</artifactId>
aws-java-sdk-iotfleethub/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iotfleethub</artifactId>
aws-java-sdk-iot/pom.xml+1 −1 modified@@ -5,7 +5,7 @@ <parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-pom</artifactId> - <version>1.12.261-SNAPSHOT</version> + <version>1.12.261</version> </parent> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-iot</artifactId>
CHANGELOG.md+49 −0 modified@@ -1,3 +1,52 @@ +# __1.12.261__ __2022-07-14__ +## __AWS Config__ + - ### Features + - Update ResourceType enum with values for Route53Resolver, Batch, DMS, Workspaces, Stepfunctions, SageMaker, ElasticLoadBalancingV2, MSK types + +## __AWS Glue__ + - ### Features + - This release adds an additional worker type for Glue Streaming jobs. + +## __AWS Outposts__ + - ### Features + - This release adds the ShipmentInformation and AssetInformationList fields to the GetOrder API response. + +## __AWSKendraFrontendService__ + - ### Features + - This release adds AccessControlConfigurations which allow you to redefine your document level access control without the need for content re-indexing. + +## __Amazon Athena__ + - ### Features + - This release updates data types that contain either QueryExecutionId, NamedQueryId or ExpectedBucketOwner. Ids must be between 1 and 128 characters and contain only non-whitespace characters. ExpectedBucketOwner must be 12-digit string. + +## __Amazon Elastic Compute Cloud__ + - ### Features + - This release adds flow logs for Transit Gateway to allow customers to gain deeper visibility and insights into network traffic through their Transit Gateways. + +## __Amazon S3__ + - ### Bugfixes + - Fixed possible issue in TransferManager's downloadDirectory operation where files could be downloaded to some sibling directories of the destination directory if the key contained specially-crafted relative paths. + +## __Amazon SageMaker Service__ + - ### Features + - This release adds support for G5, P4d, and C6i instance types in Amazon SageMaker Inference and increases the number of hyperparameters that can be searched from 20 to 30 in Amazon SageMaker Automatic Model Tuning + +## __AmazonNimbleStudio__ + - ### Features + - Amazon Nimble Studio adds support for IAM-based access to AWS resources for Nimble Studio components and custom studio components. Studio Component scripts use these roles on Nimble Studio workstation to mount filesystems, access S3 buckets, or other configured resources in the Studio's AWS account + +## __CodeArtifact__ + - ### Features + - This release introduces Package Origin Controls, a mechanism used to counteract Dependency Confusion attacks. Adds two new APIs, PutPackageOriginConfiguration and DescribePackage, and updates the ListPackage, DescribePackageVersion and ListPackageVersion APIs in support of the feature. + +## __Firewall Management Service__ + - ### Features + - Adds support for strict ordering in stateful rule groups in Network Firewall policies. + +## __Inspector2__ + - ### Features + - This release adds support for Inspector V2 scan configurations through the get and update configuration APIs. Currently this allows configuring ECR automated re-scan duration to lifetime or 180 days or 30 days. + # __1.12.260__ __2022-07-13__ ## __Amazon AppConfig__ - ### Features
README.md+1 −1 modified@@ -51,7 +51,7 @@ dependencies. <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-bom</artifactId> - <version>1.12.260</version> + <version>1.12.261</version> <type>pom</type> <scope>import</scope> </dependency>
Vulnerability mechanics
Generated on May 9, 2026. Inputs: CWE entries + fix-commit diffs from this CVE's patches. Citations validated against bundle.
References
4- github.com/advisories/GHSA-c28r-hw5m-5gv3ghsaADVISORY
- nvd.nist.gov/vuln/detail/CVE-2022-31159ghsaADVISORY
- github.com/aws/aws-sdk-java/commit/cb66c50c885566d9a7fce837a68dc48ddced8a9aghsaWEB
- github.com/aws/aws-sdk-java/security/advisories/GHSA-c28r-hw5m-5gv3ghsax_refsource_CONFIRMWEB
News mentions
0No linked articles in our index yet.