ivandika3 commented on code in PR #6756: URL: https://github.com/apache/ozone/pull/6756#discussion_r1836283121
########## hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/S3Tagging.java: ########## @@ -0,0 +1,156 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.hadoop.ozone.s3.endpoint; + +import javax.ws.rs.WebApplicationException; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * S3 tagging. + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement(name = "Tagging", + namespace = "http://s3.amazonaws.com/doc/2006-03-01/";) +public class S3Tagging { + + @XmlElement(name = "TagSet") + private TagSet tagSet; + + public S3Tagging() { + + } + + public S3Tagging(TagSet tagSet) { + this.tagSet = tagSet; + } + + public TagSet getTagSet() { + return tagSet; + } + + public void setTagSet(TagSet tagSet) { + this.tagSet = tagSet; + } + + /** + * Entity for child element TagSet. + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlRootElement(name = "TagSet") + public static class TagSet { + @XmlElement(name = "Tag") + private List<Tag> tags = new ArrayList<>(); + + public TagSet() { + } + + public TagSet(List<Tag> tags) { + this.tags = tags; + } + + public List<Tag> getTags() { + return tags; + } + + public void setTags(List<Tag> tags) { + this.tags = tags; + } + } + + /** + * Entity for child element Tag. + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlRootElement(name = "Tag") + public static class Tag { + @XmlElement(name = "Key") + private String key; + + @XmlElement(name = "Value") + private String value; + + public Tag() { + } + + public Tag(String key, String value) { + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + + /** + * Creates a S3 tagging instance (xml representation) from a Map retrieved + * from OM. + * @param tagMap Map representing the tags. + * @return {@link S3Tagging} + */ + public static S3Tagging fromMap(Map<String, String> tagMap) { + List<Tag> tags = tagMap.entrySet() + .stream() + .map( + tagEntry -> new Tag(tagEntry.getKey(), tagEntry.getValue()) + ) + .collect(Collectors.toList()); + return new S3Tagging(new TagSet(tags)); + } + + /** + * Additional XML validation logic for S3 tagging. + */ + public void validate() { + if (tagSet == null) { + throw new WebApplicationException("TagSet needs to be specified"); + } + + if (tagSet.getTags().isEmpty()) { + throw new WebApplicationException("Tags need to be specified and cannot be empty"); + } + + for (Tag tag: tagSet.getTags()) { + if (tag.getKey() == null) { + throw new WebApplicationException("Some tag keys are not specified"); + } + if (tag.getValue() == null) { + throw new WebApplicationException("Tag value for tag " + tag.getKey() + " is not specified"); + } + } + } Review Comment: Thanks for the review. I changed `WebApplicationException` to the `IllegalArgumentException`. Please let me know if the change makes sense. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
