Skip to content

HDDS-12867. Replace hard-coded namespace URL with constant S3_XML_NAMESPACE #8299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 11 commits into from
Apr 19, 2025
Merged

HDDS-12867. Replace hard-coded namespace URL with constant S3_XML_NAMESPACE #8299

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
966f0f6
HDDS-11734. Specify namespace in @XmlElement annotations for correct …
Jimmyweng006 Apr 16, 2025
0717f5a
bump maven-compiler-plugin to 3.14.0
adoroszlai Apr 17, 2025
87c5d65
HDDS-11734. Use Constants for S3 namespace URL
Jimmyweng006 Apr 17, 2025
9b81cb8
HDDS-11734. Use Constants for other occurrences as well
Jimmyweng006 Apr 17, 2025
d3efb24
Fix checkstyle
adoroszlai Apr 17, 2025
1d88e0a
Revert "Fix checkstyle"
Jimmyweng006 Apr 19, 2025
4a48bc8
Revert "HDDS-11734. Use Constants for other occurrences as well"
Jimmyweng006 Apr 19, 2025
2ce2cda
Revert "HDDS-11734. Use Constants for S3 namespace URL"
Jimmyweng006 Apr 19, 2025
aa8f137
Revert "bump maven-compiler-plugin to 3.14.0"
Jimmyweng006 Apr 19, 2025
676168e
Revert "HDDS-11734. Specify namespace in @XmlElement annotations for …
Jimmyweng006 Apr 19, 2025
c84694e
HDDS-12867. Replace hard-coded namespace URL with constant S3_XML_NAM…
Jimmyweng006 Apr 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ public final class OzoneConsts {
public static final String S3_GETSECRET_USER = "S3GetSecretUser";
public static final String S3_SETSECRET_USER = "S3SetSecretUser";
public static final String S3_REVOKESECRET_USER = "S3RevokeSecretUser";
public static final String S3_NAMESPACE_URL = "http://s3.amazonaws.com/doc/2006-03-01/";
Comment thread
ivandika3 marked this conversation as resolved.
Outdated
public static final String RENAMED_KEYS_MAP = "renamedKeysMap";
public static final String UNRENAMED_KEYS_MAP = "unRenamedKeysMap";
public static final String MULTIPART_UPLOAD_PART_NUMBER = "partNumber";
Expand Down
8 changes: 4 additions & 4 deletions ...way/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CompleteMultipartUpload", namespace =
"http://s3.amazonaws.com/doc/2006-03-01/")
OzoneConsts.S3_NAMESPACE_URL)
public class CompleteMultipartUploadRequest {

@XmlElement(name = "Part")
@XmlElement(name = "Part", namespace = OzoneConsts.S3_NAMESPACE_URL)
private List<Part> partList = new ArrayList<>();

public List<Part> getPartList() {
Expand All @@ -51,10 +51,10 @@ public void setPartList(List<Part> partList) {
@XmlRootElement(name = "Part")
public static class Part {

@XmlElement(name = "PartNumber")
@XmlElement(name = "PartNumber", namespace = OzoneConsts.S3_NAMESPACE_URL)
Comment thread
ivandika3 marked this conversation as resolved.
Outdated
private int partNumber;

@XmlElement(name = OzoneConsts.ETAG)
@XmlElement(name = OzoneConsts.ETAG, namespace = OzoneConsts.S3_NAMESPACE_URL)
private String eTag;

public int getPartNumber() {
Expand Down
2 changes: 1 addition & 1 deletion ...ay/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CompleteMultipartUploadResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CompleteMultipartUploadResult", namespace =
"http://s3.amazonaws.com/doc/2006-03-01/")
OzoneConsts.S3_NAMESPACE_URL)
public class CompleteMultipartUploadResponse {

@XmlElement(name = "Location")
Expand Down
2 changes: 1 addition & 1 deletion ...ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyObjectResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CopyObjectResult",
namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
namespace = OzoneConsts.S3_NAMESPACE_URL)
public class CopyObjectResponse {

@XmlJavaTypeAdapter(IsoDateAdapter.class)
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/CopyPartResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "CopyPartResult",
namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
namespace = OzoneConsts.S3_NAMESPACE_URL)
public class CopyPartResult {

@XmlJavaTypeAdapter(IsoDateAdapter.class)
Expand Down
3 changes: 2 additions & 1 deletion ...ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListBucketResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.s3.commontypes.BucketMetadata;

/**
* Response from the ListBucket RPC Call.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ListAllMyBucketsResult",
namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
namespace = OzoneConsts.S3_NAMESPACE_URL)
public class ListBucketResponse {
@XmlElementWrapper(name = "Buckets")
@XmlElement(name = "Bucket")
Expand Down
3 changes: 2 additions & 1 deletion ...gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListMultipartUploadsResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.hadoop.ozone.s3.commontypes.IsoDateAdapter;
import org.apache.hadoop.ozone.s3.util.S3StorageType;
import org.apache.hadoop.ozone.OzoneConsts;
Comment thread
adoroszlai marked this conversation as resolved.
Outdated

/**
* AWS compatible REST response for list multipart upload.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "ListMultipartUploadsResult", namespace =
"http://s3.amazonaws.com/doc/2006-03-01/")
OzoneConsts.S3_NAMESPACE_URL)
public class ListMultipartUploadsResult {

@XmlElement(name = "Bucket")
Expand Down
12 changes: 6 additions & 6 deletions ...ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultiDeleteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.ozone.OzoneConsts;

/**
* 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 = OzoneConsts.S3_NAMESPACE_URL)
public class MultiDeleteRequest {

@XmlElement(name = "Quiet")
@XmlElement(name = "Quiet", namespace = OzoneConsts.S3_NAMESPACE_URL)
private Boolean quiet = Boolean.FALSE;

@XmlElement(name = "Object")
@XmlElement(name = "Object", namespace = OzoneConsts.S3_NAMESPACE_URL)
private List<DeleteObject> objects = new ArrayList<>();

public boolean isQuiet() {
Expand Down Expand Up @@ -64,10 +64,10 @@ public void setObjects(
+ ".com/doc/2006-03-01/")
public static class DeleteObject {

@XmlElement(name = "Key")
@XmlElement(name = "Key", namespace = OzoneConsts.S3_NAMESPACE_URL)
private String key;

@XmlElement(name = "VersionId")
@XmlElement(name = "VersionId", namespace = OzoneConsts.S3_NAMESPACE_URL)
private String versionId;

public DeleteObject() {
Expand Down
3 changes: 2 additions & 1 deletion ...ay/src/main/java/org/apache/hadoop/ozone/s3/endpoint/MultipartUploadInitiateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.OzoneConsts;

/**
* Response for Initiate Multipart Upload request.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "InitiateMultipartUploadResult",
namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
namespace = OzoneConsts.S3_NAMESPACE_URL)
public class MultipartUploadInitiateResponse {

@XmlElement(name = "Bucket")
Expand Down
17 changes: 9 additions & 8 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3BucketAcl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.ozone.OzoneConsts;

/**
* Bucket ACL.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "AccessControlPolicy",
namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
namespace = OzoneConsts.S3_NAMESPACE_URL)
public class S3BucketAcl {

@XmlElement(name = "Owner")
@XmlElement(name = "Owner", namespace = OzoneConsts.S3_NAMESPACE_URL)
private S3Owner owner;

@XmlElement(name = "AccessControlList")
@XmlElement(name = "AccessControlList", namespace = OzoneConsts.S3_NAMESPACE_URL)
private AccessControlList aclList;

public S3Owner getOwner() {
Expand Down Expand Up @@ -71,7 +72,7 @@ public String toString() {
@XmlRootElement(name = "AccessControlList")
public static class AccessControlList {

@XmlElement(name = "Grant")
@XmlElement(name = "Grant", namespace = OzoneConsts.S3_NAMESPACE_URL)
private List<Grant> grantList = new ArrayList<>();

public void addGrant(Grant grant) {
Expand Down Expand Up @@ -105,10 +106,10 @@ public String toString() {
@XmlRootElement(name = "Grant")
public static class Grant {

@XmlElement(name = "Grantee")
@XmlElement(name = "Grantee", namespace = OzoneConsts.S3_NAMESPACE_URL)
private Grantee grantee;

@XmlElement(name = "Permission")
@XmlElement(name = "Permission", namespace = OzoneConsts.S3_NAMESPACE_URL)
private String permission;

public String getPermission() {
Expand Down Expand Up @@ -162,10 +163,10 @@ public int hashCode() {
@XmlRootElement(name = "Grantee")
public static class Grantee {

@XmlElement(name = "DisplayName")
@XmlElement(name = "DisplayName", namespace = OzoneConsts.S3_NAMESPACE_URL)
private String displayName;

@XmlElement(name = "ID")
@XmlElement(name = "ID", namespace = OzoneConsts.S3_NAMESPACE_URL)
private String id;

@XmlAttribute(name = "xsi:type")
Expand Down
11 changes: 6 additions & 5 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Tagging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,17 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.hadoop.ozone.OzoneConsts;

/**
* S3 tagging.
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "Tagging",
namespace = "http://s3.amazonaws.com/doc/2006-03-01/")
namespace = OzoneConsts.S3_NAMESPACE_URL)
public class S3Tagging {

@XmlElement(name = "TagSet")
@XmlElement(name = "TagSet", namespace = OzoneConsts.S3_NAMESPACE_URL)
private TagSet tagSet;

public S3Tagging() {
Expand All @@ -59,7 +60,7 @@ public void setTagSet(TagSet tagSet) {
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "TagSet")
public static class TagSet {
@XmlElement(name = "Tag")
@XmlElement(name = "Tag", namespace = OzoneConsts.S3_NAMESPACE_URL)
private List<Tag> tags = new ArrayList<>();

public TagSet() {
Expand All @@ -84,10 +85,10 @@ public void setTags(List<Tag> tags) {
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "Tag")
public static class Tag {
@XmlElement(name = "Key")
@XmlElement(name = "Key", namespace = OzoneConsts.S3_NAMESPACE_URL)
private String key;

@XmlElement(name = "Value")
@XmlElement(name = "Value", namespace = OzoneConsts.S3_NAMESPACE_URL)
private String value;

public Tag() {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
Expand Down