added findbugs + maven task to check at compile time

fernandezpablo85 · fernandezpablo85 · commit e0a13c80504c · 2013-02-13T14:03:20.000-03:00
diff --git a/pom.xml b/pom.xml
@@ -49,19 +49,20 @@
       <artifactId>commons-codec</artifactId>
       <version>1.4</version>
     </dependency>
-    
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
-    
+
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.0</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -70,6 +71,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>
+        <version>1.4</version>
         <executions>
           <execution>
             <id>sign-artifacts</id>
@@ -80,6 +82,23 @@
           </execution>
         </executions>
       </plugin>
+        <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.5.2</version>
+        <executions>
+          <execution>
+            <id>failing-on-high</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <threshold>Low</threshold>
+            </configuration>
+          </execution>
+        </executions>
+        </plugin>
     </plugins>
   </build>
 </project>  
diff --git a/src/main/java/org/scribe/builder/api/PlurkApi.java b/src/main/java/org/scribe/builder/api/PlurkApi.java
@@ -26,7 +26,7 @@ public String getAccessTokenEndpoint()
     return ACCESS_TOKEN_URL;
   }
 
-  public class Mobile extends PlurkApi
+  public static class Mobile extends PlurkApi
   {
     private static final String AUTHORIZATION_URL = "http://www.plurk.com/m/authorize?oauth_token=%s";
 
diff --git a/src/main/java/org/scribe/extractors/HeaderExtractorImpl.java b/src/main/java/org/scribe/extractors/HeaderExtractorImpl.java
@@ -26,13 +26,13 @@ public String extract(OAuthRequest request)
     Map<String, String> parameters = request.getOauthParameters();
     StringBuffer header = new StringBuffer(parameters.size() * 20);
     header.append(PREAMBLE);
-    for (String key : parameters.keySet())
+    for (Map.Entry<String, String> entry : parameters.entrySet())
     {
       if(header.length() > PREAMBLE.length())
       { 
         header.append(PARAM_SEPARATOR);
       }
-      header.append(String.format("%s=\"%s\"", key, OAuthEncoder.encode(parameters.get(key))));
+      header.append(String.format("%s=\"%s\"", entry.getKey(), OAuthEncoder.encode(entry.getValue())));
     }
     return header.toString();
   }
diff --git a/src/main/java/org/scribe/model/Request.java b/src/main/java/org/scribe/model/Request.java
@@ -4,7 +4,7 @@
 import java.net.*;
 import java.nio.charset.*;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 import org.scribe.exceptions.*;
 
@@ -189,7 +189,7 @@ public void addPayload(String payload)
    */
   public void addPayload(byte[] payload)
   {
-    this.bytePayload = payload;
+    this.bytePayload = payload.clone();
   }
 
   /**
diff --git a/src/main/java/org/scribe/services/HMACSha1SignatureService.java b/src/main/java/org/scribe/services/HMACSha1SignatureService.java
@@ -44,7 +44,7 @@ private String doSign(String toSign, String keyString) throws Exception
     Mac mac = Mac.getInstance(HMAC_SHA1);
     mac.init(key);
     byte[] bytes = mac.doFinal(toSign.getBytes(UTF8));
-    return new String(Base64.encodeBase64(bytes)).replace(CARRIAGE_RETURN, EMPTY_STRING);
+    return new String(Base64.encodeBase64(bytes), UTF8).replace(CARRIAGE_RETURN, EMPTY_STRING);
   }
 
   /**
diff --git a/src/main/java/org/scribe/services/RSASha1SignatureService.java b/src/main/java/org/scribe/services/RSASha1SignatureService.java
@@ -11,6 +11,7 @@ public class RSASha1SignatureService implements SignatureService
 {
   private static final String METHOD = "RSA-SHA1";
   private static final String RSA_SHA1 = "SHA1withRSA";
+  private static final String UTF8 = "UTF-8";
 
   private PrivateKey privateKey;
 
@@ -28,8 +29,8 @@ public String getSignature(String baseString, String apiSecret, String tokenSecr
     {
       Signature signature = Signature.getInstance(RSA_SHA1);
       signature.initSign(privateKey);
-      signature.update(baseString.getBytes());
-      return new String(Base64.encodeBase64(signature.sign(), false));
+      signature.update(baseString.getBytes(UTF8));
+      return new String(Base64.encodeBase64(signature.sign(), false), UTF8);
     }
     catch (Exception e)
     {
diff --git a/src/main/java/org/scribe/services/TimestampServiceImpl.java b/src/main/java/org/scribe/services/TimestampServiceImpl.java
@@ -53,14 +53,15 @@ void setTimer(Timer timer)
    */
   static class Timer
   {
+    private final Random rand = new Random();
     Long getMilis()
     {
       return System.currentTimeMillis();
     }
 
     Integer getRandomInteger()
     {
-      return new Random().nextInt();
+      return rand.nextInt();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public String getAccessTokenEndpoint()`
`26`	`26`	`return ACCESS_TOKEN_URL;`
`27`	`27`	`}`
`28`	`28`
`29`		`- public class Mobile extends PlurkApi`
	`29`	`+ public static class Mobile extends PlurkApi`
`30`	`30`	`{`
`31`	`31`	`private static final String AUTHORIZATION_URL = "http://www.plurk.com/m/authorize?oauth_token=%s";`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ public String extract(OAuthRequest request)`
`26`	`26`	`Map<String, String> parameters = request.getOauthParameters();`
`27`	`27`	`StringBuffer header = new StringBuffer(parameters.size() * 20);`
`28`	`28`	`header.append(PREAMBLE);`
`29`		`- for (String key : parameters.keySet())`
	`29`	`+ for (Map.Entry<String, String> entry : parameters.entrySet())`
`30`	`30`	`{`
`31`	`31`	`if(header.length() > PREAMBLE.length())`
`32`	`32`	`{`
`33`	`33`	`header.append(PARAM_SEPARATOR);`
`34`	`34`	`}`
`35`		`- header.append(String.format("%s=\"%s\"", key, OAuthEncoder.encode(parameters.get(key))));`
	`35`	`+ header.append(String.format("%s=\"%s\"", entry.getKey(), OAuthEncoder.encode(entry.getValue())));`
`36`	`36`	`}`
`37`	`37`	`return header.toString();`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`import java.net.*;`
`5`	`5`	`import java.nio.charset.*;`
`6`	`6`	`import java.util.*;`
`7`		`-import java.util.concurrent.TimeUnit;`
	`7`	`+import java.util.concurrent.*;`
`8`	`8`
`9`	`9`	`import org.scribe.exceptions.*;`
`10`	`10`
`@@ -189,7 +189,7 @@ public void addPayload(String payload)`
`189`	`189`	`*/`
`190`	`190`	`public void addPayload(byte[] payload)`
`191`	`191`	`{`
`192`		`- this.bytePayload = payload;`
	`192`	`+ this.bytePayload = payload.clone();`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private String doSign(String toSign, String keyString) throws Exception`
`44`	`44`	`Mac mac = Mac.getInstance(HMAC_SHA1);`
`45`	`45`	`mac.init(key);`
`46`	`46`	`byte[] bytes = mac.doFinal(toSign.getBytes(UTF8));`
`47`		`- return new String(Base64.encodeBase64(bytes)).replace(CARRIAGE_RETURN, EMPTY_STRING);`
	`47`	`+ return new String(Base64.encodeBase64(bytes), UTF8).replace(CARRIAGE_RETURN, EMPTY_STRING);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class RSASha1SignatureService implements SignatureService`
`11`	`11`	`{`
`12`	`12`	`private static final String METHOD = "RSA-SHA1";`
`13`	`13`	`private static final String RSA_SHA1 = "SHA1withRSA";`
	`14`	`+ private static final String UTF8 = "UTF-8";`
`14`	`15`
`15`	`16`	`private PrivateKey privateKey;`
`16`	`17`
`@@ -28,8 +29,8 @@ public String getSignature(String baseString, String apiSecret, String tokenSecr`
`28`	`29`	`{`
`29`	`30`	`Signature signature = Signature.getInstance(RSA_SHA1);`
`30`	`31`	`signature.initSign(privateKey);`
`31`		`- signature.update(baseString.getBytes());`
`32`		`- return new String(Base64.encodeBase64(signature.sign(), false));`
	`32`	`+ signature.update(baseString.getBytes(UTF8));`
	`33`	`+ return new String(Base64.encodeBase64(signature.sign(), false), UTF8);`
`33`	`34`	`}`
`34`	`35`	`catch (Exception e)`
`35`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,15 @@ void setTimer(Timer timer)`
`53`	`53`	`*/`
`54`	`54`	`static class Timer`
`55`	`55`	`{`
	`56`	`+ private final Random rand = new Random();`
`56`	`57`	`Long getMilis()`
`57`	`58`	`{`
`58`	`59`	`return System.currentTimeMillis();`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`Integer getRandomInteger()`
`62`	`63`	`{`
`63`		`- return new Random().nextInt();`
	`64`	`+ return rand.nextInt();`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`