Cleaned up code. Removed blank lines, formatted whitespace to be consistent across all files, made private variables final as necessary, etc.

Author: angelomelonas

src/main/java/com/bunq/sdk/context/ApiContext.java

@@ -5,43 +5,42 @@
  */
 public enum ApiEnvironmentType {
 
-  PRODUCTION(
-      "api.bunq.com",
-      "v1",
-      "sha256/nI/T/sDfioCBHB5mVppDPyLi2HXYanwk2arpZuHLOu0="
-  ),
-  SANDBOX(
-      "public-api.sandbox.bunq.com",
-      "v1",
-      "sha256/SEJfjAW74vHQmGe/lb9NwBjzAw5y7rpJH3UWpGE5q8A="
-  );
-
-  /**
-   * Base URI of each given environment.
-   */
-  private final String baseUri;
-  private final String apiVersion;
-  private final String pinnedKey;
-
-  ApiEnvironmentType(String baseUri, String apiVersion, String pinnedKey) {
-    this.baseUri = baseUri;
-    this.apiVersion = apiVersion;
-    this.pinnedKey = pinnedKey;
-  }
-
-  /**
-   * @return Base URI of the environment.
-   */
-  public String getBaseUri() {
-    return this.baseUri;
-  }
-
-  public String getApiVersion() {
-    return this.apiVersion;
-  }
-
-  public String getPinnedKey() {
-    return pinnedKey;
-  }
-
+    PRODUCTION(
+            "api.bunq.com",
+            "v1",
+            "sha256/nI/T/sDfioCBHB5mVppDPyLi2HXYanwk2arpZuHLOu0="
+    ),
+    SANDBOX(
+            "public-api.sandbox.bunq.com",
+            "v1",
+            "sha256/SEJfjAW74vHQmGe/lb9NwBjzAw5y7rpJH3UWpGE5q8A="
+    );
+
+    /**
+     * Base URI of each given environment.
+     */
+    private final String baseUri;
+    private final String apiVersion;
+    private final String pinnedKey;
+
+    ApiEnvironmentType(String baseUri, String apiVersion, String pinnedKey) {
+        this.baseUri = baseUri;
+        this.apiVersion = apiVersion;
+        this.pinnedKey = pinnedKey;
+    }
+
+    /**
+     * @return Base URI of the environment.
+     */
+    public String getBaseUri() {
+        return this.baseUri;
+    }
+
+    public String getApiVersion() {
+        return this.apiVersion;
+    }
+
+    public String getPinnedKey() {
+        return pinnedKey;
+    }
 }

src/main/java/com/bunq/sdk/context/ApiEnvironmentType.java

@@ -4,41 +4,41 @@
 
 public final class BunqContext {
 
-  /**
-   * Error constatns.
-   */
-  private static final String ERROR_API_CONTEXT_HAS_NOT_BEEN_SET = "Api context has not been set";
-  private static final String ERROR_USER_CONTEXT_HAS_NOT_BEEN_SET = "UserContext has not been set";
-
-  private static ApiContext apiContext;
-  private static UserContext userContext;
-
-  public static void loadApiContext(ApiContext apiContext) {
-    BunqContext.apiContext = apiContext;
-    BunqContext.userContext = new UserContext(apiContext);
-  }
-
-  public static ApiContext getApiContext() {
-    if (BunqContext.apiContext == null) {
-      throw new BunqException(ERROR_API_CONTEXT_HAS_NOT_BEEN_SET);
+    /**
+     * Error constants.
+     */
+    private static final String ERROR_API_CONTEXT_HAS_NOT_BEEN_SET = "Api context has not been set";
+    private static final String ERROR_USER_CONTEXT_HAS_NOT_BEEN_SET = "UserContext has not been set";
+
+    private static ApiContext apiContext;
+    private static UserContext userContext;
+
+    public static void loadApiContext(ApiContext apiContext) {
+        BunqContext.apiContext = apiContext;
+        BunqContext.userContext = new UserContext(apiContext);
     }
 
-    return BunqContext.apiContext;
-  }
+    public static ApiContext getApiContext() {
+        if (BunqContext.apiContext == null) {
+            throw new BunqException(ERROR_API_CONTEXT_HAS_NOT_BEEN_SET);
+        }
 
-  public static UserContext getUserContext() {
-    if (BunqContext.userContext == null) {
-      throw new BunqException(ERROR_USER_CONTEXT_HAS_NOT_BEEN_SET);
+        return BunqContext.apiContext;
     }
 
-    return BunqContext.userContext;
-  }
+    public static UserContext getUserContext() {
+        if (BunqContext.userContext == null) {
+            throw new BunqException(ERROR_USER_CONTEXT_HAS_NOT_BEEN_SET);
+        }
 
-  public static void updateApiContext(ApiContext apiContext) {
-    if (BunqContext.apiContext == null) {
-      throw new BunqException(ERROR_API_CONTEXT_HAS_NOT_BEEN_SET);
+        return BunqContext.userContext;
     }
 
-    BunqContext.apiContext = apiContext;
-  }
+    public static void updateApiContext(ApiContext apiContext) {
+        if (BunqContext.apiContext == null) {
+            throw new BunqException(ERROR_API_CONTEXT_HAS_NOT_BEEN_SET);
+        }
+
+        BunqContext.apiContext = apiContext;
+    }
 }

src/main/java/com/bunq/sdk/context/BunqContext.java

@@ -2,6 +2,7 @@
 
 import com.bunq.sdk.model.core.Installation;
 import com.bunq.sdk.security.SecurityUtils;
+
 import java.security.KeyPair;
 import java.security.PublicKey;
 
@@ -10,38 +11,37 @@
  */
 public class InstallationContext implements java.io.Serializable {
 
-  private String token;
-  private KeyPair keyPairClient;
-  private PublicKey publicKeyServer;
-
-  InstallationContext(Installation installation, KeyPair keyPairClient) {
-    this(installation.getSessionToken().getToken(), keyPairClient,
-        SecurityUtils.createPublicKeyFromFormattedString(installation.getPublicKeyServer())
-    );
-  }
-
-  /**
-   * @param token Installation token returned as a response to the POST /installation
-   * @param keyPairClient Client key pair generated by SDK (Private + Public)
-   * @param publicKeyServer Server public key returned as a response to the POST /installation
-   */
-  public InstallationContext(String token, KeyPair keyPairClient,
-      PublicKey publicKeyServer) {
-    this.token = token;
-    this.keyPairClient = keyPairClient;
-    this.publicKeyServer = publicKeyServer;
-  }
-
-  public String getToken() {
-    return token;
-  }
-
-  public KeyPair getKeyPairClient() {
-    return keyPairClient;
-  }
-
-  public PublicKey getPublicKeyServer() {
-    return publicKeyServer;
-  }
-
+    private final String token;
+    private final KeyPair keyPairClient;
+    private final PublicKey publicKeyServer;
+
+    InstallationContext(Installation installation, KeyPair keyPairClient) {
+        this(installation.getSessionToken().getToken(), keyPairClient,
+                SecurityUtils.createPublicKeyFromFormattedString(installation.getPublicKeyServer())
+        );
+    }
+
+    /**
+     * @param token Installation token returned as a response to the POST /installation
+     * @param keyPairClient Client key pair generated by SDK (Private + Public)
+     * @param publicKeyServer Server public key returned as a response to the POST /installation
+     */
+    public InstallationContext(String token, KeyPair keyPairClient,
+                               PublicKey publicKeyServer) {
+        this.token = token;
+        this.keyPairClient = keyPairClient;
+        this.publicKeyServer = publicKeyServer;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public KeyPair getKeyPairClient() {
+        return keyPairClient;
+    }
+
+    public PublicKey getPublicKeyServer() {
+        return publicKeyServer;
+    }
 }