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

[li...@apache.org]

Author: lindner
Date: Wed Sep  1 01:09:56 2010
New Revision: 991412

URL: http://svn.apache.org/viewvc?rev=991412&view=rev
Log:
use Pair.of instead of Pairs.newPair

Removed:
    shindig/trunk/java/common/src/main/java/org/apache/shindig/common/Pairs.java
Modified:
    shindig/trunk/java/common/src/test/java/org/apache/shindig/common/PairTest.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java

Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/PairTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/PairTest.java?rev=991412&r1=991411&r2=991412&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/PairTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/PairTest.java Wed Sep  1 01:09:56 2010
@@ -25,7 +25,7 @@ public class PairTest {
 
   @Test
   public void testPair() {
-    Pair<String, Integer> p = Pairs.newPair("one", new Integer(1));
+    Pair<String, Integer> p = Pair.of("one", new Integer(1));
     assertEquals("one", p.one);
     assertEquals(new Integer(1), p.two);
   }

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java?rev=991412&r1=991411&r2=991412&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java Wed Sep  1 01:09:56 2010
@@ -23,7 +23,6 @@ import com.google.common.collect.Lists;
 
 import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.Pair;
-import org.apache.shindig.common.Pairs;
 import org.apache.shindig.common.crypto.BlobCrypter;
 import org.apache.shindig.common.crypto.BlobCrypterException;
 import org.apache.shindig.gadgets.http.HttpRequest;
@@ -123,7 +122,7 @@ public class OAuthResponseParams {
    * Add a request/response pair to our trace of actions associated with this request.
    */
   public void addRequestTrace(HttpRequest request, HttpResponse response) {
-    this.requestTrace.add(Pairs.newPair(request, response));
+    this.requestTrace.add(Pair.of(request, response));
   }
 
   /**

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=991412&r1=991411&r2=991412&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Wed Sep  1 01:09:56 2010
@@ -26,7 +26,6 @@ import org.apache.commons.lang.StringUti
 import org.apache.shindig.common.servlet.HttpUtil;
 import org.apache.shindig.common.servlet.InjectedServlet;
 import org.apache.shindig.common.Pair;
-import org.apache.shindig.common.Pairs;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.uri.UriBuilder;
 import org.apache.shindig.gadgets.GadgetException;
@@ -185,7 +184,7 @@ public class ConcatProxyServlet extends 
           HttpRequest httpReq = concatUri.makeHttpRequest(resourceUri);
           FutureTask<RequestContext> httpFetcher =
                   new FutureTask<RequestContext>(new HttpFetchCallable(httpReq));
-          futureTasks.add(Pairs.newPair(httpReq.getUri(), httpFetcher));
+          futureTasks.add(Pair.of(httpReq.getUri(), httpFetcher));
           executor.execute(httpFetcher);
         } catch (GadgetException ge) {
           if (cos.outputError(resourceUri, ge)) {