Merge pull request #2 from GovTechSG/developement

commit changes for Issue #1

Author: Kelvin Wijaya

CHANGELOG.md

@@ -2,4 +2,6 @@
 
 ## Added 
 ### V1.0-SNAPSHOT
-+ Initial release with HMAC256 and RSA256 signing utility
++ Initial release with HMAC256 and RSA256 signing utility
+### V1.0.1-SNAPSHOT
++ Enhancement for Issue #1 - ApiList sorting is not based on key first then value

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'com.github.kt3k.coveralls' version '2.6.3'
 }
 
-version '1.0-SNAPSHOT'
+version '1.0.1-SNAPSHOT'
 
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.api.util</groupId>
   <artifactId>ApiSecurity</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

src/main/java/com/api/util/ApiSecurity/ApiList.java

@@ -2,7 +2,9 @@
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 /**
  * @author GDS-PDD
@@ -29,19 +31,25 @@ public String toString() {
 
 	public String toString(String delimiter, Boolean sort, Boolean quote)
 	{
-		ArrayList<String> list = new ArrayList<String>();
-
-		String format = "%s=%s";
-		if (quote) format = "%s=\"%s\"";
-
-		for (Entry<String, String> item : this)
-		{
-			list.add(String.format(format, item.getKey(), item.getValue()));
+		List<String> list = new ArrayList<String>();
+		
+		final String format = (quote ? "%s=\"%s\"" : "%s=%s");
+		
+		/* Sort key first then value*/
+		if (sort){
+			list = this.stream()
+					.sorted((Entry<String,String> l1, Entry<String,String> l2) -> 
+					{
+						return l1.getKey().equals(l2.getKey()) ? l1.getValue().compareTo(l2.getValue())
+									: l1.getKey().compareTo(l2.getKey());
+					})
+					.map(e -> String.format(format, e.getKey(), e.getValue()))
+					.collect(Collectors.toList());
+		} else{
+			list = this.stream().map(e -> String.format(format, e.getKey(), e.getValue()))
+					.collect(Collectors.toList());
 		}
-
-		/* Sort statement*/
-		if (sort) Collections.sort(list);
-	
+		
 		return String.join(delimiter, list);
 	}
 }

src/test/java/AuthorizationTokenTest.java

@@ -69,7 +69,8 @@ public void Test_L1_Basic_Test() throws ApiUtilException
 			, nonce
 			, timestamp
 		);
-
+		System.out.println("expectedToken:"+expectedToken);
+		System.out.println("authorizationToken:"+authorizationToken);
 		assertEquals(expectedToken, authorizationToken);
 	}