Skip to content

Commit

Permalink
AWS SDK for Java 1.11.610
Browse files Browse the repository at this point in the history
  • Loading branch information
AWS committed Aug 13, 2019
1 parent a82e71c commit b628c4f
Show file tree
Hide file tree
Showing 255 changed files with 561 additions and 263 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,12 @@
# __1.11.610__ __2019-08-13__
## __AWS AppSync__
- ### Features
- Adds a configuration option for AppSync GraphQL APIs

## __AWS SDK for Java__
- ### Bugfixes
- Fix a bug where `ClientConfiguration#getProxyPassword()` and `ClientConfiguration#getProxyUsername()` can fail with a `NullPointException` if `HTTP_PROXY` or `HTTPS_PROXY` is set and does not contain a user info part. Fixes [#2070](https://github.com/aws/aws-sdk-java/issues/2070).

# __1.11.609__ __2019-08-12__
## __Amazon CloudWatch__
- ### Features
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -45,7 +45,7 @@ dependencies.
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.11.609</version>
<version>1.11.610</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-acm/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-acm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-acmpca/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-acmpca</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-alexaforbusiness/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-alexaforbusiness</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-amplify/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-amplify</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-api-gateway/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-api-gateway</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-apigatewaymanagementapi/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-apigatewaymanagementapi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-apigatewayv2/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-apigatewayv2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-applicationautoscaling/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-applicationautoscaling</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-applicationinsights/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-applicationinsights</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-appmesh/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-appmesh</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-appstream/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-appstream</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-appsync/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-appsync</artifactId>
Expand Down
Expand Up @@ -86,6 +86,13 @@ public class LogConfig implements Serializable, Cloneable, StructuredPojo {
* </p>
*/
private String cloudWatchLogsRoleArn;
/**
* <p>
* Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
* </p>
*/
private Boolean excludeVerboseContent;

/**
* <p>
Expand Down Expand Up @@ -550,6 +557,66 @@ public LogConfig withCloudWatchLogsRoleArn(String cloudWatchLogsRoleArn) {
return this;
}

/**
* <p>
* Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
* </p>
*
* @param excludeVerboseContent
* Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
*/

public void setExcludeVerboseContent(Boolean excludeVerboseContent) {
this.excludeVerboseContent = excludeVerboseContent;
}

/**
* <p>
* Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
* </p>
*
* @return Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
*/

public Boolean getExcludeVerboseContent() {
return this.excludeVerboseContent;
}

/**
* <p>
* Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
* </p>
*
* @param excludeVerboseContent
* Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
* @return Returns a reference to this object so that method calls can be chained together.
*/

public LogConfig withExcludeVerboseContent(Boolean excludeVerboseContent) {
setExcludeVerboseContent(excludeVerboseContent);
return this;
}

/**
* <p>
* Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
* </p>
*
* @return Set to TRUE to exclude sections that contain information such as headers, context, and evaluated mapping
* templates, regardless of logging level.
*/

public Boolean isExcludeVerboseContent() {
return this.excludeVerboseContent;
}

/**
* 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.
Expand All @@ -565,7 +632,9 @@ public String toString() {
if (getFieldLogLevel() != null)
sb.append("FieldLogLevel: ").append(getFieldLogLevel()).append(",");
if (getCloudWatchLogsRoleArn() != null)
sb.append("CloudWatchLogsRoleArn: ").append(getCloudWatchLogsRoleArn());
sb.append("CloudWatchLogsRoleArn: ").append(getCloudWatchLogsRoleArn()).append(",");
if (getExcludeVerboseContent() != null)
sb.append("ExcludeVerboseContent: ").append(getExcludeVerboseContent());
sb.append("}");
return sb.toString();
}
Expand All @@ -588,6 +657,10 @@ public boolean equals(Object obj) {
return false;
if (other.getCloudWatchLogsRoleArn() != null && other.getCloudWatchLogsRoleArn().equals(this.getCloudWatchLogsRoleArn()) == false)
return false;
if (other.getExcludeVerboseContent() == null ^ this.getExcludeVerboseContent() == null)
return false;
if (other.getExcludeVerboseContent() != null && other.getExcludeVerboseContent().equals(this.getExcludeVerboseContent()) == false)
return false;
return true;
}

Expand All @@ -598,6 +671,7 @@ public int hashCode() {

hashCode = prime * hashCode + ((getFieldLogLevel() == null) ? 0 : getFieldLogLevel().hashCode());
hashCode = prime * hashCode + ((getCloudWatchLogsRoleArn() == null) ? 0 : getCloudWatchLogsRoleArn().hashCode());
hashCode = prime * hashCode + ((getExcludeVerboseContent() == null) ? 0 : getExcludeVerboseContent().hashCode());
return hashCode;
}

Expand Down
Expand Up @@ -56,6 +56,10 @@ public LogConfig unmarshall(JsonUnmarshallerContext context) throws Exception {
context.nextToken();
logConfig.setCloudWatchLogsRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
}
if (context.testExpression("excludeVerboseContent", targetDepth)) {
context.nextToken();
logConfig.setExcludeVerboseContent(context.getUnmarshaller(Boolean.class).unmarshall(context));
}
} else if (token == END_ARRAY || token == END_OBJECT) {
if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
if (context.getCurrentDepth() <= originalDepth)
Expand Down
Expand Up @@ -31,6 +31,8 @@ public class LogConfigMarshaller {
.marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("fieldLogLevel").build();
private static final MarshallingInfo<String> CLOUDWATCHLOGSROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
.marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("cloudWatchLogsRoleArn").build();
private static final MarshallingInfo<Boolean> EXCLUDEVERBOSECONTENT_BINDING = MarshallingInfo.builder(MarshallingType.BOOLEAN)
.marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("excludeVerboseContent").build();

private static final LogConfigMarshaller instance = new LogConfigMarshaller();

Expand All @@ -50,6 +52,7 @@ public void marshall(LogConfig logConfig, ProtocolMarshaller protocolMarshaller)
try {
protocolMarshaller.marshall(logConfig.getFieldLogLevel(), FIELDLOGLEVEL_BINDING);
protocolMarshaller.marshall(logConfig.getCloudWatchLogsRoleArn(), CLOUDWATCHLOGSROLEARN_BINDING);
protocolMarshaller.marshall(logConfig.getExcludeVerboseContent(), EXCLUDEVERBOSECONTENT_BINDING);
} catch (Exception e) {
throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
}
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-athena/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-athena</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-autoscaling/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-autoscaling</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-autoscalingplans/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-autoscalingplans</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-backup/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-backup</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-batch/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-batch</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-bom/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-budgets/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-budgets</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions aws-java-sdk-bundle/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bundle</artifactId>
Expand All @@ -24,7 +24,7 @@
<artifactId>aws-java-sdk</artifactId>
<groupId>com.amazonaws</groupId>
<optional>false</optional>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-chime/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-chime</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloud9/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloud9</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-clouddirectory/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-clouddirectory</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudformation/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudformation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aws-java-sdk-cloudfront/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-pom</artifactId>
<version>1.11.610-SNAPSHOT</version>
<version>1.11.610</version>
</parent>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cloudfront</artifactId>
Expand Down

0 comments on commit b628c4f

Please sign in to comment.