Skip to content

Commit abee620

Browse files
zoewanggzoewangg
authored
Merge pull request #2021 from aws/zoewang/crtUpdates-previewVersion
AWS Common Runtime HTTP client preview
2 parents 5afcbd8 + c7e5462 commit abee620

File tree

73 files changed

+4946
-565
lines changed

Some content is hidden

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

73 files changed

+4946
-565
lines changed

‎.changes/next-release/feature-AWSCommonRuntimeClient-0306e36.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "AWS Common Runtime HTTP Client",
3+
"type": "feature",
4+
"description": "This release includes the preview release of the AWS Common Runtime HTTP client for the AWS SDK for Java v2. The code can be found in the `aws-crt-client` module."
5+
}

‎build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,22 @@
180180
<Confidence value="1"/>
181181
</Not>
182182
</Match>
183+
184+
<Match>
185+
<Package name="~software.amazon.awssdk.http.*"/>
186+
<Bug pattern="URF_UNREAD_FIELD, RV_RETURN_VALUE_IGNORED"/>
187+
</Match>
188+
189+
<Match>
190+
<Class name="software.amazon.awssdk.http.crt.internal.AwsCrtResponseBodyPublisher" />
191+
<Method name="subscribe"/>
192+
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
193+
</Match>
194+
195+
<!-- on some java versions, the try-with-resources byte code is getting flagged by this -->
196+
<Match>
197+
<Class name="software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient" />
198+
<Method name="execute"/>
199+
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
200+
</Match>
183201
</FindBugsFilter>

‎http-client-spi/src/main/java/software/amazon/awssdk/http/Header.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ public final class Header {
3333

3434
public static final String CHUNKED = "chunked";
3535

36+
public static final String HOST = "Host";
37+
38+
public static final String CONNECTION = "Connection";
39+
40+
public static final String KEEP_ALIVE_VALUE = "keep-alive";
41+
3642
private Header() {
3743
}
3844

‎http-clients/aws-crt-client/pom.xml

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License").
6+
~ You may not use this file except in compliance with the License.
7+
~ A copy of the License is located at
8+
~
9+
~ http://aws.amazon.com/apache2.0
10+
~
11+
~ or in the "license" file accompanying this file. This file is distributed
12+
~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
13+
~ express or implied. See the License for the specific language governing
14+
~ permissions and limitations under the License.
15+
-->
16+
17+
18+
<project xmlns="http://maven.apache.org/POM/4.0.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
21+
<parent>
22+
<artifactId>http-clients</artifactId>
23+
<groupId>software.amazon.awssdk</groupId>
24+
<version>2.14.13-SNAPSHOT</version>
25+
</parent>
26+
<modelVersion>4.0.0</modelVersion>
27+
28+
<artifactId>aws-crt-client</artifactId>
29+
<name>AWS Java SDK :: HTTP Clients :: AWS Common Runtime Client</name>
30+
<packaging>jar</packaging>
31+
<version>${awsjavasdk.version}-PREVIEW</version>
32+
33+
<properties>
34+
<awsjavasdk.version>${project.parent.version}</awsjavasdk.version>
35+
<jre.version>1.8</jre.version>
36+
</properties>
37+
38+
<dependencyManagement>
39+
<dependencies>
40+
<dependency>
41+
<groupId>software.amazon.awssdk</groupId>
42+
<artifactId>bom-internal</artifactId>
43+
<version>${awsjavasdk.version}</version>
44+
<type>pom</type>
45+
<scope>import</scope>
46+
</dependency>
47+
</dependencies>
48+
</dependencyManagement>
49+
50+
<dependencies>
51+
<!--AWS Common Runtime-->
52+
<dependency>
53+
<groupId>software.amazon.awssdk.crt</groupId>
54+
<artifactId>aws-crt</artifactId>
55+
<version>${awscrt.version}</version>
56+
</dependency>
57+
58+
<!--SDK dependencies-->
59+
<dependency>
60+
<groupId>software.amazon.awssdk</groupId>
61+
<artifactId>annotations</artifactId>
62+
<version>${awsjavasdk.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>software.amazon.awssdk</groupId>
66+
<artifactId>http-client-spi</artifactId>
67+
<version>${awsjavasdk.version}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>software.amazon.awssdk</groupId>
71+
<artifactId>utils</artifactId>
72+
<version>${awsjavasdk.version}</version>
73+
</dependency>
74+
75+
<!--Test Dependencies-->
76+
<dependency>
77+
<groupId>com.github.tomakehurst</groupId>
78+
<artifactId>wiremock</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.apache.commons</groupId>
83+
<artifactId>commons-lang3</artifactId>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>junit</groupId>
88+
<artifactId>junit</artifactId>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.mockito</groupId>
93+
<artifactId>mockito-core</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.assertj</groupId>
98+
<artifactId>assertj-core</artifactId>
99+
<scope>test</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.reactivestreams</groupId>
103+
<artifactId>reactive-streams-tck</artifactId>
104+
<scope>test</scope>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.slf4j</groupId>
108+
<artifactId>slf4j-log4j12</artifactId>
109+
<scope>test</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>log4j</groupId>
113+
<artifactId>log4j</artifactId>
114+
<scope>test</scope>
115+
</dependency>
116+
<dependency>
117+
<groupId>software.amazon.awssdk</groupId>
118+
<artifactId>http-client-tests</artifactId>
119+
<version>${awsjavasdk.version}</version>
120+
<scope>test</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>software.amazon.awssdk</groupId>
124+
<artifactId>sdk-core</artifactId>
125+
<version>${awsjavasdk.version}</version>
126+
<scope>test</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>software.amazon.awssdk</groupId>
130+
<artifactId>regions</artifactId>
131+
<version>${awsjavasdk.version}</version>
132+
<scope>test</scope>
133+
</dependency>
134+
<dependency>
135+
<groupId>software.amazon.awssdk</groupId>
136+
<artifactId>s3</artifactId>
137+
<version>${awsjavasdk.version}</version>
138+
<scope>test</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>software.amazon.awssdk</groupId>
142+
<artifactId>kms</artifactId>
143+
<version>${awsjavasdk.version}</version>
144+
<scope>test</scope>
145+
</dependency>
146+
<dependency>
147+
<groupId>software.amazon.awssdk</groupId>
148+
<artifactId>auth</artifactId>
149+
<version>${awsjavasdk.version}</version>
150+
<scope>test</scope>
151+
</dependency>
152+
<dependency>
153+
<artifactId>service-test-utils</artifactId>
154+
<groupId>software.amazon.awssdk</groupId>
155+
<version>${awsjavasdk.version}</version>
156+
<scope>test</scope>
157+
</dependency>
158+
<dependency>
159+
<groupId>commons-codec</groupId>
160+
<artifactId>commons-codec</artifactId>
161+
<version>${commons-codec.verion}</version>
162+
<scope>test</scope>
163+
</dependency>
164+
</dependencies>
165+
166+
<build>
167+
<plugins>
168+
<!-- The Reactive Streams TCK tests are based on TestNG. See http://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#Running_TestNG_and_JUnit_Tests -->
169+
<plugin>
170+
<groupId>org.apache.maven.plugins</groupId>
171+
<artifactId>maven-surefire-plugin</artifactId>
172+
<version>${maven.surefire.version}</version>
173+
<configuration>
174+
<properties>
175+
<property>
176+
<name>junit</name>
177+
<value>false</value>
178+
</property>
179+
</properties>
180+
<threadCount>1</threadCount>
181+
</configuration>
182+
<dependencies>
183+
<dependency>
184+
<groupId>org.apache.maven.surefire</groupId>
185+
<artifactId>surefire-junit47</artifactId>
186+
<version>${maven.surefire.version}</version>
187+
</dependency>
188+
<dependency>
189+
<groupId>org.apache.maven.surefire</groupId>
190+
<artifactId>surefire-testng</artifactId>
191+
<version>${maven.surefire.version}</version>
192+
</dependency>
193+
</dependencies>
194+
</plugin>
195+
<plugin>
196+
<groupId>org.apache.maven.plugins</groupId>
197+
<artifactId>maven-jar-plugin</artifactId>
198+
<configuration>
199+
<archive>
200+
<manifestEntries>
201+
<Automatic-Module-Name>software.amazon.awssdk.http.crt</Automatic-Module-Name>
202+
</manifestEntries>
203+
</archive>
204+
</configuration>
205+
</plugin>
206+
</plugins>
207+
</build>
208+
</project>

0 commit comments

Comments
 (0)