This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new ad7aa0e3c18 HADOOP-18562. Followup: TestAwsClientConfig compilation
(#7751)
ad7aa0e3c18 is described below
commit ad7aa0e3c18cff86fc29ba9fdab75f442f7c90af
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Thu Jun 19 18:19:23 2025 +0100
HADOOP-18562. Followup: TestAwsClientConfig compilation (#7751)
Followup to #7379
Compilation failure due to import change to in test source between PR and
commit.
---
.../hadoop/fs/s3a/impl/TestAwsClientConfig.java | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/TestAwsClientConfig.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/TestAwsClientConfig.java
index ab989035bbd..a0437a81817 100644
---
a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/TestAwsClientConfig.java
+++
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/TestAwsClientConfig.java
@@ -218,26 +218,26 @@ public void testInitRequestHeadersForSTS() throws
IOException {
final Configuration conf = new Configuration();
conf.set(CUSTOM_HEADERS_STS, "header1=value1;value2,header2=value3");
- Assertions.assertThat(conf.get(CUSTOM_HEADERS_S3))
+ assertThat(conf.get(CUSTOM_HEADERS_S3))
.describedAs("Custom client headers for s3 %s", CUSTOM_HEADERS_S3)
.isNull();
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().size())
.describedAs("Count of S3 client headers")
.isEqualTo(0);
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_STS)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_STS)
.headers().size())
.describedAs("Count of STS client headers")
.isEqualTo(2);
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_STS)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_STS)
.headers().get("header1"))
.describedAs("STS client 'header1' header value")
.isEqualTo(Lists.newArrayList("value1", "value2"));
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_STS)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_STS)
.headers().get("header2"))
.describedAs("STS client 'header2' header value")
.isEqualTo(Lists.newArrayList("value3"));
@@ -252,26 +252,26 @@ public void testInitRequestHeadersForS3() throws
IOException {
final Configuration conf = new Configuration();
conf.set(CUSTOM_HEADERS_S3, "header1=value1;value2,header2=value3");
- Assertions.assertThat(conf.get(CUSTOM_HEADERS_STS))
+ assertThat(conf.get(CUSTOM_HEADERS_STS))
.describedAs("Custom client headers for STS %s",
CUSTOM_HEADERS_STS)
.isNull();
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_STS)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_STS)
.headers().size())
.describedAs("Count of STS client headers")
.isEqualTo(0);
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().size())
.describedAs("Count of S3 client headers")
.isEqualTo(2);
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().get("header1"))
.describedAs("S3 client 'header1' header value")
.isEqualTo(Lists.newArrayList("value1", "value2"));
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().get("header2"))
.describedAs("S3 client 'header2' header value")
.isEqualTo(Lists.newArrayList("value3"));
@@ -287,26 +287,26 @@ public void testInitRequestHeadersForS3WithWhitespace()
throws IOException {
final Configuration conf = new Configuration();
conf.set(CUSTOM_HEADERS_S3, " header1 = value1 ; value2 , header2=
value3 ");
- Assertions.assertThat(conf.get(CUSTOM_HEADERS_STS))
+ assertThat(conf.get(CUSTOM_HEADERS_STS))
.describedAs("Custom client headers for STS %s",
CUSTOM_HEADERS_STS)
.isNull();
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_STS)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_STS)
.headers().size())
.describedAs("Count of STS client headers")
.isEqualTo(0);
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().size())
.describedAs("Count of S3 client headers")
.isEqualTo(2);
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().get("header1"))
.describedAs("S3 client 'header1' header value")
.isEqualTo(Lists.newArrayList("value1", "value2"));
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().get("header2"))
.describedAs("S3 client 'header2' header value")
.isEqualTo(Lists.newArrayList("value3"));
@@ -321,7 +321,7 @@ public void
testInitRequestHeadersForS3WithDuplicateValues() throws IOException
Configuration conf = new Configuration();
conf.set(CUSTOM_HEADERS_S3, "header1=duplicate;duplicate");
- Assertions.assertThat(createClientConfigBuilder(conf,
AWS_SERVICE_IDENTIFIER_S3)
+ assertThat(createClientConfigBuilder(conf, AWS_SERVICE_IDENTIFIER_S3)
.headers().get("header1"))
.describedAs("S3 client 'header1' header value")
.isEqualTo(Lists.newArrayList("duplicate", "duplicate"));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
