clean

Author: dunedodo

src/main/java/com/emc/object/s3/jersey/ChecksumRequestFilter.java

@@ -92,8 +92,6 @@ public void close() throws IOException {
             if (generateContentMd5 != null && generateContentMd5) {
                 // add Content-MD5 (before anything is written to the final stream)
                 clientRequestContext.getHeaders().add(RestUtil.HEADER_CONTENT_MD5, DatatypeConverter.printBase64Binary(checksum.getByteValue()));
-                clientRequestContext.getHeaders().add("xxx", DatatypeConverter.printBase64Binary(checksum.getByteValue()));
-
 
                 // need to re-sign request because Content-MD5 is included in the signature!
                 if (s3Config.getIdentity() != null) {

src/main/java/com/emc/object/s3/jersey/FilterPriorities.java

@@ -13,7 +13,6 @@ public class FilterPriorities {
     public static final int PRIORITY_CODEC_REQUEST = 1800;
     public static final int PRIORITY_AUTHORIZATION = Priorities.AUTHORIZATION; //2000
     public static final int PRIORITY_FAULTINJECTION = 2400;
-
     // providers used during response processing (using descending manner)
     public static final int PRIORITY_CHECKSUM_RESPONSE = 4500;
     public static final int PRIORITY_CODEC_RESPONSE = 4000;

src/main/java/com/emc/object/s3/jersey/S3JerseyClient.java

@@ -136,8 +136,8 @@ public S3JerseyClient(S3Config s3Config) {
     }
 
     /**
-     * Provide a specific Jersey ClientHandler implementation (default is ApacheHttpClient4Handler). If you experience
-     * performance problems, you might try using URLConnectionClientHandler, but note that it will not support the
+     * Provide a specific Jersey ClientHandler implementation (default is ApacheHttpClient). If you experience
+     * performance problems, you might try using URLConnectionClient, but note that it will not support the
      * Expect: 100-Continue header and upload size is limited to 2GB. Also note that when using that handler, you should
      * set the "http.maxConnections" system property to match your thread count (default is only 5).
      */

src/main/java/com/emc/object/s3/jersey/StreamExceptionWriteInterceptor.java

@@ -1,6 +1,5 @@
 package com.emc.object.s3.jersey;
 
-import com.emc.object.util.RestUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/test/java/com/emc/object/s3/WriteTruncationTest.java

@@ -162,10 +162,7 @@ void testTruncatedWrite(boolean useApacheClient,
         try {
             s3Client.putObject(new PutObjectRequest(getTestBucket(), key, badStream).withObjectMetadata(metadata));
             Assert.fail("exception in input stream did not throw an exception");
-        } catch (RuntimeException e) {
-            // get RC
-//            Throwable t = e;
-//            while (t.getCause() != null && t.getCause() != t) t = t.getCause();
+        } catch (Exception e) {
             if (exceptionType == ExceptionType.RuntimeException) {
                 Assert.assertTrue(e.getCause() instanceof RuntimeException);
             } else {