refactor: set actuator type in actuator entity

Author: AndreaGiulianelli

src/env/artifact/environment/roomartifact/AmbientLight.java

@@ -29,7 +29,7 @@ public class AmbientLight extends AbstractActuatorInRoomArtifact implements Dimm
      */
     void init(final String roomId) {
         super.init(ActuatorType.AMBIENT_LIGHT, new RoomID(roomId));
-        this.actuator = new DimmableActuator(this.getActuatorID());
+        this.actuator = new DimmableActuator(this.getActuatorID(), ActuatorType.AMBIENT_LIGHT);
         this.wotInvoker = new WotInvoker();
     }
 

src/env/artifact/environment/roomartifact/Cooler.java

@@ -29,7 +29,7 @@ public class Cooler extends AbstractActuatorInRoomArtifact implements Switchable
      */
     void init(final String roomId) {
         super.init(ActuatorType.COOLING, new RoomID(roomId));
-        this.actuator = new SwitchableActuator(this.getActuatorID());
+        this.actuator = new SwitchableActuator(this.getActuatorID(), ActuatorType.COOLING);
         this.wotInvoker = new WotInvoker();
     }
 

src/env/artifact/environment/roomartifact/Heater.java

@@ -29,7 +29,7 @@ public class Heater extends AbstractActuatorInRoomArtifact implements Switchable
      */
     void init(final String roomId) {
         super.init(ActuatorType.HEATING, new RoomID(roomId));
-        this.actuator = new SwitchableActuator(this.getActuatorID());
+        this.actuator = new SwitchableActuator(this.getActuatorID(), ActuatorType.HEATING);
         this.wotInvoker = new WotInvoker();
     }
 

src/env/artifact/environment/roomartifact/SurgicalLight.java

@@ -29,7 +29,7 @@ public class SurgicalLight extends AbstractActuatorInRoomArtifact implements Dim
      */
     void init(final String roomId) {
         super.init(ActuatorType.SURGICAL_LIGHT, new RoomID(roomId));
-        this.actuator = new DimmableActuator(this.getActuatorID());
+        this.actuator = new DimmableActuator(this.getActuatorID(), ActuatorType.SURGICAL_LIGHT);
         this.wotInvoker = new WotInvoker();
     }
 

src/env/artifact/environment/roomartifact/Ventilation.java

@@ -29,7 +29,7 @@ public class Ventilation extends AbstractActuatorInRoomArtifact implements Dimma
      */
     void init(final String roomId) {
         super.init(ActuatorType.VENTILATION, new RoomID(roomId));
-        this.actuator = new DimmableActuator(this.getActuatorID());
+        this.actuator = new DimmableActuator(this.getActuatorID(), ActuatorType.VENTILATION);
         this.wotInvoker = new WotInvoker();
     }
 

src/env/entity/actuator/Actuator.java

@@ -15,23 +15,34 @@
  */
 public class Actuator {
     private final ActuatorID actuatorID;
+    private final ActuatorType actuatorType;
 
     /**
      * Default constructor.
      * @param actuatorID the actuator id.
+     * @param actuatorType the actuator type.
      */
-    public Actuator(final ActuatorID actuatorID) {
+    public Actuator(final ActuatorID actuatorID, final ActuatorType actuatorType) {
         this.actuatorID = actuatorID;
+        this.actuatorType = actuatorType;
     }
 
     /**
      * Get the actuator id.
      * @return the actuator id.
      */
-    public final ActuatorID getId() {
+    public ActuatorID getId() {
         return this.actuatorID;
     }
 
+    /**
+     * Get the actuator type.
+     * @return the actuator type.
+     */
+    public ActuatorType getActuatorType() {
+        return this.actuatorType;
+    }
+
     @Override
     public final boolean equals(final Object other) {
         if (this == other) {

src/env/entity/actuator/DimmableActuator.java

@@ -17,9 +17,10 @@ public class DimmableActuator extends Actuator {
     /**
      * Default constructor.
      * @param actuatorID the actuator id.
+     * @param actuatorType the actuator type.
      */
-    public DimmableActuator(final ActuatorID actuatorID) {
-        super(actuatorID);
+    public DimmableActuator(final ActuatorID actuatorID, final ActuatorType actuatorType) {
+        super(actuatorID, actuatorType);
     }
 
     /**

src/env/entity/actuator/SwitchableActuator.java

@@ -17,9 +17,10 @@ public class SwitchableActuator extends Actuator {
     /**
      * Default constructor.
      * @param actuatorID the actuator id.
+     * @param actuatorType the actuator type.
      */
-    public SwitchableActuator(final ActuatorID actuatorID) {
-        super(actuatorID);
+    public SwitchableActuator(final ActuatorID actuatorID, final ActuatorType actuatorType) {
+        super(actuatorID, actuatorType);
     }
 
     /**

src/test/java/entity/actuator/ActuatorTest.java

@@ -20,9 +20,9 @@
  * Test for {@link Actuator} entity.
  */
 class ActuatorTest {
-    private final Actuator actuator = new Actuator(new ActuatorID("actuator1"));
-    private final Actuator actuatorDifferentRef = new Actuator(new ActuatorID("actuator1"));
-    private final Actuator differentActuator = new Actuator(new ActuatorID("actuator2"));
+    private final Actuator actuator = new Actuator(new ActuatorID("actuator1"), ActuatorType.HEATING);
+    private final Actuator actuatorDifferentRef = new Actuator(new ActuatorID("actuator1"), ActuatorType.COOLING);
+    private final Actuator differentActuator = new Actuator(new ActuatorID("actuator2"), ActuatorType.HEATING);
 
     @Test
     @DisplayName("An actuator must not be equal to other actuators with different id other classes")