Group 2: Aircraft Abstraction and Duplicate Code Removal.

src/main/java/Runner.java

@@ -1,9 +1,7 @@
 import flight.reservation.Airport;
 import flight.reservation.flight.Schedule;
 import flight.reservation.flight.Flight;
-import flight.reservation.plane.Helicopter;
-import flight.reservation.plane.PassengerDrone;
-import flight.reservation.plane.PassengerPlane;
+import flight.reservation.plane.*;
 
 import java.util.Arrays;
 import java.util.List;
@@ -20,13 +18,13 @@ public class Runner {
             new Airport("Chengdu Shuangliu International Airport", "CTU", "Shuangliu-Wuhou, Chengdu, Sichuan")
     );
 
-    static List<Object> aircrafts = Arrays.asList(
-            new PassengerPlane("A380"),
-            new PassengerPlane("A350"),
-            new PassengerPlane("Embraer 190"),
-            new PassengerPlane("Antonov AN2"),
-            new Helicopter("H1"),
-            new PassengerDrone("HypaHype")
+    static List<IAircraft> aircrafts = Arrays.asList(
+            new A380Plane(),
+            new A350Plane(),
+            new Embraer190Plane(),
+            new AntonovAN2Plane(),
+            new H1Helicopter(),
+            new HypaHypePassengerDrone()
     );
 
     static List<Flight> flights = Arrays.asList(

src/main/java/flight/reservation/Customer.java

@@ -21,9 +21,6 @@ public Customer(String name, String email) {
     }
 
     public FlightOrder createOrder(List<String> passengerNames, List<ScheduledFlight> flights, double price) {
-        if (!isOrderValid(passengerNames, flights)) {
-            throw new IllegalStateException("Order is not valid");
-        }
         FlightOrder order = new FlightOrder(flights);
         order.setCustomer(this);
         order.setPrice(price);
@@ -33,25 +30,14 @@ public FlightOrder createOrder(List<String> passengerNames, List<ScheduledFlight
                 .collect(Collectors.toList());
         order.setPassengers(passengers);
         order.getScheduledFlights().forEach(scheduledFlight -> scheduledFlight.addPassengers(passengers));
+        if (!order.isValid()) {
+            throw new IllegalStateException("Order is not valid");
+        }
+
         orders.add(order);
         return order;
     }
 
-    private boolean isOrderValid(List<String> passengerNames, List<ScheduledFlight> flights) {
-        boolean valid = true;
-        valid = valid && !FlightOrder.getNoFlyList().contains(this.getName());
-        valid = valid && passengerNames.stream().noneMatch(passenger -> FlightOrder.getNoFlyList().contains(passenger));
-        valid = valid && flights.stream().allMatch(scheduledFlight -> {
-            try {
-                return scheduledFlight.getAvailableCapacity() >= passengerNames.size();
-            } catch (NoSuchFieldException e) {
-                e.printStackTrace();
-                return false;
-            }
-        });
-        return valid;
-    }
-
     public String getEmail() {
         return email;
     }

src/main/java/flight/reservation/flight/Flight.java

@@ -1,9 +1,7 @@
 package flight.reservation.flight;
 
 import flight.reservation.Airport;
-import flight.reservation.plane.Helicopter;
-import flight.reservation.plane.PassengerDrone;
-import flight.reservation.plane.PassengerPlane;
+import flight.reservation.plane.IAircraft;
 
 import java.util.Arrays;
 
@@ -12,9 +10,9 @@ public class Flight {
     private int number;
     private Airport departure;
     private Airport arrival;
-    protected Object aircraft;
+    protected IAircraft aircraft;
 
-    public Flight(int number, Airport departure, Airport arrival, Object aircraft) throws IllegalArgumentException {
+    public Flight(int number, Airport departure, Airport arrival, IAircraft aircraft) throws IllegalArgumentException {
         this.number = number;
         this.departure = departure;
         this.arrival = arrival;
@@ -29,22 +27,12 @@ private void checkValidity() throws IllegalArgumentException {
     }
 
     private boolean isAircraftValid(Airport airport) {
-        return Arrays.stream(airport.getAllowedAircrafts()).anyMatch(x -> {
-            String model;
-            if (this.aircraft instanceof PassengerPlane) {
-                model = ((PassengerPlane) this.aircraft).model;
-            } else if (this.aircraft instanceof Helicopter) {
-                model = ((Helicopter) this.aircraft).getModel();
-            } else if (this.aircraft instanceof PassengerDrone) {
-                model = "HypaHype";
-            } else {
-                throw new IllegalArgumentException(String.format("Aircraft is not recognized"));
-            }
-            return x.equals(model);
+        return Arrays.stream(airport.getAllowedAircrafts()).anyMatch(allowedModel -> {
+            return allowedModel.equals(aircraft.getModel());
         });
     }
 
-    public Object getAircraft() {
+    public IAircraft getAircraft() {
         return aircraft;
     }
 

src/main/java/flight/reservation/flight/ScheduledFlight.java

@@ -2,9 +2,8 @@
 
 import flight.reservation.Airport;
 import flight.reservation.Passenger;
-import flight.reservation.plane.Helicopter;
-import flight.reservation.plane.PassengerDrone;
-import flight.reservation.plane.PassengerPlane;
+import flight.reservation.plane.IAircraft;
+import flight.reservation.plane.HypaHypePassengerDrone;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -16,30 +15,21 @@ public class ScheduledFlight extends Flight {
     private final Date departureTime;
     private double currentPrice = 100;
 
-    public ScheduledFlight(int number, Airport departure, Airport arrival, Object aircraft, Date departureTime) {
+    public ScheduledFlight(int number, Airport departure, Airport arrival, IAircraft aircraft, Date departureTime) {
         super(number, departure, arrival, aircraft);
         this.departureTime = departureTime;
         this.passengers = new ArrayList<>();
     }
 
-    public ScheduledFlight(int number, Airport departure, Airport arrival, Object aircraft, Date departureTime, double currentPrice) {
+    public ScheduledFlight(int number, Airport departure, Airport arrival, IAircraft aircraft, Date departureTime, double currentPrice) {
         super(number, departure, arrival, aircraft);
         this.departureTime = departureTime;
         this.passengers = new ArrayList<>();
         this.currentPrice = currentPrice;
     }
 
     public int getCrewMemberCapacity() throws NoSuchFieldException {
-        if (this.aircraft instanceof PassengerPlane) {
-            return ((PassengerPlane) this.aircraft).crewCapacity;
-        }
-        if (this.aircraft instanceof Helicopter) {
-            return 2;
-        }
-        if (this.aircraft instanceof PassengerDrone) {
-            return 0;
-        }
-        throw new NoSuchFieldException("this aircraft has no information about its crew capacity");
+        return aircraft.getCrewCapacity();
     }
 
     public void addPassengers(List<Passenger> passengers) {
@@ -51,16 +41,7 @@ public void removePassengers(List<Passenger> passengers) {
     }
 
     public int getCapacity() throws NoSuchFieldException {
-        if (this.aircraft instanceof PassengerPlane) {
-            return ((PassengerPlane) this.aircraft).passengerCapacity;
-        }
-        if (this.aircraft instanceof Helicopter) {
-            return ((Helicopter) this.aircraft).getPassengerCapacity();
-        }
-        if (this.aircraft instanceof PassengerDrone) {
-            return 4;
-        }
-        throw new NoSuchFieldException("this aircraft has no information about its capacity");
+        return this.aircraft.getPassengerCapacity();
     }
 
     public int getAvailableCapacity() throws NoSuchFieldException {

src/main/java/flight/reservation/order/FlightOrder.java

@@ -25,13 +25,13 @@ public List<ScheduledFlight> getScheduledFlights() {
         return flights;
     }
 
-    private boolean isOrderValid(Customer customer, List<String> passengerNames, List<ScheduledFlight> flights) {
+    public boolean isValid() {
         boolean valid = true;
         valid = valid && !noFlyList.contains(customer.getName());
-        valid = valid && passengerNames.stream().noneMatch(passenger -> noFlyList.contains(passenger));
+        valid = valid && passengers.stream().noneMatch(passenger -> noFlyList.contains(passenger.getName()));
         valid = valid && flights.stream().allMatch(scheduledFlight -> {
             try {
-                return scheduledFlight.getAvailableCapacity() >= passengerNames.size();
+                return scheduledFlight.getAvailableCapacity() >= passengers.size();
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
                 return false;

src/main/java/flight/reservation/order/Order.java

@@ -11,8 +11,8 @@ public class Order {
     private final UUID id;
     private double price;
     private boolean isClosed = false;
-    private Customer customer;
-    private List<Passenger> passengers;
+    protected Customer customer;
+    protected List<Passenger> passengers;
 
     public Order() {
         this.id = UUID.randomUUID();

src/main/java/flight/reservation/plane/A350Plane.java

@@ -0,0 +1,19 @@
+package flight.reservation.plane;
+
+public class A350Plane implements IAircraft {
+
+    @Override
+    public String getModel() {
+        return "A350";
+    }
+
+    @Override
+    public int getPassengerCapacity() {
+        return 320;
+    }
+
+    @Override
+    public int getCrewCapacity() {
+        return 40;
+    }
+}

src/main/java/flight/reservation/plane/A380Plane.java

@@ -0,0 +1,19 @@
+package flight.reservation.plane;
+
+public class A380Plane implements IAircraft {
+
+    @Override
+    public String getModel() {
+        return "A380";
+    }
+
+    @Override
+    public int getPassengerCapacity() {
+        return 500;
+    }
+
+    @Override
+    public int getCrewCapacity() {
+        return 42;
+    }
+}

src/main/java/flight/reservation/plane/AntonovAN2Plane.java

@@ -0,0 +1,19 @@
+package flight.reservation.plane;
+
+public class AntonovAN2Plane implements IAircraft {
+
+    @Override
+    public String getModel() {
+        return "Antonov AN2";
+    }
+
+    @Override
+    public int getPassengerCapacity() {
+        return 15;
+    }
+
+    @Override
+    public int getCrewCapacity() {
+        return 3;
+    }
+}

src/main/java/flight/reservation/plane/Embraer190Plane.java

@@ -0,0 +1,19 @@
+package flight.reservation.plane;
+
+public class Embraer190Plane implements IAircraft {
+
+    @Override
+    public String getModel() {
+        return "Embraer 190";
+    }
+
+    @Override
+    public int getPassengerCapacity() {
+        return 25;
+    }
+
+    @Override
+    public int getCrewCapacity() {
+        return 5;
+    }
+}

src/main/java/flight/reservation/plane/H1Helicopter.java

@@ -0,0 +1,14 @@
+package flight.reservation.plane;
+
+public class H1Helicopter extends Helicopter {
+
+    @Override
+    public String getModel() {
+        return "H1";
+    }
+
+    @Override
+    public int getPassengerCapacity() {
+        return 4;
+    }
+}

src/main/java/flight/reservation/plane/H2Helicopter.java

@@ -0,0 +1,14 @@
+package flight.reservation.plane;
+
+public class H2Helicopter extends Helicopter {
+
+    @Override
+    public String getModel() {
+        return "H2";
+    }
+
+    @Override
+    public int getPassengerCapacity() {
+        return 6;
+    }
+}

src/main/java/flight/reservation/plane/Helicopter.java

@@ -1,25 +1,6 @@
 package flight.reservation.plane;
 
-public class Helicopter {
-    private final String model;
-    private final int passengerCapacity;
-
-    public Helicopter(String model) {
-        this.model = model;
-        if (model.equals("H1")) {
-            passengerCapacity = 4;
-        } else if (model.equals("H2")) {
-            passengerCapacity = 6;
-        } else {
-            throw new IllegalArgumentException(String.format("Model type '%s' is not recognized", model));
-        }
-    }
-
-    public String getModel() {
-        return model;
-    }
-
-    public int getPassengerCapacity() {
-        return passengerCapacity;
-    }
+public abstract class Helicopter implements IAircraft {
+    @Override
+    public int getCrewCapacity() { return 2; }
 }

src/main/java/flight/reservation/plane/HypaHypePassengerDrone.java

@@ -0,0 +1,20 @@
+package flight.reservation.plane;
+
+public class HypaHypePassengerDrone implements IAircraft {
+
+    @Override
+    public String getModel() {
+        return "HypyHype";
+    }
+
+
+    @Override
+    public int getPassengerCapacity() {
+        return 4;
+    }
+
+    @Override
+    public int getCrewCapacity() {
+        return 0;
+    }
+}

src/main/java/flight/reservation/plane/IAircraft.java

@@ -0,0 +1,7 @@
+package flight.reservation.plane;
+
+public interface IAircraft {
+    String getModel();
+    int getPassengerCapacity();
+    int getCrewCapacity();
+}