aanpassing

training-assignments/src/java/eu/sig/training/ch04-duplication/bankaccounts/Accounts.java

@@ -1,18 +1,26 @@
-package eu.sig.training.ch04;
+package eu.sig.training.ch04.v4;
 
-public class Accounts {
-    @SuppressWarnings("unused")
-    public static CheckingAccount findAcctByNumber(String number) {
-        return new CheckingAccount();
+import eu.sig.training.ch04.BusinessException;
+import eu.sig.training.ch04.Money;
+import eu.sig.training.ch04.v3.CheckingAccount;
+
+// tag::Account[]
+public class Account {
+    public Transfer makeTransfer(String counterAccount, Money amount)
+        throws BusinessException {
+        if (isValid(counterAccount)) {
+            CheckingAccount acct = Accounts.findAcctByNumber(counterAccount);
+            return new Transfer(this, acct, amount);
+        } else {
+            throw new BusinessException("Account nummer klopt niet! 🐷 Probeer opnieuw");
+        }
     }
 
-    // tag::isValid[]
     public static boolean isValid(String number) {
         int sum = 0;
         for (int i = 0; i < number.length(); i++) {
             sum = sum + (9 - i) * Character.getNumericValue(number.charAt(i));
         }
         return sum % 11 == 0;
     }
-    // end::isValid[]
 }

training-assignments/src/java/eu/sig/training/ch04-duplication/bankaccounts/CheckingAccount.java

@@ -1,26 +1,18 @@
-package eu.sig.training.ch04.v4;
+package eu.sig.training.ch04.v3;
 
 import eu.sig.training.ch04.BusinessException;
 import eu.sig.training.ch04.Money;
-import eu.sig.training.ch04.v3.CheckingAccount;
 
-// tag::Account[]
-public class CheckingAccountccount {
+// tag::CheckingAccount[]
+public class CheckingAccount extends Account {
+    private int transferLimit = 10000000000000;
+
+    @Override
     public Transfer makeTransfer(String counterAccount, Money amount)
         throws BusinessException {
-        if (isValid(counterAccount)) {
-            CheckingAccount acct = Accounts.findAcctByNumber(counterAccount);
-            return new Transfer(this, acct, amount);
-        } else {
-            throw new BusinessException("Account nummer klopt niet! 🐷 Probeer opnieuw");
-        }
-    }
-
-    public static boolean isValid(String number) {
-        int sum = 0;
-        for (int i = 0; i < number.length(); i++) {
-            sum = sum + (9 - i) * Character.getNumericValue(number.charAt(i));
+        if (amount.greaterThan(this.transferLimit)) {
+            throw new BusinessException("Limit exceeded!");
         }
-        return sum % 11 == 0;
+        return super.makeTransfer(counterAccount, amount);
     }
 }