feat: introduce lombok to models (#117)

* feat: introduce lombok to models * fix test with Station.setBroken -> Station.setIsBroken * feat: fix test locally --------- Co-authored-by: FKD13 <[email protected]>
12urenloop · Mar 28, 2024 · 25ae5cc · 25ae5cc
1 parent a5867e8
commit 25ae5cc
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 365 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,6 +74,13 @@ dependencies {
 
     // Swagger-UI
     implementation 'com.smoketurner:dropwizard-swagger:2.0.0-1'
+
+    // Getter & Setter via annotations
+    compileOnly 'org.projectlombok:lombok:1.18.32'
+    annotationProcessor 'org.projectlombok:lombok:1.18.32'
+
+    testCompileOnly 'org.projectlombok:lombok:1.18.32'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.32'
 }
 
 test {

diff --git a/src/main/java/telraam/database/daos/StationDAO.java b/src/main/java/telraam/database/daos/StationDAO.java
@@ -19,7 +19,7 @@ public interface StationDAO extends DAO<Station> {
     List<Station> getAll();
 
     @Override
-    @SqlUpdate("INSERT INTO station (name, distance_from_start, broken, url, coord_x, coord_y) VALUES (:name, :distanceFromStart, :isBroken, :url, :coordX, :coordY)")
+    @SqlUpdate("INSERT INTO station (name, distance_from_start, broken, url, coord_x, coord_y) VALUES (:name, :distanceFromStart, :broken, :url, :coordX, :coordY)")
     @GetGeneratedKeys({"id"})
     int insert(@BindBean Station station);
 
@@ -33,6 +33,6 @@ public interface StationDAO extends DAO<Station> {
     int deleteById(@Bind("id") int id);
 
     @Override
-    @SqlUpdate("UPDATE station SET name = :name, distance_from_start = :distanceFromStart, broken = :isBroken, url = :url, coord_x = :coordX, coord_y = :coordY WHERE id = :id")
+    @SqlUpdate("UPDATE station SET name = :name, distance_from_start = :distanceFromStart, broken = :broken, url = :url, coord_x = :coordX, coord_y = :coordY WHERE id = :id")
     int update(@Bind("id") int id, @BindBean Station station);
 }
diff --git a/src/main/java/telraam/database/models/Baton.java b/src/main/java/telraam/database/models/Baton.java
@@ -1,16 +1,17 @@
 package telraam.database.models;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 import java.util.Objects;
 
+@Getter @Setter @NoArgsConstructor
 public class Baton {
     private Integer id;
     private String name;
     private String mac;
 
-    // DO NOT REMOVE
-    public Baton() {
-    }
-
     public Baton(String name) {
         this.name = name;
     }
@@ -20,30 +21,6 @@ public Baton(String name, String mac) {
         this.mac = mac;
     }
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getMac() {
-        return mac;
-    }
-
-    public void setMac(String mac) {
-        this.mac = mac;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/src/main/java/telraam/database/models/BatonSwitchover.java b/src/main/java/telraam/database/models/BatonSwitchover.java
@@ -1,66 +1,27 @@
 package telraam.database.models;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 import java.sql.Timestamp;
 import java.util.Objects;
 
+@Getter @Setter @NoArgsConstructor
 public class BatonSwitchover {
     private Integer id;
     private Integer teamId;
     private Integer previousBatonId;
     private Integer newBatonId;
     private Timestamp timestamp;
 
-    // DO NOT REMOVE
-    public BatonSwitchover() {
-    }
-
     public BatonSwitchover(Integer teamId, Integer previousBatonId, Integer newBatonId, Timestamp timestamp) {
         this.teamId = teamId;
         this.previousBatonId = previousBatonId;
         this.newBatonId = newBatonId;
         this.timestamp = timestamp;
     }
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getTeamId() {
-        return teamId;
-    }
-
-    public void setTeamId(Integer teamId) {
-        this.teamId = teamId;
-    }
-
-    public Integer getPreviousBatonId() {
-        return previousBatonId;
-    }
-
-    public void setPreviousBatonId(Integer previousBatonId) {
-        this.previousBatonId = previousBatonId;
-    }
-
-    public Integer getNewBatonId() {
-        return newBatonId;
-    }
-
-    public void setNewBatonId(Integer newBatonId) {
-        this.newBatonId = newBatonId;
-    }
-
-    public Timestamp getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Timestamp timestamp) {
-        this.timestamp = timestamp;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/src/main/java/telraam/database/models/Detection.java b/src/main/java/telraam/database/models/Detection.java
@@ -1,7 +1,12 @@
 package telraam.database.models;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 import java.sql.Timestamp;
 
+@Setter @Getter @NoArgsConstructor
 public class Detection {
     private Integer id;
     private Integer batonId;
@@ -14,9 +19,6 @@ public class Detection {
     private Timestamp timestampIngestion;
     private Integer teamId;
 
-    public Detection() {
-    }
-
     public Detection(Integer batonId, Integer stationId, Integer rssi, Float battery, Long uptimeMs, Integer remoteId, Timestamp timestamp, Timestamp timestampIngestion) {
         this.batonId = batonId;
         this.stationId = stationId;
@@ -27,84 +29,4 @@ public Detection(Integer batonId, Integer stationId, Integer rssi, Float battery
         this.timestamp = timestamp;
         this.timestampIngestion = timestampIngestion;
     }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getBatonId() {
-        return batonId;
-    }
-
-    public void setBatonId(Integer batonId) {
-        this.batonId = batonId;
-    }
-
-    public Integer getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(Integer stationId) {
-        this.stationId = stationId;
-    }
-
-    public Integer getRssi() {
-        return rssi;
-    }
-
-    public void setRssi(Integer rssi) {
-        this.rssi = rssi;
-    }
-
-    public Float getBattery() {
-        return battery;
-    }
-
-    public void setBattery(Float battery) {
-        this.battery = battery;
-    }
-
-    public Long getUptimeMs() {
-        return uptimeMs;
-    }
-
-    public void setUptimeMs(Long uptimeMs) {
-        this.uptimeMs = uptimeMs;
-    }
-
-    public Integer getRemoteId() {
-        return remoteId;
-    }
-
-    public void setRemoteId(Integer remoteId) {
-        this.remoteId = remoteId;
-    }
-
-    public Timestamp getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Timestamp timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public Timestamp getTimestampIngestion() {
-        return timestampIngestion;
-    }
-
-    public void setTimestampIngestion(Timestamp timestampIngestion) {
-        this.timestampIngestion = timestampIngestion;
-    }
-
-    public Integer getTeamId() {
-        return teamId;
-    }
-
-    public void setTeamId(Integer teamId) {
-        this.teamId = teamId;
-    }
 }
diff --git a/src/main/java/telraam/database/models/Lap.java b/src/main/java/telraam/database/models/Lap.java
@@ -1,7 +1,12 @@
 package telraam.database.models;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 import java.sql.Timestamp;
 
+@Getter @Setter @NoArgsConstructor
 public class Lap {
     private Integer id;
     private Integer teamId;
@@ -10,52 +15,9 @@ public class Lap {
     private Boolean manual;
     private Timestamp timestamp;
 
-    public Lap() {
-    }
-
     public Lap(Integer teamId, Integer lapSourceId, Timestamp timestamp) {
         this.teamId = teamId;
         this.lapSourceId = lapSourceId;
         this.timestamp = timestamp;
     }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getTeamId() {
-        return teamId;
-    }
-
-    public void setTeamId(Integer teamId) {
-        this.teamId = teamId;
-    }
-
-    public Integer getLapSourceId() {
-        return lapSourceId;
-    }
-
-    public void setLapSourceId(Integer lapSourceId) {
-        this.lapSourceId = lapSourceId;
-    }
-
-    public Boolean getManual() {
-        return manual;
-    }
-
-    public void setManual(Boolean manual) {
-        this.manual = manual;
-    }
-
-    public Timestamp getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Timestamp timestamp) {
-        this.timestamp = timestamp;
-    }
 }
diff --git a/src/main/java/telraam/database/models/LapSource.java b/src/main/java/telraam/database/models/LapSource.java
@@ -1,33 +1,18 @@
 package telraam.database.models;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 /**
  * The lap source tells you where the lap comes from.
  */
+@Getter @Setter @NoArgsConstructor
 public class LapSource {
     private Integer id;
     private String name;
 
-    public LapSource() {
-
-    }
-
     public LapSource(String name) {
         this.name = name;
     }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }