Skip to content

Commit 115b989

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #529 from aws/staging/edd3fc07-a074-4f88-9378-cab0a7aac854
Pull request: release <- staging/edd3fc07-a074-4f88-9378-cab0a7aac854
2 parents db2a5ef + 766c00a commit 115b989

File tree

222 files changed

+314
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+314
-259
lines changed

‎.changes/2.5.59.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "2.5.59",
3+
"date": "2019-06-07",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"description": "Allow customers to disable read and write timeout by setting `Duration.ZERO` to `readTimeout` and `writeTimeout`. See [#1281](https://github.com/aws/aws-sdk-java-v2/issues/1281)"
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon Elastic Compute Cloud",
13+
"description": "Adds DNS entries and NLB ARNs to describe-vpc-endpoint-connections API response. Adds owner ID to describe-vpc-endpoints and create-vpc-endpoint API responses."
14+
}
15+
]
16+
}

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# __2.5.59__ __2019-06-07__
2+
## __AWS SDK for Java v2__
3+
- ### Bugfixes
4+
- Allow customers to disable read and write timeout by setting `Duration.ZERO` to `readTimeout` and `writeTimeout`. See [#1281](https://github.com/aws/aws-sdk-java-v2/issues/1281)
5+
6+
## __Amazon Elastic Compute Cloud__
7+
- ### Features
8+
- Adds DNS entries and NLB ARNs to describe-vpc-endpoint-connections API response. Adds owner ID to describe-vpc-endpoints and create-vpc-endpoint API responses.
9+
110
# __2.5.58__ __2019-06-06__
211
## __AWS MediaConnect__
312
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can import the whole SDK into your project (includes all services) as follow
4646
<dependency>
4747
<groupId>software.amazon.awssdk</groupId>
4848
<artifactId>aws-sdk-java</artifactId>
49-
<version>2.5.58</version>
49+
<version>2.5.59</version>
5050
</dependency>
5151
```
5252

@@ -58,12 +58,12 @@ Alternatively you can add dependencies for the specific services you use only:
5858
<dependency>
5959
<groupId>software.amazon.awssdk</groupId>
6060
<artifactId>ec2</artifactId>
61-
<version>2.5.58</version>
61+
<version>2.5.59</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>software.amazon.awssdk</groupId>
6565
<artifactId>s3</artifactId>
66-
<version>2.5.58</version>
66+
<version>2.5.59</version>
6767
</dependency>
6868
```
6969

@@ -77,7 +77,7 @@ To automatically manage module versions (currently all modules have the same ver
7777
<dependency>
7878
<groupId>software.amazon.awssdk</groupId>
7979
<artifactId>bom</artifactId>
80-
<version>2.5.58</version>
80+
<version>2.5.59</version>
8181
<type>pom</type>
8282
<scope>import</scope>
8383
</dependency>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.58</version>
7+
<version>2.5.59</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>aws-sdk-java-pom</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.58</version>
7+
<version>2.5.59</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>bom</artifactId>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>aws-sdk-java-pom</artifactId>
10-
<version>2.5.58</version>
10+
<version>2.5.59</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>software.amazon.awssdk</groupId>
88
<artifactId>aws-sdk-java-pom</artifactId>
9-
<version>2.5.58</version>
9+
<version>2.5.59</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.5.58</version>
25+
<version>2.5.59</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.58</version>
10+
<version>2.5.59</version>
1111
</parent>
1212

1313
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.58</version>
10+
<version>2.5.59</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.5.58</version>
25+
<version>2.5.59</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/protocols/aws-cbor-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-ion-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-json-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-query-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-xml-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/protocol-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.58</version>
8+
<version>2.5.59</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/regions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.5.58</version>
25+
<version>2.5.59</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

‎core/sdk-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>core</artifactId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626
<artifactId>sdk-core</artifactId>
2727
<name>AWS Java SDK :: SDK Core</name>

‎http-client-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>aws-sdk-java-pom</artifactId>
2424
<groupId>software.amazon.awssdk</groupId>
25-
<version>2.5.58</version>
25+
<version>2.5.59</version>
2626
</parent>
2727
<artifactId>http-client-spi</artifactId>
2828
<name>AWS Java SDK :: HTTP Client Interface</name>

‎http-clients/apache-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>http-clients</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626

2727
<artifactId>apache-client</artifactId>

‎http-clients/netty-nio-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>http-clients</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.5.58</version>
23+
<version>2.5.59</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ public interface Builder extends SdkAsyncHttpClient.Builder<NettyNioAsyncHttpCli
203203

204204
/**
205205
* The amount of time to wait for a read on a socket before an exception is thrown.
206+
* Specify {@code Duration.ZERO} to disable.
206207
*
207208
* @param readTimeout timeout duration
208209
* @return this builder for method chaining.
@@ -211,6 +212,7 @@ public interface Builder extends SdkAsyncHttpClient.Builder<NettyNioAsyncHttpCli
211212

212213
/**
213214
* The amount of time to wait for a write on a socket before an exception is thrown.
215+
* Specify {@code Duration.ZERO} to disable.
214216
*
215217
* @param writeTimeout timeout duration
216218
* @return this builder for method chaining.
@@ -383,7 +385,7 @@ public void setMaxPendingConnectionAcquires(Integer maxPendingAcquires) {
383385

384386
@Override
385387
public Builder readTimeout(Duration readTimeout) {
386-
Validate.isPositive(readTimeout, "readTimeout");
388+
Validate.isNotNegative(readTimeout, "readTimeout");
387389
standardOptions.put(READ_TIMEOUT, readTimeout);
388390
return this;
389391
}
@@ -394,7 +396,7 @@ public void setReadTimeout(Duration readTimeout) {
394396

395397
@Override
396398
public Builder writeTimeout(Duration writeTimeout) {
397-
Validate.isPositive(writeTimeout, "writeTimeout");
399+
Validate.isNotNegative(writeTimeout, "writeTimeout");
398400
standardOptions.put(WRITE_TIMEOUT, writeTimeout);
399401
return this;
400402
}

‎http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientWireMockTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,18 @@ public void testExceptionMessageChanged_WhenConnectionTimeoutErrorEncountered()
618618
customClient.close();
619619
}
620620

621+
@Test
622+
public void createNettyClient_ReadWriteTimeoutCanBeZero() throws Exception {
623+
SdkAsyncHttpClient customClient = NettyNioAsyncHttpClient.builder()
624+
.readTimeout(Duration.ZERO)
625+
.writeTimeout(Duration.ZERO)
626+
.build();
627+
628+
makeSimpleRequest(customClient);
629+
630+
customClient.close();
631+
}
632+
621633
private void verifyChannelRelease(Channel channel) throws InterruptedException {
622634
Thread.sleep(1000);
623635
assertThat(channel.attr(AttributeKey.valueOf("channelPool")).get()).isNull();

‎http-clients/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

‎http-clients/url-connection-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>http-clients</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.5.58</version>
23+
<version>2.5.59</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<groupId>software.amazon.awssdk</groupId>
2222
<artifactId>aws-sdk-java-pom</artifactId>
23-
<version>2.5.58</version>
23+
<version>2.5.59</version>
2424
<packaging>pom</packaging>
2525
<name>AWS Java SDK :: Parent</name>
2626
<description>The Amazon Web Services SDK for Java provides Java APIs

‎release-scripts/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.5.58</version>
25+
<version>2.5.59</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>release-scripts</artifactId>

‎services/acm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>services</artifactId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626
<artifactId>acm</artifactId>
2727
<name>AWS Java SDK :: Services :: AWS Certificate Manager</name>

‎services/acmpca/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>services</artifactId>
24-
<version>2.5.58</version>
24+
<version>2.5.59</version>
2525
</parent>
2626
<artifactId>acmpca</artifactId>
2727
<name>AWS Java SDK :: Services :: ACM PCA</name>

0 commit comments

Comments
 (0)