conforms OAuth 1.0 Tokens to the last not obsolete specs

s-gromov · s-gromov · commit 0f3993972f62 · 2016-02-25T13:17:14.000+03:00
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1AccessToken.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1AccessToken.java
@@ -3,11 +3,11 @@
 import java.util.Objects;
 
 /**
- * Represents an OAuth 1 Access Token http://oauth.net/core/1.0a/#rfc.section.6.3.2
+ * Represents an OAuth 1 Access Token http://tools.ietf.org/html/rfc5849#section-2.3
  */
 public class OAuth1AccessToken extends OAuth1Token {
 
-    private static final long serialVersionUID = -8784937061938486135L;
+    private static final long serialVersionUID = -103999293167210966L;
 
     public OAuth1AccessToken(String token, String tokenSecret) {
         this(token, tokenSecret, null);
@@ -17,6 +17,26 @@ public OAuth1AccessToken(String token, String tokenSecret, String rawResponse) {
         super(token, tokenSecret, rawResponse);
     }
 
+    /**
+     * The token identifier.
+     *
+     * @return oauth_token
+     */
+    @Override
+    public String getToken() {
+        return super.getToken();
+    }
+
+    /**
+     * The token shared-secret.
+     *
+     * @return oauth_token_secret
+     */
+    @Override
+    public String getTokenSecret() {
+        return super.getTokenSecret();
+    }
+
     @Override
     public int hashCode() {
         int hash = 3;
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1RequestToken.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1RequestToken.java
@@ -3,17 +3,17 @@
 import java.util.Objects;
 
 /**
- * Represents an OAuth 1 Request Token http://oauth.net/core/1.0a/#rfc.section.6.1.2
+ * Represents an OAuth 1 Request Token http://tools.ietf.org/html/rfc5849#section-2.1
  */
 public class OAuth1RequestToken extends OAuth1Token {
 
-    private static final long serialVersionUID = 359527630020350893L;
+    private static final long serialVersionUID = 6185104114662587991L;
 
     /**
      * oauth_callback_confirmed:
      * <p>
-     * MUST be present and set to true. The Consumer MAY use this to confirm that the Service Provider received the
-     * callback value.</p>
+     * MUST be present and set to "true". The parameter is used to differentiate from previous versions of the protocol.
+     * </p>
      */
     private final boolean oauthCallbackConfirmed;
 
@@ -30,6 +30,26 @@ public OAuth1RequestToken(String token, String tokenSecret, boolean oauthCallbac
         this.oauthCallbackConfirmed = oauthCallbackConfirmed;
     }
 
+    /**
+     * The temporary credentials identifier.
+     *
+     * @return oauth_token
+     */
+    @Override
+    public String getToken() {
+        return super.getToken();
+    }
+
+    /**
+     * The temporary credentials shared-secret.
+     *
+     * @return oauth_token_secret
+     */
+    @Override
+    public String getTokenSecret() {
+        return super.getTokenSecret();
+    }
+
     public boolean isOauthCallbackConfirmed() {
         return oauthCallbackConfirmed;
     }
@@ -69,6 +89,6 @@ public String toString() {
         return "OAuth1RequestToken{"
                 + "oauth_token=" + getToken()
                 + ", oauth_token_secret=" + getTokenSecret()
-                + ", oauthCallbackConfirmed=" + oauthCallbackConfirmed + '}';
+                + ", oauth_callback_confirmed=" + oauthCallbackConfirmed + '}';
     }
 }
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1Token.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1Token.java
@@ -9,18 +9,8 @@ public abstract class OAuth1Token extends Token {
 
     private static final long serialVersionUID = 6285873427974823019L;
 
-    /**
-     * oauth_token:
-     * <p>
-     * The Request/Access Token.</p>
-     */
     private final String token;
 
-    /**
-     * oauth_token_secret:
-     * <p>
-     * The Token Secret.</p>
-     */
     private final String tokenSecret;
 
     public OAuth1Token(String token, String tokenSecret, String rawResponse) {
