remove a gate from the second check router

Author: pauldambra

src/main/java/com/dambra/paul/moduluschecker/ModulusCheckingChain.java

@@ -32,11 +32,15 @@ final class ModulusCheckingChain {
      * ExceptionFourteenGate
      *         |
      *         V
+     * ExceptionTwoAndNineGate
+     *         |
+     *         V
      * SecondModulusCheckRouter
      */
-    static ModulusChainCheck create(ModulusWeightRows weightRows, SortCodeSubstitution sortCodeSubstitution) {
+    static ModulusChainLink create(ModulusWeightRows weightRows, SortCodeSubstitution sortCodeSubstitution) {
         final SecondModulusCheckRouter secondModulusCheckRouter = new SecondModulusCheckRouter(sortCodeSubstitution);
-        final ExceptionFourteenGate exceptionFourteenGate = new ExceptionFourteenGate(secondModulusCheckRouter);
+        final ExceptionTwoAndNineGate exceptionTwoAndNineGate = new ExceptionTwoAndNineGate(secondModulusCheckRouter);
+        final ExceptionFourteenGate exceptionFourteenGate = new ExceptionFourteenGate(exceptionTwoAndNineGate);
         final ExceptionTwoGate exceptionTwoGate = new ExceptionTwoGate(exceptionFourteenGate);
         final SecondCheckRequiredGate secondCheckRequiredGate = new SecondCheckRequiredGate(exceptionTwoGate);
         final FirstModulusCheckRouter firstModulusCheckRouter = new FirstModulusCheckRouter(

src/main/java/com/dambra/paul/moduluschecker/chain/AtLeastOneWeightRowGate.java

@@ -2,11 +2,10 @@
 
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
 import com.dambra.paul.moduluschecker.valacdosFile.ModulusWeightRows;
-import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
 
 import java.util.Optional;
 
-public final class AtLeastOneWeightRowGate implements ModulusChainCheck {
+public final class AtLeastOneWeightRowGate implements ModulusChainLink {
     private final ModulusWeightRows modulusWeightRows;
     private final ExceptionSixGate next;
 

src/main/java/com/dambra/paul/moduluschecker/chain/ExceptionEightAccountTransformer.java

@@ -3,7 +3,7 @@
 import com.dambra.paul.moduluschecker.Account.BankAccount;
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
 
-public final class ExceptionEightAccountTransformer implements ModulusChainCheck {
+public final class ExceptionEightAccountTransformer implements ModulusChainLink {
 
     private final ExceptionTenAccountTransformer next;
 

src/main/java/com/dambra/paul/moduluschecker/chain/ExceptionFourteenGate.java

@@ -11,11 +11,11 @@
  * • If the check passes (that is, there is no remainder), then the account number should be
  * considered valid. Do not perform the second check
  */
-public class ExceptionFourteenGate implements ModulusChainCheck {
+public class ExceptionFourteenGate implements ModulusChainLink {
 
-    private final SecondModulusCheckRouter next;
+    private final ExceptionTwoAndNineGate next;
 
-    public ExceptionFourteenGate(SecondModulusCheckRouter next) {
+    public ExceptionFourteenGate(ExceptionTwoAndNineGate next) {
         this.next = next;
     }
 

src/main/java/com/dambra/paul/moduluschecker/chain/ExceptionSevenAccountTransformer.java

@@ -3,7 +3,7 @@
 import com.dambra.paul.moduluschecker.Account.BankAccount;
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
 
-public final class ExceptionSevenAccountTransformer implements ModulusChainCheck {
+public final class ExceptionSevenAccountTransformer implements ModulusChainLink {
 
     private final ExceptionEightAccountTransformer next;
 

src/main/java/com/dambra/paul/moduluschecker/chain/ExceptionSixGate.java

@@ -13,7 +13,7 @@
  * • If a = 4, 5, 6, 7 or 8, and g and h are the same, the accounts are for a foreign currency and the
  * checks cannot be used.
  */
-public class ExceptionSixGate implements ModulusChainCheck {
+public class ExceptionSixGate implements ModulusChainLink {
 
     private final ExceptionSevenAccountTransformer next;
 

src/main/java/com/dambra/paul/moduluschecker/chain/ExceptionTenAccountTransformer.java

@@ -3,7 +3,7 @@
 import com.dambra.paul.moduluschecker.Account.BankAccount;
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
 
-public final class ExceptionTenAccountTransformer implements ModulusChainCheck {
+public final class ExceptionTenAccountTransformer implements ModulusChainLink {
 
     private final FirstModulusCheckRouter next;
 

src/main/java/com/dambra/paul/moduluschecker/chain/ExceptionTwoAndNineGate.java

@@ -0,0 +1,34 @@
+package com.dambra.paul.moduluschecker.chain;
+
+import com.dambra.paul.moduluschecker.ModulusCheckParams;
+import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
+
+public final class ExceptionTwoAndNineGate implements ModulusChainLink {
+
+    private final SecondModulusCheckRouter next;
+
+    public ExceptionTwoAndNineGate(SecondModulusCheckRouter next) {
+        this.next = next;
+    }
+
+    @Override
+    public ModulusResult check(ModulusCheckParams params) {
+        if (isExceptionTwoAndNine(params)
+                &&firstCheckSucceeded(params)) {
+            return params.modulusResult.get();
+        }
+        return next.check(params);
+    }
+
+    private boolean isExceptionTwoAndNine(ModulusCheckParams params) {
+        return WeightRow.isExceptionTwoAndNine(
+                params.firstWeightRow,
+                params.secondWeightRow);
+    }
+
+    private boolean firstCheckSucceeded(ModulusCheckParams params) {
+        return params.modulusResult.isPresent()
+                && params.modulusResult.get().firstCheckResult.isPresent()
+                && params.modulusResult.get().firstCheckResult.get();
+    }
+}

src/main/java/com/dambra/paul/moduluschecker/chain/ExceptionTwoGate.java

@@ -3,7 +3,7 @@
 import com.dambra.paul.moduluschecker.ModulusCheckParams;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
 
-public class ExceptionTwoGate implements ModulusChainCheck {
+public class ExceptionTwoGate implements ModulusChainLink {
 
     private final ExceptionFourteenGate next;
 

src/main/java/com/dambra/paul/moduluschecker/chain/FirstModulusCheckRouter.java

@@ -8,10 +8,9 @@
 import com.dambra.paul.moduluschecker.chain.checks.ModulusTenCheck;
 import com.dambra.paul.moduluschecker.valacdosFile.WeightRow;
 
-import java.util.Optional;
 import java.util.function.Function;
 
-public final class FirstModulusCheckRouter implements ModulusChainCheck {
+public final class FirstModulusCheckRouter implements ModulusChainLink {
     private final SortCodeSubstitution sortCodeSubstitution;
     private final SecondCheckRequiredGate next;