small cahnges

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/RoomController.java

@@ -18,6 +18,8 @@ public class RoomController {
 
     @Autowired private UserRepository userRepository;
 
+    @Autowired private DeviceRepository deviceRepository;
+
     @GetMapping
     public Iterable<Room> findAll() {
         return roomRepository.findAll();
@@ -55,4 +57,14 @@ public class RoomController {
     public void deleteById(@PathVariable("id") long id) {
         roomRepository.deleteById(id);
     }
+
+    /**
+     * Returns a List<Device> of all Devices that are present in a given room (identified by its
+     * id).
+     */
+    @GetMapping(path = "/room/{roomid}/devices")
+    @ResponseBody
+    public List<Device> getDevices(@PathVariable("roomid") long roomid) {
+        return deviceRepository.findByRoomId(roomid);
+    }
 }

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmerRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface ButtonDimmerRepository extends DeviceRepository<ButtonDimmer> {}
-
-public interface ButtonDimmerRepository extends CrudRepository<ButtonDimmer, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLightRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface DimmableLightRepository extends DeviceRepository<DimmableLight> {}
-
-public interface DimmableLightRepository extends CrudRepository<DimmableLight, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmerRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface KnobDimmerRepository extends DeviceRepository<KnobDimmer> {}
-
-public interface KnobDimmerRepository extends CrudRepository<KnobDimmer, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensorRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface MotionSensorRepository extends DeviceRepository<MotionSensor> {}
-
-public interface MotionSensorRepository extends CrudRepository<MotionSensor, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLightRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface RegularLightRepository extends DeviceRepository<RegularLight> {}
-
-public interface RegularLightRepository extends CrudRepository<RegularLight, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SensorRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface SensorRepository extends DeviceRepository<Sensor> {}
-
-public interface SensorRepository extends CrudRepository<Sensor, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlugRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface SmartPlugRepository extends DeviceRepository<SmartPlug> {}
-
-public interface SmartPlugRepository extends CrudRepository<SmartPlug, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SwitchRepository.java

@@ -1,5 +1,3 @@
 package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
-import org.springframework.data.repository.CrudRepository;
+public interface SwitchRepository extends DeviceRepository<Switch> {}
-
-public interface SwitchRepository extends CrudRepository<Switch, Long> {}

src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java

@@ -2,11 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models;
 
 import java.util.Set;
 import javax.persistence.*;
-import javax.validation.constraints.Email;
+import javax.validation.constraints.*;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 
 /** A user of the Smarthut application */
 @Entity(name = "smarthutuser")
@@ -33,7 +29,11 @@ public class User {
     @NotNull
     @Column(nullable = false)
     @NotEmpty(message = "Please provide a password")
-    @Min(value = 6, message = "Your password should be at least 6 characters long")
+    @Size(
+            min = 6,
+            max = 255,
+            message =
+                    "Your password should be at least 6 characters long and at most 255 chars long")
     private String password;
 
     /**