simplify

Author: dunedodo

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

@@ -19,8 +19,8 @@ public class ChecksumRequestFilter implements ClientRequestFilter {
 
     private S3Config s3Config;
     private S3Signer signer;
-    private ThreadLocal<ClientRequestContext> requestContextThreadLocal = new ThreadLocal<>();
-    private ThreadLocal<OutputStream> bufferThreadLocal = new ThreadLocal<>();
+    private ClientRequestContext clientRequestContext;
+    private OutputStream buffer;
 
     public ChecksumRequestFilter(S3Config s3Config) {
         this.s3Config = s3Config;
@@ -35,14 +35,14 @@ public void filter(ClientRequestContext requestContext) throws IOException {
         Boolean verifyWrite = (Boolean) requestContext.getConfiguration().getProperty(RestUtil.PROPERTY_VERIFY_WRITE_CHECKSUM);
         Boolean generateMd5 = (Boolean) requestContext.getConfiguration().getProperty(RestUtil.PROPERTY_GENERATE_CONTENT_MD5);
         OutputStream out = requestContext.getEntityStream();
-        bufferThreadLocal.set(out);
+        buffer = out;
 
         if ((verifyWrite != null && verifyWrite) || (generateMd5 != null && generateMd5)){
             try {
                 RunningChecksum checksum = new RunningChecksum(ChecksumAlgorithm.MD5);
                 out = new ChecksummedOutputStream(out, checksum, generateMd5);
                 requestContext.setEntityStream(out);
-                requestContextThreadLocal.set(requestContext);
+                clientRequestContext = requestContext;
             } catch (NoSuchAlgorithmException e) {
                 throw new RuntimeException("fatal: MD5 algorithm not found");
             }
@@ -89,10 +89,12 @@ public void flush() throws IOException {
         public void close() throws IOException {
             delegate.close();
 
-            ClientRequestContext clientRequestContext = requestContextThreadLocal.get();
             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) {
                     Map<String, String> parameters = RestUtil.getQueryParameterMap(clientRequestContext.getUri().getRawQuery());
@@ -105,7 +107,7 @@ public void close() throws IOException {
             } else {
                 clientRequestContext.setProperty(RestUtil.PROPERTY_VERIFY_WRITE_CHECKSUM_VALUE, checksum.getHexValue());
             }
-            clientRequestContext.setEntityStream(bufferThreadLocal.get());
+            clientRequestContext.setEntityStream(buffer);
         }
 
         public ChecksumValue getChecksum() { return checksum; }

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

@@ -45,7 +45,6 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Date;
-import java.util.Map;
 
 @Provider
 @Priority(FilterPriorities.PRIORITY_ERROR)

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

@@ -27,6 +27,7 @@
 package com.emc.object.s3.jersey;
 
 import com.emc.object.s3.S3Exception;
+import com.emc.object.util.RestUtil;
 
 import javax.annotation.Priority;
 import javax.ws.rs.WebApplicationException;

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

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

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

@@ -1274,7 +1274,7 @@ public void testCreateObjectWithMetadata() {
         expires.add(Calendar.DATE, 1);
         expires.set(Calendar.MILLISECOND, 0);
         Map<String, String> userMeta = new HashMap<String, String>();
-        userMeta.put("meta1", "value1");
+        userMeta.put("meta=?", "value1");
         userMeta.put("meta2", "value2");
 
         S3ObjectMetadata objectMetadata = new S3ObjectMetadata().withContentType(ct);