Skip to content

Commit 9a9a2e4

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #653 from aws/staging/fb2b44a7-9025-4113-8644-0b2745342d12
Pull request: release <- staging/fb2b44a7-9025-4113-8644-0b2745342d12
2 parents dc24b19 + f6ed42a commit 9a9a2e4

File tree

253 files changed

+2519
-249
lines changed

Some content is hidden

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

253 files changed

+2519
-249
lines changed

‎.changes/2.10.4.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "2.10.4",
3+
"date": "2019-10-29",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon AppStream",
8+
"description": "Adds support for providing domain names that can embed streaming sessions"
9+
},
10+
{
11+
"type": "feature",
12+
"category": "AWS Cloud9",
13+
"description": "Added CREATING and CREATE_FAILED environment lifecycle statuses."
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.10.4__ __2019-10-29__
2+
## __AWS Cloud9__
3+
- ### Features
4+
- Added CREATING and CREATE_FAILED environment lifecycle statuses.
5+
6+
## __Amazon AppStream__
7+
- ### Features
8+
- Adds support for providing domain names that can embed streaming sessions
9+
110
# __2.10.3__ __2019-10-28__
211
## __Amazon Simple Storage Service__
312
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
4848
<dependency>
4949
<groupId>software.amazon.awssdk</groupId>
5050
<artifactId>bom</artifactId>
51-
<version>2.10.3</version>
51+
<version>2.10.4</version>
5252
<type>pom</type>
5353
<scope>import</scope>
5454
</dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
8282
<dependency>
8383
<groupId>software.amazon.awssdk</groupId>
8484
<artifactId>ec2</artifactId>
85-
<version>2.10.3</version>
85+
<version>2.10.4</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>software.amazon.awssdk</groupId>
8989
<artifactId>s3</artifactId>
90-
<version>2.10.3</version>
90+
<version>2.10.4</version>
9191
</dependency>
9292
```
9393

@@ -99,7 +99,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
9999
<dependency>
100100
<groupId>software.amazon.awssdk</groupId>
101101
<artifactId>aws-sdk-java</artifactId>
102-
<version>2.10.3</version>
102+
<version>2.10.4</version>
103103
</dependency>
104104
```
105105

‎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.10.3</version>
7+
<version>2.10.4</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.10.3</version>
8+
<version>2.10.4</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.10.3</version>
7+
<version>2.10.4</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.10.3</version>
24+
<version>2.10.4</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.10.3</version>
10+
<version>2.10.4</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.10.3</version>
9+
<version>2.10.4</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.10.3</version>
25+
<version>2.10.4</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.10.3</version>
24+
<version>2.10.4</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.10.3</version>
8+
<version>2.10.4</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/arns/pom.xml

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

‎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.10.3</version>
10+
<version>2.10.4</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.10.3</version>
10+
<version>2.10.4</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignRequest.java

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
/*
2+
* Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package software.amazon.awssdk.awscore.presigner;
17+
18+
import java.time.Duration;
19+
import software.amazon.awssdk.annotations.SdkProtectedApi;
20+
import software.amazon.awssdk.annotations.SdkPublicApi;
21+
import software.amazon.awssdk.utils.Validate;
22+
23+
/**
24+
* The base class for all presign requests.
25+
*/
26+
@SdkPublicApi
27+
public abstract class PresignRequest {
28+
private final Duration signatureDuration;
29+
30+
protected PresignRequest(DefaultBuilder<?> builder) {
31+
this.signatureDuration = Validate.paramNotNull(builder.signatureDuration, "signatureDuration");
32+
}
33+
34+
/**
35+
* Retrieves the duration for which this presigned request should be valid. After this time has
36+
* expired, attempting to use the presigned request will fail. 
37+
*/
38+
public Duration signatureDuration() {
39+
return this.signatureDuration;
40+
}
41+
42+
/**
43+
* The base interface for all presign request builders.
44+
*/
45+
@SdkPublicApi
46+
public interface Builder {
47+
/**
48+
* Specifies the duration for which this presigned request should be valid. After this time has
49+
* expired, attempting to use the presigned request will fail. 
50+
*/
51+
Builder signatureDuration(Duration signatureDuration);
52+
53+
/**
54+
* Build the presigned request, based on the configuration on this builder.
55+
*/
56+
PresignRequest build();
57+
}
58+
59+
@Override
60+
public boolean equals(Object o) {
61+
if (this == o) {
62+
return true;
63+
}
64+
if (o == null || getClass() != o.getClass()) {
65+
return false;
66+
}
67+
68+
PresignRequest that = (PresignRequest) o;
69+
70+
return signatureDuration.equals(that.signatureDuration);
71+
}
72+
73+
@Override
74+
public int hashCode() {
75+
return signatureDuration.hashCode();
76+
}
77+
78+
@SdkProtectedApi
79+
protected abstract static class DefaultBuilder<B extends DefaultBuilder<B>> implements Builder {
80+
private Duration signatureDuration;
81+
82+
protected DefaultBuilder() {}
83+
84+
protected DefaultBuilder(PresignRequest request) {
85+
this.signatureDuration = request.signatureDuration;
86+
}
87+
88+
@Override
89+
public B signatureDuration(Duration signatureDuration) {
90+
this.signatureDuration = signatureDuration;
91+
return thisBuilder();
92+
}
93+
94+
@SuppressWarnings("unchecked")
95+
private B thisBuilder() {
96+
return (B) this;
97+
}
98+
}
99+
}

0 commit comments

Comments
 (0)