Improved test, fixed the order of OauthAuthorizationUri parameters and no longer add clientId if null.

Author: angelomelonas

src/main/java/com/bunq/sdk/model/core/OauthAuthorizationUri.java

@@ -7,6 +7,7 @@
 import com.bunq.sdk.util.HttpUtil;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class OauthAuthorizationUri extends BunqModel {
@@ -66,13 +67,13 @@ public static OauthAuthorizationUri create(
             final String redirectUri,
             final OauthClient client
     ) {
-        Map<String, String> allRequestParameter = new HashMap<String, String>() {
-            {
-                put(FIELD_REDIRECT_URI, redirectUri);
-                put(FIELD_RESPONSE_TYPE, responseType.toString());
-                put(FIELD_CLIENT_ID, client.getClientId());
-            }
-        };
+        Map<String, String> allRequestParameter = new LinkedHashMap<String, String>();
+        allRequestParameter.put(FIELD_REDIRECT_URI, redirectUri);
+        allRequestParameter.put(FIELD_RESPONSE_TYPE, responseType.toString());
+
+        if (client.getClientId() != null) {
+            allRequestParameter.put(FIELD_CLIENT_ID, client.getClientId());
+        }
 
         return new OauthAuthorizationUri(
                 String.format(determineAuthUriFormat(), HttpUtil.createQueryString(allRequestParameter))

src/test/java/com/bunq/sdk/model/core/OauthAuthorizationUriTest.java

@@ -9,7 +9,7 @@ public class OauthAuthorizationUriTest extends BunqSdkTestBase {
     /**
      * Test constants.
      */
-    private static final String TEST_EXPECT_URI = "https://oauth.sandbox.bunq.com/auth?response_type=code&redirect_uri=redirecturi&client_id=null&state=state";
+    private static final String TEST_EXPECT_URI = "https://oauth.sandbox.bunq.com/auth?redirect_uri=redirecturi&response_type=code&state=state";
     private static final String TEST_REDIRECT_URI = "redirecturi";
     private static final String TEST_STATUS = "status";
     private static final String TEST_STATE = "state";