svn commit: r1030719 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/oauth/ main/java/org/apache/shindig/gadgets/servlet/ test/java/org/apache/shindig/gadgets/servlet/

[li...@apache.org]

Author: lindner
Date: Wed Nov  3 21:48:24 2010
New Revision: 1030719

URL: http://svn.apache.org/viewvc?rev=1030719&view=rev
Log:
openjdk 6 workaround for generics bug

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java?rev=1030719&r1=1030718&r2=1030719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java Wed Nov  3 21:48:24 2010
@@ -24,10 +24,9 @@ import org.apache.shindig.gadgets.Gadget
 import org.apache.shindig.gadgets.http.HttpResponse;
 import org.apache.shindig.gadgets.spec.RequestAuthenticationInfo;
 
-import com.google.common.collect.Maps;
-
 import java.util.Enumeration;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -94,7 +93,7 @@ public class OAuthArguments {
   private boolean signViewer = false;
   
   /** Arbitrary name/value pairs associated with the request */
-  private final Map<String, String> requestOptions = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
+  private final Map<String, String> requestOptions = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);
 
   /** Whether the request is one for proxied content */
   private boolean proxiedContentRequest = false;

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java?rev=1030719&r1=1030718&r2=1030719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java Wed Nov  3 21:48:24 2010
@@ -41,9 +41,10 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.List;
+import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -491,7 +492,7 @@ public class HttpRequestHandler {
      */
     public HttpApiResponse(HttpResponse response, Object content, HttpApiRequest httpApiRequest) {
       this.status = response.getHttpStatusCode();
-      this.headers = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
+      this.headers = new TreeMap<String, Collection<String>>(String.CASE_INSENSITIVE_ORDER);
 
       if (response.getHeaders().containsKey("set-cookie")) {
         this.headers.put("set-cookie", response.getHeaders("set-cookie"));

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=1030719&r1=1030718&r2=1030719&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java Wed Nov  3 21:48:24 2010
@@ -23,7 +23,6 @@ import static org.easymock.EasyMock.capt
 import static org.easymock.EasyMock.expect;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import org.apache.shindig.auth.AuthInfo;
 import org.apache.shindig.auth.SecurityToken;
@@ -50,6 +49,7 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -522,7 +522,7 @@ public class MakeRequestHandlerTest exte
 
   @Test
   public void testSetResponseHeadersNoCache() throws Exception {
-    Map<String, List<String>> headers = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
+    Map<String, List<String>> headers = new TreeMap<String,List<String>>(String.CASE_INSENSITIVE_ORDER);
     headers.put("Pragma", Arrays.asList("no-cache"));
     HttpResponse results = new HttpResponseBuilder()
         .addHeader("Pragma", "no-cache")