Refactored BunqBasicHeader for better readability. (bunq#93)

tubbynl · Jul 11, 2018 · 9d43c55 · 9d43c55
1 parent 5ea6bc3
commit 9d43c55
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/src/main/java/com/bunq/sdk/http/BunqBasicHeader.java b/src/main/java/com/bunq/sdk/http/BunqBasicHeader.java
@@ -1,5 +1,6 @@
 package com.bunq.sdk.http;
 
+import com.sun.org.apache.xpath.internal.functions.FuncBoolean;
 import okhttp3.Response;
 
 import java.util.ArrayList;
@@ -41,26 +42,34 @@ private String forSigning() {
   public static String collectForSigning(
           Collection<BunqBasicHeader> allBasicHeader,
           BunqHeader exclude,
-          Collection<BunqHeader> includes) {
-    List<String> headersForSigning = new ArrayList<String>();
+          Collection<BunqHeader> allNonBunqHeaderToInclude) {
+    List<String> allHeaderForSigning = new ArrayList<String>();
 
     for (BunqBasicHeader basicHeader:allBasicHeader) {
-      BunqHeader header = basicHeader.getName();
+      addHeaderForSigningIfNeeded(basicHeader, allHeaderForSigning, allNonBunqHeaderToInclude);
+    }
 
-      if (header.equals(exclude)) {
-        continue;
-      }
+    Collections.sort(allHeaderForSigning);
 
-      if (header.isBunq() || includes.contains(header)) {
-        headersForSigning.add(basicHeader.forSigning());
-      }
-    }
+    return  formatAllHeaderForSigning(allHeaderForSigning);
+  }
 
-    Collections.sort(headersForSigning);
+  private static void addHeaderForSigningIfNeeded(
+      BunqBasicHeader basicHeader,
+      List<String> allHeaderForSigning,
+      Collection<BunqHeader> allNonBunqHeaderToInclude
+  ) {
+    BunqHeader header = basicHeader.getName();
+
+    if (header.isBunq() || allNonBunqHeaderToInclude.contains(header)) {
+      allHeaderForSigning.add(basicHeader.forSigning());
+    }
+  }
 
+  private static String formatAllHeaderForSigning(List<String> allHeaderForSigning) {
     StringBuilder stringBuilder = new StringBuilder();
 
-    for (String header:headersForSigning) {
+    for (String header: allHeaderForSigning) {
       stringBuilder.append(header);
       stringBuilder.append(NEWLINE);
     }