Added raw string to Token, for retrieving additional parameters

fernandezpablo85 · fernandezpablo85 · commit 1eb0b1003c10 · 2011-04-11T14:06:08.000-03:00
diff --git a/changelog.txt b/changelog.txt
@@ -35,3 +35,7 @@
 [1.1.2]
 
   * FIX: Fixed ugly bug that made 1.1.1 practically unusable (thanks Stubbs)
+
+[1.1.3]
+
+  * FEATURE: Added rawResponse to Token, for extracting additional parameters (thanks Dirk McCormick)
diff --git a/src/main/java/org/scribe/extractors/TokenExtractor20Impl.java b/src/main/java/org/scribe/extractors/TokenExtractor20Impl.java
@@ -26,7 +26,7 @@ public Token extract(String response)
     if (matcher.matches())
     {
       String token = URLUtils.formURLDecode(matcher.group(1));
-      return new Token(token, EMPTY_SECRET);
+      return new Token(token, EMPTY_SECRET, response);
     } 
     else
     {
diff --git a/src/main/java/org/scribe/extractors/TokenExtractorImpl.java b/src/main/java/org/scribe/extractors/TokenExtractorImpl.java
@@ -29,7 +29,7 @@ public Token extract(String response)
     {
       String token = URLUtils.formURLDecode(matcher.group(1));
       String secret = URLUtils.formURLDecode(matcher.group(2));
-      return new Token(token, secret);
+      return new Token(token, secret, response);
     }
     else
     {
diff --git a/src/main/java/org/scribe/model/Token.java b/src/main/java/org/scribe/model/Token.java
@@ -13,6 +13,7 @@ public class Token implements Serializable
 	
   private final String token;
   private final String secret;
+  private final String rawResponse;
 
   /**
    * Default constructor
@@ -21,9 +22,15 @@ public class Token implements Serializable
    * @param secret token secret
    */
   public Token(String token, String secret)
+  {
+    this(token, secret, null);
+  }
+
+  public Token(String token, String secret, String rawResponse)
   {
     this.token = token;
     this.secret = secret;
+    this.rawResponse = rawResponse;
   }
 
   public String getToken()
@@ -36,6 +43,15 @@ public String getSecret()
     return secret;
   }
 
+  public String getRawResponse()
+  {
+    if (rawResponse == null)
+    {
+      throw new IllegalStateException("This token object was not constructed by scribe and does not have a rawResponse");
+    }
+    return rawResponse;
+  }
+
   @Override
   public String toString()
   {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public Token extract(String response)`
`26`	`26`	`if (matcher.matches())`
`27`	`27`	`{`
`28`	`28`	`String token = URLUtils.formURLDecode(matcher.group(1));`
`29`		`- return new Token(token, EMPTY_SECRET);`
	`29`	`+ return new Token(token, EMPTY_SECRET, response);`
`30`	`30`	`}`
`31`	`31`	`else`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public Token extract(String response)`
`29`	`29`	`{`
`30`	`30`	`String token = URLUtils.formURLDecode(matcher.group(1));`
`31`	`31`	`String secret = URLUtils.formURLDecode(matcher.group(2));`
`32`		`- return new Token(token, secret);`
	`32`	`+ return new Token(token, secret, response);`
`33`	`33`	`}`
`34`	`34`	`else`
`35`	`35`	`{`