big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bharat Viswanadham 2018-10-31 19:11:12 -07:00
parent 6668c19daf
commit c5eb237e3e
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-ozone/s3gateway/pom.xml
View File

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

18
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java
View File

@ -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; package org.apache.hadoop.ozone.s3.util;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;

20
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3utils.java
View File

@ -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; package org.apache.hadoop.ozone.s3.util;
import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.DecoderException;
@ -52,7 +70,7 @@ public static String decodeContinueToken(String key) throws OS3Exception {
byte[] actualKeyBytes = Hex.decodeHex(hex); byte[] actualKeyBytes = Hex.decodeHex(hex);
String digestActualKey = DigestUtils.sha256Hex(actualKeyBytes); String digestActualKey = DigestUtils.sha256Hex(actualKeyBytes);
if (digest.equals(digestActualKey)) { if (digest.equals(digestActualKey)) {
return new String(actualKeyBytes); return new String(actualKeyBytes, StandardCharsets.UTF_8);
} else { } else {
OS3Exception ex = S3ErrorTable.newError(S3ErrorTable OS3Exception ex = S3ErrorTable.newError(S3ErrorTable
.INVALID_ARGUMENT, key); .INVALID_ARGUMENT, key);