You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2017/08/30 16:59:53 UTC
jclouds git commit: JCLOUDS-1101: Use correct HttpException
Repository: jclouds
Updated Branches:
refs/heads/master df43b3648 -> 6bb9c927b
JCLOUDS-1101: Use correct HttpException
Importing javax.xml.ws.http.HTTPException causes Java 9 issues.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6bb9c927
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6bb9c927
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6bb9c927
Branch: refs/heads/master
Commit: 6bb9c927bb36700bd5d5214f38ed646c41ce17ab
Parents: df43b36
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Aug 30 06:54:33 2017 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Aug 30 09:50:58 2017 -0700
----------------------------------------------------------------------
.../java/org/jclouds/s3/filters/Aws4SignerBase.java | 13 ++++++-------
.../RequestAuthorizeSignatureV4ChunkedUploadTest.java | 2 --
2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6bb9c927/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java
index c30ee46..615f0cf 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/filters/Aws4SignerBase.java
@@ -39,7 +39,6 @@ import java.util.SortedMap;
import java.util.TimeZone;
import javax.inject.Inject;
-import javax.xml.ws.http.HTTPException;
import com.google.common.base.Joiner;
import com.google.common.base.Supplier;
@@ -244,9 +243,9 @@ public abstract class Aws4SignerBase {
*
* @param input
* @return hash result
- * @throws HTTPException
+ * @throws HttpException
*/
- public static byte[] hash(InputStream input) throws HTTPException {
+ public static byte[] hash(InputStream input) throws HttpException {
HashingInputStream his = new HashingInputStream(Hashing.sha256(), input);
try {
ByteStreams.copy(his, ByteStreams.nullOutputStream());
@@ -261,9 +260,9 @@ public abstract class Aws4SignerBase {
*
* @param bytes input bytes
* @return hash result
- * @throws HTTPException
+ * @throws HttpException
*/
- public static byte[] hash(byte[] bytes) throws HTTPException {
+ public static byte[] hash(byte[] bytes) throws HttpException {
try {
return ByteSource.wrap(bytes).hash(Hashing.sha256()).asBytes();
} catch (IOException e) {
@@ -277,9 +276,9 @@ public abstract class Aws4SignerBase {
*
* @param input input stream
* @return hash result
- * @throws HTTPException
+ * @throws HttpException
*/
- public static byte[] hash(String input) throws HTTPException {
+ public static byte[] hash(String input) throws HttpException {
return hash(new ByteArrayInputStream(input.getBytes(UTF_8)));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6bb9c927/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java
index 39a6fe1..63f16d2 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4ChunkedUploadTest.java
@@ -46,7 +46,6 @@ import org.jclouds.util.Closeables2;
import org.testng.annotations.Test;
import javax.inject.Named;
-import javax.xml.ws.http.HTTPException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -180,7 +179,6 @@ public class RequestAuthorizeSignatureV4ChunkedUploadTest {
*
* @param input
* @return hash result
- * @throws HTTPException
*/
private static byte[] hash(InputStream input) {
try {