Remove extra spaces and fix methods order

Author: Gaboso

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.gaboso</groupId>
     <artifactId>java-design-patterns</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <properties>
         <java.version>11</java.version>
@@ -40,7 +40,6 @@
             <version>4.0.7</version>
         </dependency>
 
-
     </dependencies>
 
 </project>

src/main/java/com/github/gaboso/behavior/command/receiver/Light.java

@@ -18,12 +18,12 @@ public void toggle() {
         }
     }
 
-    public void on() {
-        System.out.println("Light switched on");
-    }
-
     public void off() {
         System.out.println("Light switched off");
     }
 
+    public void on() {
+        System.out.println("Light switched on");
+    }
+
 }

src/main/java/com/github/gaboso/behavior/interpreter/InterpreterMain.java

@@ -7,6 +7,13 @@
 
 public class InterpreterMain {
 
+    public static void main(String[] args) {
+        String context = "Lions Bears";
+
+        Expression define = buildInterpreterTree();
+        System.out.println(context + " is " + define.interpret(context));
+    }
+
     static Expression buildInterpreterTree() {
         Expression terminalLions = new TerminalExpression("Lions");
         Expression terminalTigers = new TerminalExpression("Tigers");
@@ -18,11 +25,4 @@ static Expression buildInterpreterTree() {
         return new AndExpression(terminalBears, lionsOrTigersAndBears);
     }
 
-    public static void main(String[] args) {
-        String context = "Lions Bears";
-
-        Expression define = buildInterpreterTree();
-        System.out.println(context + " is " + define.interpret(context));
-    }
-
 }

src/main/java/com/github/gaboso/behavior/mediator/MediatorMain.java

@@ -7,7 +7,6 @@
 
 public class MediatorMain {
 
-
     public static void main(String[] args) {
         var mediator = new Mediator();
 

src/main/java/com/github/gaboso/behavior/mediator/receiver/Light.java

@@ -27,12 +27,12 @@ public void toggle() {
         }
     }
 
-    public void on() {
-        System.out.println(location + " Light switched on");
-    }
-
     public void off() {
         System.out.println(location + " Light switched off");
     }
 
+    public void on() {
+        System.out.println(location + " Light switched on");
+    }
+
 }

src/main/java/com/github/gaboso/behavior/memento/memento/EmployeeMemento.java

@@ -5,7 +5,6 @@ public class EmployeeMemento {
     private String name;
     private String phone;
 
-
     public EmployeeMemento(String name, String phone) {
         this.name = name;
         this.phone = phone;

src/main/java/com/github/gaboso/behavior/observer/subject/MessageStream.java

@@ -8,14 +8,14 @@ public class MessageStream extends Subject {
     private final Deque<String> messageHistory = new ArrayDeque<>();
 
     @Override
-    public void setState(String message) {
-        messageHistory.add(message);
-        this.notifyObservers();
+    public String getState() {
+        return messageHistory.getLast();
     }
 
     @Override
-    public String getState() {
-        return messageHistory.getLast();
+    public void setState(String message) {
+        messageHistory.add(message);
+        this.notifyObservers();
     }
 
 }

src/main/java/com/github/gaboso/behavior/observer/subject/Subject.java

@@ -9,10 +9,10 @@ public abstract class Subject {
 
     private final List<Observer> observers = new ArrayList<>();
 
-    public abstract void setState(String state);
-
     public abstract String getState();
 
+    public abstract void setState(String state);
+
     public void attach(Observer observer) {
         observers.add(observer);
     }

src/main/java/com/github/gaboso/behavior/strategy/StrategyMain.java

@@ -12,21 +12,21 @@ public static void main(String[] args) {
         amexCard.setDate("04/2020");
         amexCard.setCvv("123");
 
-        System.out.println("Is Amex valid: "+ amexCard.isValid());
+        System.out.println("Is Amex valid: " + amexCard.isValid());
 
         var fakeAmexCard = new CreditCard(new AmexStrategy());
         fakeAmexCard.setNumber("3413024635796881");
         fakeAmexCard.setDate("09/2026");
         fakeAmexCard.setCvv("123");
 
-        System.out.println("Is Fake Amex valid: "+ fakeAmexCard.isValid());
+        System.out.println("Is Fake Amex valid: " + fakeAmexCard.isValid());
 
         var visaCard = new CreditCard(new VisaStrategy());
         visaCard.setNumber("4539978020235353");
         visaCard.setDate("03/2027");
         visaCard.setCvv("890");
 
-        System.out.println("Is Visa valid: "+ visaCard.isValid());
+        System.out.println("Is Visa valid: " + visaCard.isValid());
     }
 
 }

src/main/java/com/github/gaboso/behavior/template/template/OrderTemplate.java

@@ -4,18 +4,6 @@ public abstract class OrderTemplate {
 
     public boolean isGift;
 
-    public abstract void doCheckout();
-
-    public abstract void doPayment();
-
-    public abstract void doReceipt();
-
-    public abstract void doDelivery();
-
-    public final void wrapGift() {
-        System.out.println("Gift wrapped.");
-    }
-
     public final void processOrder() {
         doCheckout();
         doPayment();
@@ -28,5 +16,16 @@ public final void processOrder() {
         doDelivery();
     }
 
+    public abstract void doCheckout();
+
+    public abstract void doPayment();
+
+    public final void wrapGift() {
+        System.out.println("Gift wrapped.");
+    }
+
+    public abstract void doReceipt();
+
+    public abstract void doDelivery();
 
 }