Group 5: Refactoring

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

@@ -32,13 +32,13 @@ 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";
             } else {
-                throw new IllegalArgumentException(String.format("Aircraft is not recognized"));
+                throw new IllegalArgumentException("Aircraft is not recognized");
             }
             return x.equals(model);
         });

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

@@ -31,7 +31,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 +52,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();

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;