Merge branch 'dirtyUpdate' into development

Author: blasttoys

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

1:

@@ -0,0 +1,29 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE6jAcBgoqhkiG9w0BDAEEMA4ECJ0RQQoJZZe2AgIF5QSCBMga6zVR3dGMLjFJ
+QxzAYHOvG5qs6+uC5Vth4KvxBjQz4+eiAajYB/LvwV2YczO6pgHFVYFfvvKQTRet
+CDp8TGk3nItcfgSdKrXKOZTxe1gDF6oMWqgWbKMNPIxsqlLD8fVgKUfVPOUE9Zjp
+WabGK6JYnWgF+BnFAh9BAeGxfSacwRUQIc/Kfw+OWHnzlemoytiUPsjbJ27jIR+z
+UHra1UbXnBnabDES/CvC4v9DSHFZ4PENDbQqvfI+LBTTsSkQp+aFxSYXrj5lK+sX
+WIDCLagXZGza9pptCp4HF9m5vbJJR7ObQpZvz8vEW6YNSNtAkuDGjkvVhfMQhhp5
+bO39r/LMy4Dd2I2W/Kw6ITPHMNMyB1CmoOd+6tt7KMr+lsyPt/Ov4R+U74YLsGPo
+H54dmEeEm75KiGM+2Artdw6RV2/fjI0MhfEY3xi1BMUfXVam8IdrfZ/5dMfMpRB0
+ybPGTI3McPePBZDzg1FUrQt7ZvhERLMR0q0hYQaNNnoWja5YsAvUArFIgj9Twae7
+xNPefUB1Rn70ZOqFLRh086tBv2rkwA7VQdnUcMRu5pw99UGcWih2wGjAiwl/X969
+J9+HUTbU/PXfEc3OLR+QeCY2jeA7Wyi3D/IJxlFUDp1uDEpwDIIShuW1XeP8L+Zr
+o7A4LIY8YfPw0URY2HA2zwAzlAR9psJ3gRveeWVpNUcoJkWL+dPco2oC1fDGJK79
+2qxlPF3aiQCyQHGFqKOZKoKf1bb/k65J7Oi/QtaeeBjbK2a6J9SRpuYiSpJt5/Kr
+XmOKZV3IRXW1iJHL4ClcqBMrLobs0FI4UAD9eyid8F079Xw08rQaddG70VqevT4L
+dbfbhXVzm8OmvVwgaqAtA0Wwu8IfJoapxaA9DejsKaMdTGvBtIgTAR8A6PQxeojZ
+FaFq/DIN19cxW+vhdKgG1GyBKMijYQkyNbvWz/EpH8zKoT3W4cRvNlhaTwmICHFk
+0H7ynJcn1+CpzNwuP1uGVsq5S42dZguOOoNuY+GI2GWz8swTRdkEf17uHAL1RqL/
+znBi/Xsqgg826zY67dvXAPj+XyldjJOIcXLi9xddS7oXem20CLHSSEQMIk7pO/0I
+6nKU735MBU6ll5RSYPfaNPRRQr1VVuC7ACSxiKOgm1orCrk/hq2JWOe7MGO6ZHS8
+xaZOUGRHN+D2rd8mIYcPs23diLyYE1qfS958TAoGzFtXb6zPPgo2Zfp1PkWBy3Ev
+7KxnZJwy0Fh/6vBW5cZ6Wc7F0ObXEQtWtrniJ+iVN4Fdqm4f+5ircxAXH6xK/8Vc
+c1n41ZAr1uR9BbAQ8jhW14hFM1VhWVVX6684grc4C/HVaXjibJp6ee+1odXWEK/e
+McHItz7dHZgbiRMbMMe9NX5txFjv1OkywdhAlQSQNxjr9H68oKy+jFa7a6F14wVH
+g1hBSNXi6GY0F7zv9hLDOq9wXoTx6OvD5dup3aslQwUgTenKFdQKmOWjDfOJCiDH
+SfXtcPoWc6vJf6zoSOTwKgnY2P2+63OYbugPSFe6u2/MqgWf02MOaToL43DHwwqJ
+7yatsR7GtN3dufSXyCnwjra7elShhOtANo8O8E0cR55lm/Ao3O4Q56maEXKGjlB8
+cH8A4wvjmPihX/tEOxM=
+-----END ENCRYPTED PRIVATE KEY-----

certificates/team20.pem

@@ -110,10 +110,12 @@
   </dependencies>
   <properties>
   	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
   <scm>
     <connection>scm:git:https://github.com/GovTechSG/test-suites-apex-api-security.git</connection>
-    <developerConnection>scm:git:https://kelvinwijaya@github.com/GovTechSG/test-suites-apex-api-security.git</developerConnection>
+    <developerConnection>scm:git:https://github.com/GovTechSG/test-suites-apex-api-security.git</developerConnection>
     <url>https://github.com/GovTechSG</url>
 </scm>
 </project>

expected

@@ -1,6 +1,8 @@
 package com.api.util.ApiSecurity;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
@@ -24,14 +26,22 @@ public String toString(Boolean isBaseString) {
 		String delimiter = "&";
 		Boolean sort = true;
 		Boolean quote = false;
-		
 		return this.toString(delimiter, sort, quote, isBaseString);
 	}
 
+//	public String toString(Boolean isBaseString, Boolean sort) {
+//		String delimiter = "&";
+//		Boolean quote = false;
+//		
+//		return this.toString(delimiter, sort, quote, isBaseString);
+//	}
+	
 	public String toString(String delimiter, Boolean sort, Boolean quote, Boolean isBaseString)
 	{
 		List<String> list = new ArrayList<String>();
-		
+		for (Entry<String,String> ent : this) {
+			System.out.println("ToSTRING entry key:" + ent.getKey() + " val: " + ent.getValue());
+		}
 		final String format = (quote ? "%s=\"%s\"" : "%s=%s");
 
 		/* Sort key first then value*/
@@ -51,4 +61,48 @@ public String toString(String delimiter, Boolean sort, Boolean quote, Boolean is
 
 		return String.join(delimiter, list);
 	}
+	
+	
+    public FormList toFormList()
+    {
+        FormList formList = new FormList();
+
+        for (Entry<String,String> item : this)
+        {
+            formList.add(item.getKey(), item.getValue());
+            System.out.println("FORMLIST ITEM " + item.getValue() + "}  key:  {" +item.getKey() );
+        }
+        System.out.println("FORMLIST");
+		System.out.println("FORMLIST " + formList);
+        
+        return formList;
+    }
+	
+	//toFormList
+	
+	//backup
+//	public String toString(String delimiter, Boolean sort, Boolean quote, Boolean isBaseString)
+//	{
+//		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 -> (null== e.getValue() || (null!= e.getValue() && e.getValue().isEmpty()) && isBaseString) ? e.getKey() : 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());
+//		}
+//		
+//		return String.join(delimiter, list);
+//	}
+	
 }