improve the code

s-gromov · s-gromov · commit d687f3e050d8 · 2016-01-26T14:14:33.000+03:00
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/builder/AbstractServiceBuilder.java b/scribejava-core/src/main/java/com/github/scribejava/core/builder/AbstractServiceBuilder.java
@@ -32,6 +32,7 @@ abstract class AbstractServiceBuilder<T extends AbstractServiceBuilder> {
      * @param callback callback url. Must be a valid url or 'oob' for out of band OAuth
      * @return the {@link ServiceBuilder} instance for method chaining
      */
+    @SuppressWarnings("unchecked")
     public T callback(String callback) {
         Preconditions.checkNotNull(callback, "Callback can't be null");
         this.callback = callback;
@@ -44,6 +45,7 @@ public T callback(String callback) {
      * @param apiKey The api key for your application
      * @return the {@link ServiceBuilder} instance for method chaining
      */
+    @SuppressWarnings("unchecked")
     public T apiKey(String apiKey) {
         Preconditions.checkEmptyString(apiKey, "Invalid Api key");
         this.apiKey = apiKey;
@@ -56,6 +58,7 @@ public T apiKey(String apiKey) {
      * @param apiSecret The api secret for your application
      * @return the {@link ServiceBuilder} instance for method chaining
      */
+    @SuppressWarnings("unchecked")
     public T apiSecret(String apiSecret) {
         Preconditions.checkEmptyString(apiSecret, "Invalid Api secret");
         this.apiSecret = apiSecret;
@@ -68,6 +71,7 @@ public T apiSecret(String apiSecret) {
      * @param scope The OAuth scope
      * @return the {@link ServiceBuilder} instance for method chaining
      */
+    @SuppressWarnings("unchecked")
     public T scope(String scope) {
         Preconditions.checkEmptyString(scope, "Invalid OAuth scope");
         this.scope = scope;
@@ -80,6 +84,7 @@ public T scope(String scope) {
      * @param state The OAuth state
      * @return the {@link ServiceBuilder} instance for method chaining
      */
+    @SuppressWarnings("unchecked")
     public T state(String state) {
         Preconditions.checkEmptyString(state, "Invalid OAuth state");
         this.state = state;
@@ -92,24 +97,28 @@ public T state(String state) {
      * @param type SignatureType
      * @return the {@link ServiceBuilder} instance for method chaining
      */
+    @SuppressWarnings("unchecked")
     public T signatureType(SignatureType type) {
         Preconditions.checkNotNull(type, "Signature type can't be null");
         this.signatureType = type;
         return (T) this;
     }
 
+    @SuppressWarnings("unchecked")
     public T debugStream(OutputStream stream) {
         Preconditions.checkNotNull(stream, "debug stream can't be null");
         this.debugStream = stream;
         return (T) this;
     }
 
+    @SuppressWarnings("unchecked")
     public T grantType(String grantType) {
         Preconditions.checkEmptyString(grantType, "Invalid OAuth grantType");
         this.grantType = grantType;
         return (T) this;
     }
 
+    @SuppressWarnings("unchecked")
     public T debug() {
         debugStream(System.out);
         return (T) this;
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/AbstractRequest.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/AbstractRequest.java
@@ -28,7 +28,7 @@ public abstract class AbstractRequest {
     private final Map<String, String> headers = new HashMap<>();
     private boolean connectionKeepAlive;
     private boolean followRedirects = true;
-    private OAuthService service;
+    private final OAuthService service;
 
     private String payload;
     private String charset;
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
@@ -45,10 +45,10 @@ Response doSend() throws IOException {
         connection.setRequestMethod(verb.name());
         final OAuthConfig config = getService().getConfig();
         if (config.getConnectTimeout() != null) {
-            connection.setConnectTimeout(config.getConnectTimeout().intValue());
+            connection.setConnectTimeout(config.getConnectTimeout());
         }
         if (config.getReadTimeout() != null) {
-            connection.setReadTimeout(config.getReadTimeout().intValue());
+            connection.setReadTimeout(config.getReadTimeout());
         }
         addHeaders();
         if (hasBodyContent()) {
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/Parameter.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/Parameter.java
@@ -7,8 +7,6 @@
  */
 public class Parameter implements Comparable<Parameter> {
 
-    private static final String UTF = "UTF8";
-
     private final String key;
     private final String value;
 
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/services/Base64Encoder.java b/scribejava-core/src/main/java/com/github/scribejava/core/services/Base64Encoder.java
@@ -4,9 +4,11 @@ public abstract class Base64Encoder {
 
     private static Base64Encoder instance;
 
-    public static synchronized Base64Encoder getInstance() {
-        if (instance == null) {
-            instance = createEncoderInstance();
+    public static Base64Encoder getInstance() {
+        synchronized (Base64Encoder.class) {
+            if (instance == null) {
+                instance = createEncoderInstance();
+            }
         }
         return instance;
     }
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/services/RSASha1SignatureService.java b/scribejava-core/src/main/java/com/github/scribejava/core/services/RSASha1SignatureService.java
@@ -14,7 +14,7 @@ public class RSASha1SignatureService implements SignatureService {
     private static final String RSA_SHA1 = "SHA1withRSA";
     private static final String UTF8 = "UTF-8";
 
-    private PrivateKey privateKey;
+    private final PrivateKey privateKey;
 
     public RSASha1SignatureService(PrivateKey privateKey) {
         this.privateKey = privateKey;
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/utils/OAuthEncoder.java b/scribejava-core/src/main/java/com/github/scribejava/core/utils/OAuthEncoder.java
@@ -27,7 +27,7 @@ public abstract class OAuthEncoder {
 
     public static String encode(String plain) {
         Preconditions.checkNotNull(plain, "Cannot encode null object");
-        String encoded = "";
+        String encoded;
         try {
             encoded = URLEncoder.encode(plain, CHARSET);
         } catch (UnsupportedEncodingException uee) {
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java b/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java
@@ -23,15 +23,15 @@ public static String getStreamContents(InputStream is) {
         try {
             final char[] buffer = new char[0x10000];
             final StringBuilder out = new StringBuilder();
-            final Reader in = new InputStreamReader(is, "UTF-8");
-            int read;
-            do {
-                read = in.read(buffer, 0, buffer.length);
-                if (read > 0) {
-                    out.append(buffer, 0, read);
-                }
-            } while (read >= 0);
-            in.close();
+            try (Reader in = new InputStreamReader(is, "UTF-8")) {
+                int read;
+                do {
+                    read = in.read(buffer, 0, buffer.length);
+                    if (read > 0) {
+                        out.append(buffer, 0, read);
+                    }
+                } while (read >= 0);
+            }
             return out.toString();
         } catch (IOException ioe) {
             throw new IllegalStateException("Error while reading response body", ioe);
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/JsonTokenExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/JsonTokenExtractorTest.java
@@ -6,12 +6,12 @@
 
 public class JsonTokenExtractorTest {
 
-    private String response = "'{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X\"}'";
-    private JsonTokenExtractor extractor = new JsonTokenExtractor();
+    private static final String RESPONSE = "'{ \"access_token\":\"I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X\"}'";
+    private final JsonTokenExtractor extractor = new JsonTokenExtractor();
 
     @Test
     public void shouldParseResponse() {
-        final Token token = extractor.extract(response);
+        final Token token = extractor.extract(RESPONSE);
         assertEquals(token.getToken(), "I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X");
     }
 
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/TokenExtractor20Test.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/TokenExtractor20Test.java
@@ -11,7 +11,7 @@ public class TokenExtractor20Test {
     private TokenExtractor20Impl extractor;
 
     @Before
-    public void setup() {
+    public void setUp() {
         extractor = new TokenExtractor20Impl();
     }
 
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/TokenExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/TokenExtractorTest.java
@@ -11,7 +11,7 @@ public class TokenExtractorTest {
     private TokenExtractorImpl extractor;
 
     @Before
-    public void setup() {
+    public void setUp() {
         extractor = new TokenExtractorImpl();
     }
 
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ConnectionStub.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ConnectionStub.java
@@ -69,7 +69,7 @@ public void addResponseHeader(String key, String value) {
     }
 
     @Override
-    public void connect() throws IOException {
+    public void connect() {
     }
 
     @Override
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java
@@ -16,12 +16,11 @@ public class ForceTypeOfHttpRequestTest {
 
     private OAuthRequest request;
     private OAuthRequestAsync requestAsync;
-    private OAuthService oAuthService;
 
     @Before
     public void setUp() {
         ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.NONE);
-        oAuthService = new OAuth20Service(null, new OAuthConfig("test", "test"));
+        final OAuthService oAuthService = new OAuth20Service(null, new OAuthConfig("test", "test"));
         request = new OAuthRequest(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces",
                 oAuthService);
         requestAsync = new OAuthRequestAsync(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces",
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ParameterListTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ParameterListTest.java
@@ -14,7 +14,7 @@ public class ParameterListTest {
     private ParameterList params;
 
     @Before
-    public void setup() {
+    public void setUp() {
         this.params = new ParameterList();
     }
 
@@ -39,7 +39,7 @@ public void shouldAppendParametersToSimpleUrl() {
         params.add("param2", "value with spaces");
 
         url = params.appendTo(url);
-        Assert.assertEquals(url, expectedUrl);
+        Assert.assertEquals(expectedUrl, url);
     }
 
     @Test
@@ -51,7 +51,7 @@ public void shouldAppendParametersToUrlWithQuerystring() {
         params.add("param2", "value with spaces");
 
         url = params.appendTo(url);
-        Assert.assertEquals(url, expectedUrl);
+        Assert.assertEquals(expectedUrl, url);
     }
 
     @Test
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ResponseTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ResponseTest.java
@@ -3,6 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,7 +14,7 @@ public class ResponseTest {
     private ConnectionStub connection;
 
     @Before
-    public void setup() throws Exception {
+    public void setUp() throws IOException {
         connection = new ConnectionStub();
         connection.addResponseHeader("one", "one");
         connection.addResponseHeader("two", "two");
@@ -41,15 +42,15 @@ public void shouldParseBodyContentsOnlyOnce() {
     }
 
     @Test
-    public void shouldHandleAConnectionWithErrors() throws Exception {
+    public void shouldHandleAConnectionWithErrors() throws IOException {
         final Response errResponse = new Response(new FaultyConnection());
         assertEquals(400, errResponse.getCode());
         assertEquals("errors", errResponse.getBody());
     }
 
     private static class FaultyConnection extends ConnectionStub {
 
-        private FaultyConnection() throws Exception {
+        private FaultyConnection() throws MalformedURLException {
             super();
         }
 
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/services/HMACSha1SignatureServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/services/HMACSha1SignatureServiceTest.java
@@ -10,7 +10,7 @@ public class HMACSha1SignatureServiceTest {
     private HMACSha1SignatureService service;
 
     @Before
-    public void setup() {
+    public void setUp() {
         service = new HMACSha1SignatureService();
     }
 
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/services/RSASha1SignatureServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/services/RSASha1SignatureServiceTest.java
@@ -9,7 +9,7 @@
 
 public class RSASha1SignatureServiceTest {
 
-    private RSASha1SignatureService service = new RSASha1SignatureService(getPrivateKey());
+    private final RSASha1SignatureService service = new RSASha1SignatureService(getPrivateKey());
 
     @Test
     public void shouldReturnSignatureMethodString() {
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/services/TimestampServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/services/TimestampServiceTest.java
@@ -7,13 +7,11 @@
 public class TimestampServiceTest {
 
     private TimestampServiceImpl service;
-    private TimestampServiceImpl.Timer timerStub;
 
     @Before
-    public void setup() {
+    public void setUp() {
         service = new TimestampServiceImpl();
-        timerStub = new TimerStub();
-        service.setTimer(timerStub);
+        service.setTimer(new TimerStub());
     }
 
     @Test
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/MapUtilsTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/MapUtilsTest.java
@@ -12,7 +12,7 @@ public class MapUtilsTest {
 
     @Test
     public void shouldPrettyPrintMap() {
-        final Map<Integer, String> map = new HashMap<Integer, String>();
+        final Map<Integer, String> map = new HashMap<>();
         map.put(1, "one");
         map.put(2, "two");
         map.put(3, "three");
@@ -22,7 +22,7 @@ public void shouldPrettyPrintMap() {
 
     @Test
     public void shouldHandleEmptyMap() {
-        final Map<Integer, String> map = new HashMap<Integer, String>();
+        final Map<Integer, String> map = new HashMap<>();
         Assert.assertEquals("{}", MapUtils.toString(map));
     }
 
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/OAuthEncoderTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/OAuthEncoderTest.java
@@ -1,6 +1,5 @@
 package com.github.scribejava.core.utils;
 
-import org.junit.Assert;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
@@ -59,7 +58,7 @@ public void shouldPercentEncodeCorrectlyTwitterCodingExamples() {
             "Dogs%2C%20Cats%20%26%20Mice"};
 
         for (int i = 0; i < sources.length; i++) {
-            Assert.assertEquals(encoded[i], OAuthEncoder.encode(sources[i]));
+            assertEquals(encoded[i], OAuthEncoder.encode(sources[i]));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ Response doSend() throws IOException {`
`45`	`45`	`connection.setRequestMethod(verb.name());`
`46`	`46`	`final OAuthConfig config = getService().getConfig();`
`47`	`47`	`if (config.getConnectTimeout() != null) {`
`48`		`- connection.setConnectTimeout(config.getConnectTimeout().intValue());`
	`48`	`+ connection.setConnectTimeout(config.getConnectTimeout());`
`49`	`49`	`}`
`50`	`50`	`if (config.getReadTimeout() != null) {`
`51`		`- connection.setReadTimeout(config.getReadTimeout().intValue());`
	`51`	`+ connection.setReadTimeout(config.getReadTimeout());`
`52`	`52`	`}`
`53`	`53`	`addHeaders();`
`54`	`54`	`if (hasBodyContent()) {`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@ public abstract class Base64Encoder {`
`4`	`4`
`5`	`5`	`private static Base64Encoder instance;`
`6`	`6`
`7`		`- public static synchronized Base64Encoder getInstance() {`
`8`		`- if (instance == null) {`
`9`		`- instance = createEncoderInstance();`
	`7`	`+ public static Base64Encoder getInstance() {`
	`8`	`+ synchronized (Base64Encoder.class) {`
	`9`	`+ if (instance == null) {`
	`10`	`+ instance = createEncoderInstance();`
	`11`	`+ }`
`10`	`12`	`}`
`11`	`13`	`return instance;`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class TokenExtractor20Test {`
`11`	`11`	`private TokenExtractor20Impl extractor;`
`12`	`12`
`13`	`13`	`@Before`
`14`		`- public void setup() {`
	`14`	`+ public void setUp() {`
`15`	`15`	`extractor = new TokenExtractor20Impl();`
`16`	`16`	`}`
`17`	`17`