Changed access, added getters and setters with verification logic

Author: RicardoDiffBlue

src/main/java/com/diffblue/corebanking/compliance/CheckCompliance.java

@@ -27,7 +27,7 @@ public static void checkAccountCompliance(List<Account> accountsToVerify) {
 
       // Loop through all the existing compliance rules
       for (ComplianceRule rule : COMPLIANCE_RULES) {
-        rule.ValidateAccountCompliance(a);
+        rule.validateAccountCompliance(a);
       }
     }
   }

src/main/java/com/diffblue/corebanking/compliance/rules/ComplianceRule.java

@@ -6,19 +6,66 @@
 
 public abstract class ComplianceRule {
 
-  protected final List<Account> currentFailedAccounts = new ArrayList<Account>();
-  protected final List<Account> currentPassedAccounts = new ArrayList<Account>();
+  private final List<Account> currentFailedAccounts = new ArrayList<Account>();
+  private final List<Account> currentPassedAccounts = new ArrayList<Account>();
+
+  /**
+   *
+   * @param account
+   */
+  public void setCurrentFailedAccount(Account account) {
+    if (currentFailedAccounts.contains(account)) {
+      throw new IllegalStateException();
+    }
+    currentFailedAccounts.add(account);
+  }
+
+  /**
+   *
+   * @param account
+   */
+  public void setCurrentPassedAccount(Account account) {
+    if (currentPassedAccounts.contains(account)) {
+      throw new IllegalStateException();
+    }
+    currentPassedAccounts.add(account);
+  }
+
+  /**
+   *
+   * @return
+   */
+  public List<Account> getCurrentFailedAccounts() {
+    return this.currentFailedAccounts;
+  }
+
+  /**
+   *
+   * @return
+   */
+  public List<Account> getCurrentPassedAccounts() {
+    return this.currentPassedAccounts;
+  }
 
   /**
    * Checks if the passed account passes or fails this rule.
    *
    * @param account The account to verify compliance.
    */
-  public abstract boolean ValidateAccountCompliance(Account account);
+  public abstract void validateAccountCompliance(Account account);
 
   /** Purges all accounts from the rules. */
   public void purgeAccounts() {
     this.currentFailedAccounts.clear();
     this.currentPassedAccounts.clear();
   }
+
+  /**
+   *
+   * @param account
+   */
+  public void forgetAccount(Account account) {
+    this.currentFailedAccounts.remove(account);
+    this.currentPassedAccounts.remove(account);
+  }
 }

src/main/java/com/diffblue/corebanking/compliance/rules/ComplianceRuleBalanceAboveOrEqualToZero.java

@@ -9,19 +9,16 @@ public class ComplianceRuleBalanceAboveOrEqualToZero extends ComplianceRule {
    *
    * @param account The account to verify compliance.
    */
-  public boolean ValidateAccountCompliance(Account account) {
+  public void validateAccountCompliance(Account account) {
 
     // Make sure the account does not belong to any list.
-    currentFailedAccounts.remove(account);
-    currentPassedAccounts.remove(account);
+    this.forgetAccount(account);
 
     // Check if this account passes or fails this rule.
     if (account.getCurrentBalance() >= 0) {
-      currentPassedAccounts.add(account);
-      return true;
+      setCurrentPassedAccount(account);
     } else {
-      currentFailedAccounts.add(account);
-      return false;
+      setCurrentFailedAccount(account);
     }
   }
 }