svn commit: r736157 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java

[beaton]

Author: beaton
Date: Tue Jan 20 15:00:03 2009
New Revision: 736157

URL: http://svn.apache.org/viewvc?rev=736157&view=rev
Log:
Make request options case insensitive.

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java?rev=736157&r1=736156&r2=736157&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
 Tue Jan 20 15:00:03 2009
@@ -83,7 +83,7 @@
   private boolean signViewer = false;
   
   /** Arbitrary name/value pairs associated with the request */
-  private final Map<String, String> requestOptions;
+  private final Map<String, String> requestOptions = 
Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
 
   /**
    * Parse OAuthArguments from parameters to the makeRequest servlet.
@@ -102,7 +102,6 @@
     bypassSpecCache = "1".equals(getRequestParam(request, 
BYPASS_SPEC_CACHE_PARAM, null));
     signOwner = Boolean.parseBoolean(getRequestParam(request, 
SIGN_OWNER_PARAM, "true"));
     signViewer = Boolean.parseBoolean(getRequestParam(request, 
SIGN_VIEWER_PARAM, "true"));
-    requestOptions = Maps.newHashMap();
     Enumeration<String> params = getParameterNames(request);
     while (params.hasMoreElements()) {
       String name = params.nextElement();
@@ -130,7 +129,7 @@
     bypassSpecCache = false;
     signOwner = info.isSignOwner();
     signViewer = info.isSignViewer();
-    requestOptions = Maps.newHashMap(info.getAttributes());
+    requestOptions.putAll(info.getAttributes());
   }
 
   /**
@@ -192,7 +191,6 @@
    * method in real code, consider writing a new constructor instead.
    */
   public OAuthArguments() {
-    requestOptions = Maps.newHashMap();
   }
 
 
@@ -209,7 +207,7 @@
     bypassSpecCache = orig.bypassSpecCache;
     signOwner = orig.signOwner;
     signViewer = orig.signViewer;
-    requestOptions = Maps.newHashMap(orig.requestOptions);
+    requestOptions.putAll(orig.requestOptions);
   }
 
   public boolean mustUseToken() {

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java?rev=736157&r1=736156&r2=736157&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
 Tue Jan 20 15:00:03 2009
@@ -93,6 +93,7 @@
     Assert.assertFalse(args.getSignOwner());
     Assert.assertFalse(args.getSignViewer());
     assertEquals("stuff", args.getRequestOption("random"));
+    assertEquals("stuff", args.getRequestOption("rAnDoM"));
   }
 
   @Test