springframeworkguru#26 - TDD Chapter 10 - Interesting Times - times() Method was refactored and consolidated in the Money Class

Author: patrickcorbett

src/main/java/guru/springframework/Dollar.java

@@ -8,9 +8,4 @@ public class Dollar extends Money {
     public Dollar(int amount, String currency) {
         super(amount, currency);
     }
-
-    @Override
-    public Money times(int multiplier) {
-        return Money.dollar(amount * multiplier);
-    }
 }

src/main/java/guru/springframework/Franc.java

@@ -8,9 +8,4 @@ public class Franc extends Money {
     public Franc(int amount, String currency) {
         super(amount, currency);
     }
-
-    @Override
-    public Money times(int multiplier) {
-        return Money.franc(amount * multiplier);
-    }
 }

src/main/java/guru/springframework/Money.java

@@ -3,7 +3,7 @@
 /**
  * @author Patrick Corbett
  */
-public abstract class Money {
+public class Money {
 
     protected int amount;
     protected String currency;
@@ -22,14 +22,6 @@ protected String currency() {
         return currency;
     }
 
-    /**
-     * Abstract Times for money by a multiplier.
-     *
-     * @param multiplier the multiplier
-     * @return the money
-     */
-    public abstract Money times(int multiplier);
-
     public static Money dollar(int amount) {
         return new Dollar(amount, "USD");
     }
@@ -41,6 +33,24 @@ public static Money franc(int amount) {
     public boolean equals(Object object) {
         // Manual equals, left like this as equals with null will be done later
         Money money = (Money) object;
-        return amount == money.amount && this.getClass().equals(object.getClass());
+        return amount == money.amount && this.currency.equals(money.currency);
+    }
+
+    @Override
+    public String toString() {
+        return "Money{" +
+                "amount=" + amount +
+                ", currency='" + currency + '\'' +
+                '}';
+    }
+
+    /**
+     * Times for money by a multiplier.
+     *
+     * @param multiplier the multiplier
+     * @return the money
+     */
+    public Money times(int multiplier) {
+        return new Money(amount * multiplier, this.currency);
     }
 }