allow 'realm' parameter in OAuthParameters

fernandezpablo85 · fernandezpablo85 · commit 3fb9fa83ccde · 2014-09-01T23:19:21.000-03:00
diff --git a/src/main/java/org/scribe/model/OAuthRequest.java b/src/main/java/org/scribe/model/OAuthRequest.java
@@ -4,20 +4,20 @@
 
 /**
  * The representation of an OAuth HttpRequest.
- * 
- * Adds OAuth-related functionality to the {@link Request}  
- * 
+ *
+ * Adds OAuth-related functionality to the {@link Request}
+ *
  * @author Pablo Fernandez
  */
 public class OAuthRequest extends Request
 {
   private static final String OAUTH_PREFIX = "oauth_";
   private Map<String, String> oauthParameters;
   private String realm;
-  
+
   /**
    * Default constructor.
-   * 
+   *
    * @param verb Http verb/method
    * @param url resource URL
    */
@@ -29,10 +29,10 @@ public OAuthRequest(Verb verb, String url)
 
   /**
    * Adds an OAuth parameter.
-   * 
+   *
    * @param key name of the parameter
    * @param value value of the parameter
-   * 
+   *
    * @throws IllegalArgumentException if the parameter is not an OAuth parameter
    */
   public void addOAuthParameter(String key, String value)
@@ -42,36 +42,36 @@ public void addOAuthParameter(String key, String value)
 
   private String checkKey(String key)
   {
-    if (key.startsWith(OAUTH_PREFIX) || key.equals(OAuthConstants.SCOPE))
+    if (key.startsWith(OAUTH_PREFIX) || key.equals(OAuthConstants.SCOPE) || key.equals(OAuthConstants.REALM))
     {
       return key;
-    } 
+    }
     else
     {
-      throw new IllegalArgumentException(String.format("OAuth parameters must either be '%s' or start with '%s'", OAuthConstants.SCOPE, OAUTH_PREFIX));
+      throw new IllegalArgumentException(String.format("OAuth parameters must either be '%s', '%s' or start with '%s'", OAuthConstants.SCOPE, OAuthConstants.REALM, OAUTH_PREFIX));
     }
   }
 
   /**
    * Returns the {@link Map} containing the key-value pair of parameters.
-   * 
+   *
    * @return parameters as map
    */
   public Map<String, String> getOauthParameters()
   {
     return oauthParameters;
   }
 
-  public void setRealm(String realm) 
+  public void setRealm(String realm)
   {
     this.realm = realm;
   }
-  
-  public String getRealm() 
+
+  public String getRealm()
   {
     return realm;
   }
-  
+
   @Override
   public String toString()
   {
diff --git a/src/test/java/org/scribe/model/OAuthRequestTest.java b/src/test/java/org/scribe/model/OAuthRequestTest.java
@@ -22,8 +22,9 @@ public void shouldAddOAuthParamters()
     request.addOAuthParameter(OAuthConstants.NONCE, "nonce");
     request.addOAuthParameter(OAuthConstants.TIMESTAMP, "ts");
     request.addOAuthParameter(OAuthConstants.SCOPE, "feeds");
+    request.addOAuthParameter(OAuthConstants.REALM, "some-realm");
 
-    assertEquals(4, request.getOauthParameters().size());
+    assertEquals(5, request.getOauthParameters().size());
   }
 
   @Test(expected = IllegalArgumentException.class)

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,9 @@ public void shouldAddOAuthParamters()`
`22`	`22`	`request.addOAuthParameter(OAuthConstants.NONCE, "nonce");`
`23`	`23`	`request.addOAuthParameter(OAuthConstants.TIMESTAMP, "ts");`
`24`	`24`	`request.addOAuthParameter(OAuthConstants.SCOPE, "feeds");`
	`25`	`+ request.addOAuthParameter(OAuthConstants.REALM, "some-realm");`
`25`	`26`
`26`		`- assertEquals(4, request.getOauthParameters().size());`
	`27`	`+ assertEquals(5, request.getOauthParameters().size());`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`@Test(expected = IllegalArgumentException.class)`