NoIssue: code smells removed

restfb · Jun 5, 2020 · f5aac7e · f5aac7e
1 parent 279f015
commit f5aac7e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/main/java/com/restfb/DefaultFacebookClient.java b/src/main/java/com/restfb/DefaultFacebookClient.java
@@ -63,6 +63,7 @@ public class DefaultFacebookClient extends BaseFacebookClient implements Faceboo
   public static final String APP_ID = "appId";
   public static final String APP_SECRET = "appSecret";
   public static final String SCOPE = "scope";
+  public static final String CANNOT_EXTRACT_ACCESS_TOKEN_MESSAGE = "Unable to extract access token from response.";
   /**
    * Graph API access token.
    */
@@ -428,7 +429,7 @@ public AccessToken obtainAppAccessToken(String appId, String appSecret) {
     try {
       return getAccessTokenFromResponse(response);
     } catch (Exception t) {
-      throw new FacebookResponseContentException("Unable to extract access token from response.", t);
+      throw new FacebookResponseContentException(CANNOT_EXTRACT_ACCESS_TOKEN_MESSAGE, t);
     }
   }
 
@@ -477,7 +478,7 @@ public AccessToken obtainUserAccessToken(String appId, String appSecret, String
     try {
       return getAccessTokenFromResponse(response);
     } catch (Exception t) {
-      throw new FacebookResponseContentException("Unable to extract access token from response.", t);
+      throw new FacebookResponseContentException(CANNOT_EXTRACT_ACCESS_TOKEN_MESSAGE, t);
     }
   }
 
@@ -510,7 +511,7 @@ public AccessToken obtainExtendedAccessToken(String appId, String appSecret, Str
     try {
       return getAccessTokenFromResponse(response);
     } catch (Exception t) {
-      throw new FacebookResponseContentException("Unable to extract access token from response.", t);
+      throw new FacebookResponseContentException(CANNOT_EXTRACT_ACCESS_TOKEN_MESSAGE, t);
     }
   }
 

diff --git a/src/main/java/com/restfb/json/JsonNumber.java b/src/main/java/com/restfb/json/JsonNumber.java
@@ -27,21 +27,21 @@
 @SuppressWarnings("serial") // use default serial UID
 class JsonNumber extends JsonValue {
 
-  private final String string;
+  private final String numberStr;
 
-  JsonNumber(String string) {
-    Objects.requireNonNull(string, STRING_IS_NULL);
-    this.string = string;
+  JsonNumber(String numberStr) {
+    Objects.requireNonNull(numberStr, STRING_IS_NULL);
+    this.numberStr = numberStr;
   }
 
   @Override
   public String toString() {
-    return string;
+    return numberStr;
   }
 
   @Override
   void write(JsonWriter writer) throws IOException {
-    writer.writeNumber(string);
+    writer.writeNumber(numberStr);
   }
 
   @Override
@@ -51,27 +51,27 @@ public boolean isNumber() {
 
   @Override
   public int asInt() {
-    return Integer.parseInt(string, 10);
+    return Integer.parseInt(numberStr, 10);
   }
 
   @Override
   public long asLong() {
-    return Long.parseLong(string, 10);
+    return Long.parseLong(numberStr, 10);
   }
 
   @Override
   public float asFloat() {
-    return Float.parseFloat(string);
+    return Float.parseFloat(numberStr);
   }
 
   @Override
   public double asDouble() {
-    return Double.parseDouble(string);
+    return Double.parseDouble(numberStr);
   }
 
   @Override
   public int hashCode() {
-    return string.hashCode();
+    return numberStr.hashCode();
   }
 
   @Override
@@ -86,7 +86,7 @@ public boolean equals(Object object) {
       return false;
     }
     JsonNumber other = (JsonNumber) object;
-    return string.equals(other.string);
+    return numberStr.equals(other.numberStr);
   }
 
 }