Findbugs fixes.

rlubke · rlubke · commit 32877453def8 · 2011-10-06T18:37:47.000-07:00
diff --git a/src/main/java/com/ning/http/client/AsyncHttpClient.java b/src/main/java/com/ning/http/client/AsyncHttpClient.java
@@ -275,7 +275,7 @@ public Request build() {
                 if (i >= 0) {
                     url = url.substring(0, i);
                 }
-                signatureCalculator.calculateAndAddSignature(baseURL, request, this);
+                signatureCalculator.calculateAndAddSignature(url, request, this);
             }
             return super.build();
         }
diff --git a/src/main/java/com/ning/http/client/ntlm/NTLMEngine.java b/src/main/java/com/ning/http/client/ntlm/NTLMEngine.java
@@ -76,7 +76,7 @@ public class NTLMEngine {
         java.security.SecureRandom rnd = null;
         try {
             rnd = java.security.SecureRandom.getInstance("SHA1PRNG");
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
         RND_GEN = rnd;
     }
@@ -753,7 +753,7 @@ String getResponse() throws UnsupportedEncodingException {
             } else {
                 resp = messageContents;
             }
-            return new String(Base64.encode(resp));
+            return Base64.encode(resp);
         }
 
     }
@@ -996,8 +996,7 @@ String getResponse() throws UnsupportedEncodingException {
             int domainOffset = ntRespOffset + ntRespLen;
             int userOffset = domainOffset + domainLen;
             int hostOffset = userOffset + userLen;
-            int sessionKeyOffset = hostOffset + hostLen;
-            int finalLength = sessionKeyOffset + 0;
+            int finalLength = hostOffset + hostLen;
 
             // Start the response. Length includes signature and type
             prepareResponse(finalLength, 3);
@@ -1127,7 +1126,6 @@ void update(byte[] input) {
                 int transferAmt = input.length - inputIndex;
                 System.arraycopy(input, inputIndex, dataBuffer, curBufferPos, transferAmt);
                 count += transferAmt;
-                curBufferPos += transferAmt;
             }
         }
 
diff --git a/src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java b/src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java
@@ -45,16 +45,16 @@ public class OAuthSignatureCalculator
         implements SignatureCalculator {
     public final static String HEADER_AUTHORIZATION = "Authorization";
 
-    private final String KEY_OAUTH_CONSUMER_KEY = "oauth_consumer_key";
-    private final String KEY_OAUTH_NONCE = "oauth_nonce";
-    private final String KEY_OAUTH_SIGNATURE = "oauth_signature";
-    private final String KEY_OAUTH_SIGNATURE_METHOD = "oauth_signature_method";
-    private final String KEY_OAUTH_TIMESTAMP = "oauth_timestamp";
-    private final String KEY_OAUTH_TOKEN = "oauth_token";
-    private final String KEY_OAUTH_VERSION = "oauth_version";
+    private static final String KEY_OAUTH_CONSUMER_KEY = "oauth_consumer_key";
+    private static final String KEY_OAUTH_NONCE = "oauth_nonce";
+    private static final String KEY_OAUTH_SIGNATURE = "oauth_signature";
+    private static final String KEY_OAUTH_SIGNATURE_METHOD = "oauth_signature_method";
+    private static final String KEY_OAUTH_TIMESTAMP = "oauth_timestamp";
+    private static final String KEY_OAUTH_TOKEN = "oauth_token";
+    private static final String KEY_OAUTH_VERSION = "oauth_version";
 
-    private final String OAUTH_VERSION_1_0 = "1.0";
-    private final String OAUTH_SIGNATURE_METHOD = "HMAC-SHA1";
+    private static final String OAUTH_VERSION_1_0 = "1.0";
+    private static final String OAUTH_SIGNATURE_METHOD = "HMAC-SHA1";
 
     /**
      * To generate Nonce, need some (pseudo)randomness; no need for
@@ -84,12 +84,12 @@ public OAuthSignatureCalculator(ConsumerKey consumerAuth, RequestToken userAuth)
     //@Override // silly 1.5; doesn't allow this for interfaces
 
     public void calculateAndAddSignature(String baseURL, Request request, RequestBuilderBase<?> requestBuilder) {
-        String method = request.getMethod().toString(); // POST etc
+        String method = request.getMethod(); // POST etc
         String nonce = generateNonce();
         long timestamp = System.currentTimeMillis() / 1000L;
         String signature = calculateSignature(method, baseURL, timestamp, nonce, request.getParams(), request.getQueryParams());
         String headerValue = constructAuthHeader(signature, nonce, timestamp);
-        requestBuilder = requestBuilder.setHeader(HEADER_AUTHORIZATION, headerValue);
+        requestBuilder.setHeader(HEADER_AUTHORIZATION, headerValue);
     }
 
     /**
@@ -260,5 +260,25 @@ public int compareTo(Parameter other) {
         public String toString() {
             return key + "=" + value;
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+
+            Parameter parameter = (Parameter) o;
+
+            if (!key.equals(parameter.key)) return false;
+            if (!value.equals(parameter.value)) return false;
+
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = key.hashCode();
+            result = 31 * result + value.hashCode();
+            return result;
+        }
     }
 }
diff --git a/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java b/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java
@@ -1904,22 +1904,29 @@ public boolean doHandle(final FilterChainContext ctx,
             AtomicInteger written = new AtomicInteger();
             boolean last = false;
             requestPacket.setContentLengthLong(f.length());
-            for (byte[] buf = new byte[MAX_CHUNK_SIZE]; !last; ) {
-                Buffer b = null;
-                int read;
-                if ((read = fis.read(buf)) < 0) {
-                    last = true;
-                    b = Buffers.EMPTY_BUFFER;
+            try {
+                for (byte[] buf = new byte[MAX_CHUNK_SIZE]; !last; ) {
+                    Buffer b = null;
+                    int read;
+                    if ((read = fis.read(buf)) < 0) {
+                        last = true;
+                        b = Buffers.EMPTY_BUFFER;
+                    }
+                    if (b != Buffers.EMPTY_BUFFER) {
+                        written.addAndGet(read);
+                        b = Buffers.wrap(mm, buf, 0, read);
+                    }
+
+                    final HttpContent content =
+                            requestPacket.httpContentBuilder().content(b).
+                                    last(last).build();
+                    ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
                 }
-                if (b != Buffers.EMPTY_BUFFER) {
-                    written.addAndGet(read);
-                    b = Buffers.wrap(mm, buf, 0, read);
+            } finally {
+                try {
+                    fis.close();
+                } catch (IOException ignored) {
                 }
-
-                final HttpContent content =
-                        requestPacket.httpContentBuilder().content(b).
-                                last(last).build();
-                ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
             }
 
             return true;
diff --git a/src/main/java/com/ning/http/client/resumable/PropertiesBasedResumableProcessor.java b/src/main/java/com/ning/http/client/resumable/PropertiesBasedResumableProcessor.java
@@ -60,9 +60,13 @@ public void save(Map<String, Long> map) {
         FileOutputStream os = null;
         try {
 
-            TMP.mkdirs();
+            if (!TMP.mkdirs()) {
+                throw new IllegalStateException("Unable to create directory: " + TMP.getAbsolutePath());
+            }
             File f = new File(TMP, storeName);
-            f.createNewFile();
+            if (!f.createNewFile()) {
+                throw new IllegalStateException("Unable to create temp file: " + f.getAbsolutePath());
+            }
             if (!f.canWrite()) {
                 throw new IllegalStateException();
             }
@@ -79,7 +83,7 @@ public void save(Map<String, Long> map) {
             if (os != null) {
                 try {
                     os.close();
-                } catch (IOException e) {
+                } catch (IOException ignored) {
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ public Request build() {`
`275`	`275`	`if (i >= 0) {`
`276`	`276`	`url = url.substring(0, i);`
`277`	`277`	`}`
`278`		`- signatureCalculator.calculateAndAddSignature(baseURL, request, this);`
	`278`	`+ signatureCalculator.calculateAndAddSignature(url, request, this);`
`279`	`279`	`}`
`280`	`280`	`return super.build();`
`281`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public class NTLMEngine {`
`76`	`76`	`java.security.SecureRandom rnd = null;`
`77`	`77`	`try {`
`78`	`78`	`rnd = java.security.SecureRandom.getInstance("SHA1PRNG");`
`79`		`- } catch (Exception e) {`
	`79`	`+ } catch (Exception ignored) {`
`80`	`80`	`}`
`81`	`81`	`RND_GEN = rnd;`
`82`	`82`	`}`
`@@ -753,7 +753,7 @@ String getResponse() throws UnsupportedEncodingException {`
`753`	`753`	`} else {`
`754`	`754`	`resp = messageContents;`
`755`	`755`	`}`
`756`		`- return new String(Base64.encode(resp));`
	`756`	`+ return Base64.encode(resp);`
`757`	`757`	`}`
`758`	`758`
`759`	`759`	`}`
`@@ -996,8 +996,7 @@ String getResponse() throws UnsupportedEncodingException {`
`996`	`996`	`int domainOffset = ntRespOffset + ntRespLen;`
`997`	`997`	`int userOffset = domainOffset + domainLen;`
`998`	`998`	`int hostOffset = userOffset + userLen;`
`999`		`- int sessionKeyOffset = hostOffset + hostLen;`
`1000`		`- int finalLength = sessionKeyOffset + 0;`
	`999`	`+ int finalLength = hostOffset + hostLen;`
`1001`	`1000`
`1002`	`1001`	`// Start the response. Length includes signature and type`
`1003`	`1002`	`prepareResponse(finalLength, 3);`
`@@ -1127,7 +1126,6 @@ void update(byte[] input) {`
`1127`	`1126`	`int transferAmt = input.length - inputIndex;`
`1128`	`1127`	`System.arraycopy(input, inputIndex, dataBuffer, curBufferPos, transferAmt);`
`1129`	`1128`	`count += transferAmt;`
`1130`		`- curBufferPos += transferAmt;`
`1131`	`1129`	`}`
`1132`	`1130`	`}`
`1133`	`1131`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,13 @@ public void save(Map<String, Long> map) {`
`60`	`60`	`FileOutputStream os = null;`
`61`	`61`	`try {`
`62`	`62`
`63`		`- TMP.mkdirs();`
	`63`	`+ if (!TMP.mkdirs()) {`
	`64`	`+ throw new IllegalStateException("Unable to create directory: " + TMP.getAbsolutePath());`
	`65`	`+ }`
`64`	`66`	`File f = new File(TMP, storeName);`
`65`		`- f.createNewFile();`
	`67`	`+ if (!f.createNewFile()) {`
	`68`	`+ throw new IllegalStateException("Unable to create temp file: " + f.getAbsolutePath());`
	`69`	`+ }`
`66`	`70`	`if (!f.canWrite()) {`
`67`	`71`	`throw new IllegalStateException();`
`68`	`72`	`}`
`@@ -79,7 +83,7 @@ public void save(Map<String, Long> map) {`
`79`	`83`	`if (os != null) {`
`80`	`84`	`try {`
`81`	`85`	`os.close();`
`82`		`- } catch (IOException e) {`
	`86`	`+ } catch (IOException ignored) {`
`83`	`87`	`}`
`84`	`88`	`}`
`85`	`89`	`}`