This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 db9076e11e HDDS-12867. Replace hard-coded namespace URL with constant
S3_XML_NAMESPACE (#8299)
db9076e11e is described below
commit db9076e11ede314f0d7a07dec9745e2da0e99511
Author: Jimmy_kiet <[email protected]>
AuthorDate: Sat Apr 19 19:50:10 2025 +0800
HDDS-12867. Replace hard-coded namespace URL with constant S3_XML_NAMESPACE
(#8299)
---
.../apache/hadoop/ozone/s3/commontypes/package-info.java | 8 ++++----
.../ozone/s3/endpoint/CompleteMultipartUploadRequest.java | 3 ++-
.../ozone/s3/endpoint/CompleteMultipartUploadResponse.java | 3 ++-
.../apache/hadoop/ozone/s3/endpoint/CopyObjectResponse.java | 3 ++-
.../org/apache/hadoop/ozone/s3/endpoint/CopyPartResult.java | 3 ++-
.../apache/hadoop/ozone/s3/endpoint/ListBucketResponse.java | 3 ++-
.../ozone/s3/endpoint/ListMultipartUploadsResult.java | 3 ++-
.../apache/hadoop/ozone/s3/endpoint/ListObjectResponse.java | 4 ++--
.../apache/hadoop/ozone/s3/endpoint/ListPartsResponse.java | 4 ++--
.../apache/hadoop/ozone/s3/endpoint/MultiDeleteRequest.java | 7 +++----
.../hadoop/ozone/s3/endpoint/MultiDeleteResponse.java | 10 ++++------
.../ozone/s3/endpoint/MultipartUploadInitiateResponse.java | 3 ++-
.../org/apache/hadoop/ozone/s3/endpoint/S3BucketAcl.java | 3 ++-
.../java/org/apache/hadoop/ozone/s3/endpoint/S3Tagging.java | 3 ++-
.../org/apache/hadoop/ozone/s3/endpoint/package-info.java | 8 ++++----
.../main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java | 3 +--
.../TestCompleteMultipartUploadRequestUnmarshaller.java | 4 ++--
.../s3/endpoint/TestMultiDeleteRequestUnmarshaller.java | 4 ++--
.../hadoop/ozone/s3/endpoint/TestObjectTaggingPut.java | 13 +++++++------
.../hadoop/ozone/s3/endpoint/TestPermissionCheck.java | 3 ++-
.../hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java | 3 ++-
21 files changed, 53 insertions(+), 45 deletions(-)
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/package-info.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/package-info.java
index 804330ed54..52d7cdc74b 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/package-info.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/commontypes/package-info.java
@@ -19,10 +19,10 @@
* Common classes required for S3 rest API's.
*/
@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/", elementFormDefault =
+ namespace = S3Consts.S3_XML_NAMESPACE, elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
- @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/", prefix = "")})
+ @javax.xml.bind.annotation.XmlNs(namespaceURI =
S3Consts.S3_XML_NAMESPACE, prefix = "")})
package org.apache.hadoop.ozone.s3.commontypes;
+
+import org.apache.hadoop.ozone.s3.util.S3Consts;
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadRequest.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadRequest.java
index b1f92b582a..f015431ce9 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadRequest.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadRequest.java
@@ -24,13 +24,14 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Request for Complete Multipart Upload request.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CompleteMultipartUpload", namespace =
- "http://s3.amazonaws.com/doc/2006-03-01/";)
+ S3Consts.S3_XML_NAMESPACE)
public class CompleteMultipartUploadRequest {
@XmlElement(name = "Part")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadResponse.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadResponse.java
index 0b149005e2..b566ce2c34 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadResponse.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadResponse.java
@@ -22,6 +22,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.ozone.OzoneConsts;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Complete Multipart Upload request response.
@@ -29,7 +30,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CompleteMultipartUploadResult", namespace =
- "http://s3.amazonaws.com/doc/2006-03-01/";)
+ S3Consts.S3_XML_NAMESPACE)
public class CompleteMultipartUploadResponse {
@XmlElement(name = "Location")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyObjectResponse.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyObjectResponse.java
index f128c75104..b5aa8bea6d 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyObjectResponse.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyObjectResponse.java
@@ -25,13 +25,14 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.s3.commontypes.IsoDateAdapter;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Copy object Response.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CopyObjectResult",
- namespace = "http://s3.amazonaws.com/doc/2006-03-01/";)
+ namespace = S3Consts.S3_XML_NAMESPACE)
public class CopyObjectResponse {
@XmlJavaTypeAdapter(IsoDateAdapter.class)
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyPartResult.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyPartResult.java
index fe6515e397..f3b8b6e60e 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyPartResult.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyPartResult.java
@@ -25,13 +25,14 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.s3.commontypes.IsoDateAdapter;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Copy object Response.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CopyPartResult",
- namespace = "http://s3.amazonaws.com/doc/2006-03-01/";)
+ namespace = S3Consts.S3_XML_NAMESPACE)
public class CopyPartResult {
@XmlJavaTypeAdapter(IsoDateAdapter.class)
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListBucketResponse.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListBucketResponse.java
index 2e22163921..fbb8d58f3f 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListBucketResponse.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListBucketResponse.java
@@ -26,13 +26,14 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.ozone.s3.commontypes.BucketMetadata;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Response from the ListBucket RPC Call.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ListAllMyBucketsResult",
- namespace = "http://s3.amazonaws.com/doc/2006-03-01/";)
+ namespace = S3Consts.S3_XML_NAMESPACE)
public class ListBucketResponse {
@XmlElementWrapper(name = "Buckets")
@XmlElement(name = "Bucket")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListMultipartUploadsResult.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListMultipartUploadsResult.java
index 98e9f98608..5b2fabe0e1 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListMultipartUploadsResult.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListMultipartUploadsResult.java
@@ -26,6 +26,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.hadoop.ozone.s3.commontypes.IsoDateAdapter;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.apache.hadoop.ozone.s3.util.S3StorageType;
/**
@@ -33,7 +34,7 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ListMultipartUploadsResult", namespace =
- "http://s3.amazonaws.com/doc/2006-03-01/";)
+ S3Consts.S3_XML_NAMESPACE)
public class ListMultipartUploadsResult {
@XmlElement(name = "Bucket")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListObjectResponse.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListObjectResponse.java
index 6160e2dccf..027ac75bc4 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListObjectResponse.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListObjectResponse.java
@@ -28,13 +28,13 @@
import org.apache.hadoop.ozone.s3.commontypes.EncodingTypeObject;
import org.apache.hadoop.ozone.s3.commontypes.KeyMetadata;
import org.apache.hadoop.ozone.s3.commontypes.ObjectKeyNameAdapter;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Response from the ListObject RPC Call.
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "ListBucketResult", namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/")
+@XmlRootElement(name = "ListBucketResult", namespace =
S3Consts.S3_XML_NAMESPACE)
public class ListObjectResponse {
@XmlElement(name = "Name")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListPartsResponse.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListPartsResponse.java
index defe24c698..7396dbdaaf 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListPartsResponse.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListPartsResponse.java
@@ -27,13 +27,13 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.s3.commontypes.IsoDateAdapter;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Request for list parts of a multipart upload request.
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "ListPartsResult", namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/")
+@XmlRootElement(name = "ListPartsResult", namespace =
S3Consts.S3_XML_NAMESPACE)
public class ListPartsResponse {
@XmlElement(name = "Bucket")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteRequest.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteRequest.java
index 8be4ea71e0..10ba02456a 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteRequest.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteRequest.java
@@ -23,14 +23,14 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Request for multi object delete request.
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "Delete", namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/")
+@XmlRootElement(name = "Delete", namespace = S3Consts.S3_XML_NAMESPACE)
public class MultiDeleteRequest {
@XmlElement(name = "Quiet")
@@ -60,8 +60,7 @@ public void setObjects(
* JAXB entity for child element.
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlRootElement(name = "Object", namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/")
+ @XmlRootElement(name = "Object", namespace = S3Consts.S3_XML_NAMESPACE)
public static class DeleteObject {
@XmlElement(name = "Key")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteResponse.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteResponse.java
index 66e83d19e7..222a562393 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteResponse.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteResponse.java
@@ -23,13 +23,13 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Response for multi object delete request.
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "DeleteResult", namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/")
+@XmlRootElement(name = "DeleteResult", namespace = S3Consts.S3_XML_NAMESPACE)
public class MultiDeleteResponse {
@XmlElement(name = "Deleted")
@@ -68,8 +68,7 @@ public void setErrors(
* JAXB entity for child element.
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlRootElement(name = "Deleted", namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/")
+ @XmlRootElement(name = "Deleted", namespace = S3Consts.S3_XML_NAMESPACE)
public static class DeletedObject {
@XmlElement(name = "Key")
@@ -105,8 +104,7 @@ public void setVersionId(String versionId) {
* JAXB entity for child element.
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlRootElement(name = "Error", namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/")
+ @XmlRootElement(name = "Error", namespace = S3Consts.S3_XML_NAMESPACE)
public static class Error {
@XmlElement(name = "Key")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultipartUploadInitiateResponse.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultipartUploadInitiateResponse.java
index 8a4dc28139..ea8b503079 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultipartUploadInitiateResponse.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultipartUploadInitiateResponse.java
@@ -21,13 +21,14 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Response for Initiate Multipart Upload request.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "InitiateMultipartUploadResult",
- namespace = "http://s3.amazonaws.com/doc/2006-03-01/";)
+ namespace = S3Consts.S3_XML_NAMESPACE)
public class MultipartUploadInitiateResponse {
@XmlElement(name = "Bucket")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3BucketAcl.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3BucketAcl.java
index a84694f152..6a1e6b802e 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3BucketAcl.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3BucketAcl.java
@@ -25,13 +25,14 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* Bucket ACL.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "AccessControlPolicy",
- namespace = "http://s3.amazonaws.com/doc/2006-03-01/";)
+ namespace = S3Consts.S3_XML_NAMESPACE)
public class S3BucketAcl {
@XmlElement(name = "Owner")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Tagging.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Tagging.java
index cf63f70e14..9191078701 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Tagging.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Tagging.java
@@ -25,13 +25,14 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
/**
* S3 tagging.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "Tagging",
- namespace = "http://s3.amazonaws.com/doc/2006-03-01/";)
+ namespace = S3Consts.S3_XML_NAMESPACE)
public class S3Tagging {
@XmlElement(name = "TagSet")
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/package-info.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/package-info.java
index 16df49ec21..4bc2b820a6 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/package-info.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/package-info.java
@@ -19,11 +19,11 @@
* Rest endpoint implementation for the s3 gateway.
*/
@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/", elementFormDefault =
+ namespace = S3Consts.S3_XML_NAMESPACE, elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
- @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://s3.amazonaws";
- + ".com/doc/2006-03-01/", prefix = "")})
+ @javax.xml.bind.annotation.XmlNs(namespaceURI =
S3Consts.S3_XML_NAMESPACE, prefix = "")})
package org.apache.hadoop.ozone.s3.endpoint;
+
+import org.apache.hadoop.ozone.s3.util.S3Consts;
diff --git
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java
index 70d88b04ea..f137fa7f5d 100644
---
a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java
+++
b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java
@@ -71,8 +71,7 @@ private S3Consts() {
//Error code 416 is Range Not Satisfiable
public static final int RANGE_NOT_SATISFIABLE = 416;
- public static final String S3_XML_NAMESPACE = "http://s3.amazonaws"; +
- ".com/doc/2006-03-01/";
+ public static final String S3_XML_NAMESPACE =
"http://s3.amazonaws.com/doc/2006-03-01/";;
// Constants related to custom metadata
public static final String CUSTOM_METADATA_HEADER_PREFIX = "x-amz-meta-";
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
index 5c4e59834b..f88f4f2ed4 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestCompleteMultipartUploadRequestUnmarshaller.java
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.junit.jupiter.api.Test;
/**
@@ -41,8 +42,7 @@ public void fromStreamWithNamespace() throws IOException {
//GIVEN
ByteArrayInputStream inputBody =
new ByteArrayInputStream(
- ("<CompleteMultipartUpload xmlns=\"http://s3.amazonaws"; +
- ".com/doc/2006-03-01/\">" +
+ ("<CompleteMultipartUpload xmlns=\"" + S3Consts.S3_XML_NAMESPACE +
"\">" +
"<Part><ETag>" + part1 + "</ETag><PartNumber>1" +
"</PartNumber></Part><Part><ETag>" + part2 +
"</ETag><PartNumber>2</PartNumber></Part>" +
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
index 3219da862a..73179afc89 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestMultiDeleteRequestUnmarshaller.java
@@ -22,6 +22,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.junit.jupiter.api.Test;
/**
@@ -34,8 +35,7 @@ public void fromStreamWithNamespace() throws IOException {
//GIVEN
ByteArrayInputStream inputBody =
new ByteArrayInputStream(
- ("<Delete xmlns=\"http://s3.amazonaws";
- + ".com/doc/2006-03-01/\"><Object>key1</Object><Object>key2"
+ ("<Delete xmlns=\"" + S3Consts.S3_XML_NAMESPACE +
"\"><Object>key1</Object><Object>key2"
+ "</Object><Object>key3"
+ "</Object></Delete>")
.getBytes(UTF_8));
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingPut.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingPut.java
index a51726c6b7..de698116f5 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingPut.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectTaggingPut.java
@@ -49,6 +49,7 @@
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -196,7 +197,7 @@ private InputStream emptyBody() {
private InputStream invalidXmlStructure() {
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
" <TagSet>" +
" </Ta" +
"Tagging>";
@@ -206,7 +207,7 @@ private InputStream invalidXmlStructure() {
private InputStream twoTags() {
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
" <TagSet>" +
" <Tag>" +
" <Key>tag1</Key>" +
@@ -224,14 +225,14 @@ private InputStream twoTags() {
private InputStream noTagSet() {
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
"</Tagging>";
return new ByteArrayInputStream(xml.getBytes(UTF_8));
}
private InputStream emptyTags() {
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
" <TagSet>" +
" </TagSet>" +
"</Tagging>";
@@ -241,7 +242,7 @@ private InputStream emptyTags() {
public InputStream tagKeyNotSpecified() {
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
" <TagSet>" +
" <Tag>" +
" <Value>val1</Value>" +
@@ -254,7 +255,7 @@ public InputStream tagKeyNotSpecified() {
public InputStream tagValueNotSpecified() {
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
" <TagSet>" +
" <Tag>" +
" <Key>tag1</Key>" +
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
index 3804e412fe..443686551d 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPermissionCheck.java
@@ -53,6 +53,7 @@
import org.apache.hadoop.ozone.om.helpers.ErrorInfo;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.metrics.S3GatewayMetrics;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -318,7 +319,7 @@ public void testObjectTagging() throws Exception {
.setClient(client)
.build();
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
" <TagSet>" +
" <Tag>" +
" <Key>tag1</Key>" +
diff --git
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
index 0081d0d5ab..5abc3ea77c 100644
---
a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
+++
b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/metrics/TestS3GatewayMetrics.java
@@ -54,6 +54,7 @@
import org.apache.hadoop.ozone.s3.endpoint.TestBucketAcl;
import org.apache.hadoop.ozone.s3.exception.OS3Exception;
import org.apache.hadoop.ozone.s3.exception.S3ErrorTable;
+import org.apache.hadoop.ozone.s3.util.S3Consts;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -669,7 +670,7 @@ private String initiateMultipartUpload(String bktName,
String key)
private static InputStream getPutTaggingBody() {
String xml =
- "<Tagging xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\";>" +
+ "<Tagging xmlns=\"" + S3Consts.S3_XML_NAMESPACE + "\">" +
" <TagSet>" +
" <Tag>" +
" <Key>tag1</Key>" +
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
