removed MapUtils

fernandezpablo85 · fernandezpablo85 · commit b380b3af3db1 · 2011-12-14T15:46:07.000-03:00
diff --git a/src/main/java/org/scribe/extractors/BaseStringExtractorImpl.java b/src/main/java/org/scribe/extractors/BaseStringExtractorImpl.java
@@ -35,8 +35,7 @@ private String getSortedAndEncodedParams(OAuthRequest request)
     params.addAll(request.getQueryStringParams());
     params.addAll(request.getBodyParams());
     params.addAll(new ParameterList(request.getOauthParameters()));
-    params.sort();
-    return params.asOauthBaseString();
+    return params.sort().asOauthBaseString();
   }
 
   private void checkPreconditions(OAuthRequest request)
diff --git a/src/main/java/org/scribe/model/ParameterList.java b/src/main/java/org/scribe/model/ParameterList.java
@@ -26,7 +26,12 @@ public ParameterList()
   {
     params = new ArrayList<Parameter>();
   }
-  
+
+  ParameterList(List<Parameter> params)
+  {
+    this.params = new ArrayList<Parameter>(params);
+  }
+
   public ParameterList(Map<String, String> map)
   {
     this();
@@ -110,8 +115,10 @@ public int size()
     return params.size();
   }
 
-  public void sort()
+  public ParameterList sort()
   {
-    Collections.sort(params);
+    ParameterList sorted = new ParameterList(params);
+    Collections.sort(sorted.params);
+    return sorted;
   }
 }
diff --git a/src/main/java/org/scribe/utils/MapUtils.java b/src/main/java/org/scribe/utils/MapUtils.java
diff --git a/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java b/src/test/java/org/scribe/extractors/BaseStringExtractorTest.java
@@ -41,7 +41,7 @@ public void shouldThrowExceptionIfRquestHasNoOAuthParameters()
     OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
     extractor.extract(request);
   }
-  
+
   @Test
   public void shouldProperlyEncodeSpaces()
   {
diff --git a/src/test/java/org/scribe/model/ParameterListTest.java b/src/test/java/org/scribe/model/ParameterListTest.java
@@ -1,12 +1,17 @@
 package org.scribe.model;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.scribe.utils.URLUtils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
 /**
  * @author: Pablo Fernandez
  */
@@ -59,4 +64,33 @@ public void shouldAppendParametersToUrlWithQuerystring()
     url = params.appendTo(url);
     Assert.assertEquals(url, expectedUrl);
   }
+
+  @Test
+  public void shouldProperlySortParameters()
+  {
+    params.add("param1", "v1");
+    params.add("param6", "v2");
+    params.add("a_param", "v3");
+    params.add("param2", "v4");
+    Assert.assertEquals("a_param=v3&param1=v1&param2=v4&param6=v2", params.sort().asFormUrlEncodedString());
+  }
+
+  @Test
+  public void shouldProperlySortParametersWithTheSameName()
+  {
+    params.add("param1", "v1");
+    params.add("param6", "v2");
+    params.add("a_param", "v3");
+    params.add("param2", "v4");
+    Assert.assertEquals("a_param=v3&param1=v1&param2=v4&param6=v2", params.sort().asFormUrlEncodedString());
+  }
+
+  @Test
+  public void shouldNotModifyTheOriginalParameterList()
+  {
+    params.add("param1", "v1");
+    params.add("param6", "v2");
+
+    assertNotSame(params, params.sort());
+  }
 }
diff --git a/src/test/java/org/scribe/utils/MapUtilsTest.java b/src/test/java/org/scribe/utils/MapUtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ private String getSortedAndEncodedParams(OAuthRequest request)`
`35`	`35`	`params.addAll(request.getQueryStringParams());`
`36`	`36`	`params.addAll(request.getBodyParams());`
`37`	`37`	`params.addAll(new ParameterList(request.getOauthParameters()));`
`38`		`- params.sort();`
`39`		`- return params.asOauthBaseString();`
	`38`	`+ return params.sort().asOauthBaseString();`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`private void checkPreconditions(OAuthRequest request)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,12 @@ public ParameterList()`
`26`	`26`	`{`
`27`	`27`	`params = new ArrayList<Parameter>();`
`28`	`28`	`}`
`29`		`-`
	`29`	`+`
	`30`	`+ ParameterList(List<Parameter> params)`
	`31`	`+ {`
	`32`	`+ this.params = new ArrayList<Parameter>(params);`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`public ParameterList(Map<String, String> map)`
`31`	`36`	`{`
`32`	`37`	`this();`
`@@ -110,8 +115,10 @@ public int size()`
`110`	`115`	`return params.size();`
`111`	`116`	`}`
`112`	`117`
`113`		`- public void sort()`
	`118`	`+ public ParameterList sort()`
`114`	`119`	`{`
`115`		`- Collections.sort(params);`
	`120`	`+ ParameterList sorted = new ParameterList(params);`
	`121`	`+ Collections.sort(sorted.params);`
	`122`	`+ return sorted;`
`116`	`123`	`}`
`117`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void shouldThrowExceptionIfRquestHasNoOAuthParameters()`
`41`	`41`	`OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");`
`42`	`42`	`extractor.extract(request);`
`43`	`43`	`}`
`44`		`-`
	`44`	`+`
`45`	`45`	`@Test`
`46`	`46`	`public void shouldProperlyEncodeSpaces()`
`47`	`47`	`{`