From 0d10d759a6bc5485d715637eb42f9e4f1bb5614f Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Tue, 12 May 2020 17:14:25 +0200 Subject: [PATCH] Removed @NotNull from models --- .../usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java | 4 +--- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java | 3 --- .../usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java | 2 -- .../java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java | 3 --- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java | 4 ---- .../inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java | 2 -- .../inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java | 2 -- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java | 2 -- .../ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java | 3 --- .../usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java | 3 +-- 10 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java index 48a9e44..cb04e9d 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Automation.java @@ -6,7 +6,6 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.*; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import lombok.Data; @Data @@ -24,7 +23,6 @@ public class Automation { @GsonExclude private User user; - @NotNull @Column(name = "user_id", nullable = false) @GsonExclude private Long userId; @@ -38,5 +36,5 @@ public class Automation { @OneToMany(mappedBy = "automation", orphanRemoval = true, cascade = CascadeType.REMOVE) private Set> conditions = new HashSet<>(); - @NotNull @NotEmpty private String name; + @NotEmpty private String name; } diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java index a440e37..37f40e1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Dimmable.java @@ -6,7 +6,6 @@ import java.util.Set; import javax.persistence.*; import javax.validation.constraints.Max; import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -26,14 +25,12 @@ public class Dimmable extends Switchable implements RangeTriggerable { private Set dimmers; /** The light intensity value. Goes from 0 (off) to 100 (on) */ - @NotNull @Column(nullable = false) @Min(0) @Max(100) @Getter private Integer intensity = 0; - @NotNull @Column(nullable = false) @Getter @Setter diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java index d035b19..feac0fb 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java @@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import javax.persistence.Column; import javax.persistence.Entity; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -12,7 +11,6 @@ public class RegularLight extends Switchable implements BooleanTriggerable { /** Whether the light is on or not */ @Column(name = "light_on", nullable = false) - @NotNull @Getter @Setter boolean on; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java index 9e3ebc9..6785d90 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Room.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.HashSet; import java.util.Set; import javax.persistence.*; -import javax.validation.constraints.NotNull; /** Represents a room in the house owned by the user */ @Entity @@ -42,12 +41,10 @@ public class Room { * User that owns the house this room is in as a foreign key id. To use when updating and * inserting from a REST call. */ - @NotNull @Column(name = "user_id", nullable = false) private Long userId; /** The user given name of this room (e.g. 'Master bedroom') */ - @NotNull @Column(nullable = false) private String name; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java index 83a9367..63cccb4 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Scene.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.HashSet; import java.util.Set; import javax.persistence.*; -import javax.validation.constraints.NotNull; /** * Represent a collection of state changes to devices even in different rooms but belonging to the @@ -25,7 +24,6 @@ public class Scene { @GsonExclude private User user; - @NotNull @Column(name = "user_id", nullable = false) @GsonExclude private Long userId; @@ -35,12 +33,10 @@ public class Scene { private Set> states = new HashSet<>(); /** The user given name of this room (e.g. 'Master bedroom') */ - @NotNull @Column(nullable = false) private String name; @Column(nullable = false) - @NotNull private Icon icon; /** Determines whether a guest can access this scene */ diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java index e975d08..8363853 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ScenePriority.java @@ -11,7 +11,6 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.PreRemove; import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; @Entity public class ScenePriority { @@ -30,7 +29,6 @@ public class ScenePriority { @Column(name = "automation_id", nullable = false) private Long automationId; - @NotNull @Min(0) @Column(nullable = false) private Integer priority; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java index 218ba4a..ccb1224 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java @@ -2,7 +2,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import javax.persistence.Column; import javax.persistence.Entity; -import javax.validation.constraints.NotNull; @Entity public class SecurityCamera extends Switchable implements BooleanTriggerable { @@ -13,7 +12,6 @@ public class SecurityCamera extends Switchable implements BooleanTriggerable { } @Column(name = "camera_on", nullable = false) - @NotNull private boolean on; @Column(name = "video", nullable = false) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java index 10fcacf..b69e3e7 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java @@ -3,7 +3,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import java.math.BigDecimal; import javax.persistence.Column; import javax.persistence.Entity; -import javax.validation.constraints.NotNull; /** A smart plug that can be turned either on or off */ @Entity @@ -14,7 +13,6 @@ public class SmartPlug extends Switchable implements BooleanTriggerable { /** The total amount of power that the smart plug has consumed represented in W/h */ @Column(precision = 13, scale = 3) - @NotNull private BigDecimal totalConsumption = BigDecimal.ZERO; /** Whether the smart plug is on */ diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java index 31cd69c..8637500 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/State.java @@ -3,7 +3,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import ch.usi.inf.sa4.sanmarinoes.smarthut.config.GsonExclude; import io.swagger.annotations.ApiModelProperty; import javax.persistence.*; -import javax.validation.constraints.NotNull; /** * Represents instructions on how to change the state of a particular device. Many states (plus @@ -30,7 +29,6 @@ public abstract class State { * from a REST call. */ @Column(name = "device_id", nullable = false) - @NotNull private Long deviceId; @ManyToOne @@ -39,7 +37,6 @@ public abstract class State { private Scene scene; @Column(name = "scene_id", nullable = false) - @NotNull private Long sceneId; /** Sets the state of the connected device to the state represented by this object. */ diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java index abcc1cb..a2a71a1 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java @@ -5,7 +5,6 @@ import java.math.BigDecimal; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Transient; -import javax.validation.constraints.NotNull; /** A thermostat capable of controlling cooling and heating. */ @Entity @@ -72,7 +71,7 @@ public class Thermostat extends Switchable implements BooleanTriggerable { Sensor.TYPICAL_VALUES.get(Sensor.SensorType.TEMPERATURE); /** State of this thermostat */ - @Column @NotNull private Thermostat.Mode mode; + @Column private Thermostat.Mode mode; @Transient private BigDecimal measuredTemperature;