Group 5: Refactoring

src/main/java/Runner.java

@@ -2,6 +2,7 @@
 import flight.reservation.flight.Schedule;
 import flight.reservation.flight.Flight;
 import flight.reservation.plane.Helicopter;
+import flight.reservation.plane.IdentifiedFlightObject;
 import flight.reservation.plane.PassengerDrone;
 import flight.reservation.plane.PassengerPlane;
 
@@ -20,7 +21,7 @@ public class Runner {
             new Airport("Chengdu Shuangliu International Airport", "CTU", "Shuangliu-Wuhou, Chengdu, Sichuan")
     );
 
-    static List<Object> aircrafts = Arrays.asList(
+    static List<IdentifiedFlightObject> aircrafts = Arrays.asList(
             new PassengerPlane("A380"),
             new PassengerPlane("A350"),
             new PassengerPlane("Embraer 190"),

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

@@ -2,6 +2,7 @@
 
 import flight.reservation.Airport;
 import flight.reservation.plane.Helicopter;
+import flight.reservation.plane.IdentifiedFlightObject;
 import flight.reservation.plane.PassengerDrone;
 import flight.reservation.plane.PassengerPlane;
 
@@ -12,9 +13,9 @@ public class Flight {
     private int number;
     private Airport departure;
     private Airport arrival;
-    protected Object aircraft;
+    protected IdentifiedFlightObject aircraft;
 
-    public Flight(int number, Airport departure, Airport arrival, Object aircraft) throws IllegalArgumentException {
+    public Flight(int number, Airport departure, Airport arrival, IdentifiedFlightObject aircraft) throws IllegalArgumentException {
         this.number = number;
         this.departure = departure;
         this.arrival = arrival;
@@ -32,19 +33,19 @@ private boolean isAircraftValid(Airport airport) {
         return Arrays.stream(airport.getAllowedAircrafts()).anyMatch(x -> {
             String model;
             if (this.aircraft instanceof PassengerPlane) {
-                model = ((PassengerPlane) this.aircraft).model;
+                model = ((PassengerPlane) this.aircraft).getModel();
             } else if (this.aircraft instanceof Helicopter) {
                 model = ((Helicopter) this.aircraft).getModel();
             } else if (this.aircraft instanceof PassengerDrone) {
-                model = "HypaHype";
+                model = ((PassengerDrone) this.aircraft).getModel();
             } else {
-                throw new IllegalArgumentException(String.format("Aircraft is not recognized"));
+                throw new IllegalArgumentException("Aircraft is not recognized");
             }
             return x.equals(model);
         });
     }
 
-    public Object getAircraft() {
+    public IdentifiedFlightObject getAircraft() {
         return aircraft;
     }
 

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

@@ -3,6 +3,7 @@
 import flight.reservation.Airport;
 import flight.reservation.Passenger;
 import flight.reservation.plane.Helicopter;
+import flight.reservation.plane.IdentifiedFlightObject;
 import flight.reservation.plane.PassengerDrone;
 import flight.reservation.plane.PassengerPlane;
 
@@ -16,13 +17,13 @@ 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, IdentifiedFlightObject 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, IdentifiedFlightObject aircraft, Date departureTime, double currentPrice) {
         super(number, departure, arrival, aircraft);
         this.departureTime = departureTime;
         this.passengers = new ArrayList<>();
@@ -31,7 +32,7 @@ public ScheduledFlight(int number, Airport departure, Airport arrival, Object ai
 
     public int getCrewMemberCapacity() throws NoSuchFieldException {
         if (this.aircraft instanceof PassengerPlane) {
-            return ((PassengerPlane) this.aircraft).crewCapacity;
+            return ((PassengerPlane) this.aircraft).getCrewCapacity();
         }
         if (this.aircraft instanceof Helicopter) {
             return 2;
@@ -52,7 +53,7 @@ public void removePassengers(List<Passenger> passengers) {
 
     public int getCapacity() throws NoSuchFieldException {
         if (this.aircraft instanceof PassengerPlane) {
-            return ((PassengerPlane) this.aircraft).passengerCapacity;
+            return ((PassengerPlane) this.aircraft).getPassengerCapacity();
         }
         if (this.aircraft instanceof Helicopter) {
             return ((Helicopter) this.aircraft).getPassengerCapacity();
@@ -64,7 +65,7 @@ public int getCapacity() throws NoSuchFieldException {
     }
 
     public int getAvailableCapacity() throws NoSuchFieldException {
-        return this.getCapacity() - this.passengers.size();
+        return this.aircraft.getPassengerCapacity() - this.passengers.size();
     }
 
     public Date getDepartureTime() {

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

@@ -1,8 +1,6 @@
 package flight.reservation.plane;
 
-public class Helicopter {
-    private final String model;
-    private final int passengerCapacity;
+public class Helicopter extends IdentifiedFlightObject{
 
     public Helicopter(String model) {
         this.model = model;
@@ -14,12 +12,4 @@ public Helicopter(String model) {
             throw new IllegalArgumentException(String.format("Model type '%s' is not recognized", model));
         }
     }
-
-    public String getModel() {
-        return model;
-    }
-
-    public int getPassengerCapacity() {
-        return passengerCapacity;
-    }
 }

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

@@ -0,0 +1,19 @@
+package flight.reservation.plane;
+
+public abstract class IdentifiedFlightObject {
+    String model;
+    int passengerCapacity;
+    int crewCapacity;
+
+    public String getModel() {
+        return model;
+    }
+
+    public int getPassengerCapacity() {
+        return passengerCapacity;
+    }
+
+    public int getCrewCapacity() {
+        return crewCapacity;
+    }
+}

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

@@ -1,7 +1,6 @@
 package flight.reservation.plane;
 
-public class PassengerDrone {
-    private final String model;
+public class PassengerDrone extends IdentifiedFlightObject{
 
     public PassengerDrone(String model) {
         if (model.equals("HypaHype")) {

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

@@ -1,10 +1,6 @@
 package flight.reservation.plane;
 
-public class PassengerPlane {
-
-    public String model;
-    public int passengerCapacity;
-    public int crewCapacity;
+public class PassengerPlane extends IdentifiedFlightObject{
 
     public PassengerPlane(String model) {
         this.model = model;

src/test/java/flight.reservation/ScenarioTest.java

@@ -96,7 +96,7 @@ void thenTheBookingShouldBeStopped() throws NoSuchFieldException {
                     ScheduledFlight scheduledFlight = schedule.searchScheduledFlight(flight.getNumber());
                     assertThrows(IllegalStateException.class, () -> customer.createOrder(Arrays.asList("Amanda", "Max"), Arrays.asList(scheduledFlight), 180));
                     assertEquals(3, scheduledFlight.getPassengers().size());
-                    assertEquals(4, scheduledFlight.getCapacity());
+                    assertEquals(4, scheduledFlight.getAircraft().getPassengerCapacity());
                     assertEquals(1, scheduledFlight.getAvailableCapacity());
                     assertTrue(scheduledFlight.getPassengers().stream().noneMatch(passenger -> passenger.getName().equals("Max")));
                     assertTrue(scheduledFlight.getPassengers().stream().noneMatch(passenger -> passenger.getName().equals("Amanda")));
@@ -113,7 +113,7 @@ void thenTheBookingShouldSucceed() throws NoSuchFieldException {
                     FlightOrder order = customer.createOrder(Arrays.asList("Amanda", "Max"), Arrays.asList(scheduledFlight), 180);
 
                     assertEquals(2, scheduledFlight.getPassengers().size());
-                    assertEquals(4, scheduledFlight.getCapacity());
+                    assertEquals(4, scheduledFlight.getAircraft().getPassengerCapacity());
                     assertEquals(2, scheduledFlight.getAvailableCapacity());
                     assertTrue(scheduledFlight.getPassengers().stream().anyMatch(passenger -> passenger.getName().equals("Max")));
                     assertTrue(scheduledFlight.getPassengers().stream().anyMatch(passenger -> passenger.getName().equals("Amanda")));
@@ -207,7 +207,7 @@ void thenTheBookingShouldSucceed() throws NoSuchFieldException {
                 assertEquals(900, creditCard.getAmount());
                 assertEquals(1, scheduledFlight.getPassengers().size());
                 assertEquals("Max", scheduledFlight.getPassengers().get(0).getName());
-                assertEquals(500, scheduledFlight.getCapacity());
+                assertEquals(500, scheduledFlight.getAircraft().getPassengerCapacity());
                 assertEquals(499, scheduledFlight.getAvailableCapacity());
 
             }