Browse Source

HDDS-777. Fix missing jenkins issue in s3gateway module. Contributed by Bharat Viswanadham.

(cherry picked from commit c5eb237e3e951e27565d40a47b6f55e7eb399f5c)
Bharat Viswanadham 6 years ago
parent
commit
8411c2bf56

+ 1 - 1
hadoop-ozone/s3gateway/pom.xml

@@ -22,7 +22,7 @@
     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>hadoop-ozone-s3gateway</artifactId>
-  <name>Apache Hadoop Ozone S3 Gatway</name>
+  <name>Apache Hadoop Ozone S3 Gateway</name>
   <packaging>jar</packaging>
   <version>0.3.0-SNAPSHOT</version>
   <properties>

+ 18 - 0
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java

@@ -1,3 +1,21 @@
+/*
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;

+ 19 - 1
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3utils.java

@@ -1,3 +1,21 @@
+/*
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.util;
 
 import org.apache.commons.codec.DecoderException;
@@ -52,7 +70,7 @@ public final class S3utils {
         byte[] actualKeyBytes = Hex.decodeHex(hex);
         String digestActualKey = DigestUtils.sha256Hex(actualKeyBytes);
         if (digest.equals(digestActualKey)) {
-          return new String(actualKeyBytes);
+          return new String(actualKeyBytes, StandardCharsets.UTF_8);
         } else {
           OS3Exception ex = S3ErrorTable.newError(S3ErrorTable
               .INVALID_ARGUMENT, key);