This is an automated email from the ASF dual-hosted git repository.
peterxcli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new c3ffd0562e8 HDDS-15178. Allow creating EncodingTypeObject for empty
String (#10195)
c3ffd0562e8 is described below
commit c3ffd0562e86d7188b128b2f7503fc69dee3bdf9
Author: Peter Lee <[email protected]>
AuthorDate: Wed May 6 14:03:33 2026 +0800
HDDS-15178. Allow creating EncodingTypeObject for empty String (#10195)
---
.../org/apache/hadoop/ozone/s3/commontypes/EncodingTypeObject.java | 5 ++---
.../apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java | 5 +++++
.../java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java | 3 +++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/EncodingTypeObject.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/EncodingTypeObject.java
index 3f5ee7b2032..ee0e62c70f4 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/EncodingTypeObject.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/EncodingTypeObject.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.s3.commontypes;
import jakarta.annotation.Nullable;
-import org.apache.commons.lang3.StringUtils;
/**
* A converter to encode string if needed.
@@ -41,12 +40,12 @@ public String getName() {
}
/**
- * Create a EncodingTypeObject Object, if the parameter name is null.
+ * Create a EncodingTypeObject Object, if the parameter name is not null.
* @return If name is null return null else return a EncodingTypeObject
object
*/
@Nullable public static EncodingTypeObject createNullable(
@Nullable String name, @Nullable String encodingType) {
- if (StringUtils.isEmpty(name)) {
+ if (name == null) {
return null;
}
return new EncodingTypeObject(name, encodingType);
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
index 2473e1143a6..f2b10ac4e1b 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/commontypes/TestObjectKeyNameAdapter.java
@@ -42,6 +42,11 @@ public void testEncodeResult() throws Exception {
.marshal(EncodingTypeObject.createNullable("a b c/", null)));
assertEquals("a+b+c/", getAdapter()
.marshal(EncodingTypeObject.createNullable("a+b+c/", null)));
+
+ assertEquals("", getAdapter()
+ .marshal(EncodingTypeObject.createNullable("", null)));
+ assertEquals("", getAdapter()
+ .marshal(EncodingTypeObject.createNullable("", ENCODING_TYPE)));
}
private XmlAdapter<String, EncodingTypeObject> getAdapter() {
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
index c62a7e8da1c..44f1dc5f840 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestBucketList.java
@@ -58,6 +58,9 @@ public void listRoot() throws OS3Exception, IOException {
endpoint.queryParamsForTest().set(QueryParams.PREFIX, "");
ListObjectResponse getBucketResponse = (ListObjectResponse)
endpoint.get("b1").getEntity();
+ assertNotNull(getBucketResponse.getPrefix());
+ assertEquals("", getBucketResponse.getPrefix().getName());
+
assertEquals(1, getBucketResponse.getCommonPrefixes().size());
assertEquals("dir1/",
getBucketResponse.getCommonPrefixes().get(0).getPrefix().getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
