apply even more lombok

src/main/java/telraam/App.java

@@ -10,6 +10,8 @@
 import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.FilterRegistration;
+import lombok.Getter;
+import lombok.Setter;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.jdbi.v3.core.Jdbi;
@@ -33,10 +35,18 @@
 import java.util.logging.Logger;
 
 public class App extends Application<AppConfiguration> {
-    private static Logger logger = Logger.getLogger(App.class.getName());
+    private static final Logger logger = Logger.getLogger(App.class.getName());
+
+    @Getter
     private AppConfiguration config;
+
+    @Getter
     private Environment environment;
+
+    @Getter
     private Jdbi database;
+
+    @Setter
     private boolean testing;
 
     public static void main(String[] args) throws Exception {
@@ -49,10 +59,6 @@ public App() {
         testing = true;
     }
 
-    public void setTesting(boolean testing) {
-        this.testing = testing;
-    }
-
     @Override
     public String getName() {
         return "hello-world";
@@ -72,7 +78,7 @@ protected SwaggerBundleConfiguration getSwaggerBundleConfiguration(AppConfigurat
     }
 
     @Override
-    public void run(AppConfiguration configuration, Environment environment) throws IOException {
+    public void run(AppConfiguration configuration, Environment environment) {
         this.config = configuration;
         this.environment = environment;
         // Add database
@@ -122,9 +128,6 @@ public void run(AppConfiguration configuration, Environment environment) throws
             // Set up lapper algorithms
             Set<Lapper> lappers = new HashSet<>();
 
-            // Old viterbi lapper is disabled
-            //lappers.add(new ViterbiLapper(this.database));
-
             lappers.add(new ExternalLapper(this.database));
             lappers.add(new RobustLapper(this.database));
 
@@ -147,16 +150,4 @@ public void run(AppConfiguration configuration, Environment environment) throws
 
         logger.info("Up and running!");
     }
-
-    public AppConfiguration getConfig() {
-        return config;
-    }
-
-    public Environment getEnvironment() {
-        return environment;
-    }
-
-    public Jdbi getDatabase() {
-        return database;
-    }
 }

src/main/java/telraam/AppConfiguration.java

@@ -6,53 +6,25 @@
 import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
 import telraam.api.responses.Template;
 
 public class AppConfiguration extends Configuration {
     @NotNull
+    @Getter @Setter
     private String template;
 
     @NotNull
+    @Getter @Setter
     private String defaultName = "Stranger";
 
+    @JsonProperty("swagger")
+    public SwaggerBundleConfiguration swaggerBundleConfiguration;
+
     @Valid
     @NotNull
-    private DataSourceFactory database = new DataSourceFactory();
-
-    @JsonProperty
-    public String getTemplate() {
-        return template;
-    }
-
-    @JsonProperty
-    public void setTemplate(String template) {
-        this.template = template;
-    }
-
-    public Template buildTemplate() {
-        return new Template(template, defaultName);
-    }
-
-    @JsonProperty
-    public String getDefaultName() {
-        return defaultName;
-    }
-
-    @JsonProperty
-    public void setDefaultName(String name) {
-        this.defaultName = name;
-    }
-
-    @JsonProperty("database")
-    public DataSourceFactory getDataSourceFactory() {
-        return database;
-    }
-
+    @Getter @Setter
     @JsonProperty("database")
-    public void setDataSourceFactory(DataSourceFactory factory) {
-        this.database = factory;
-    }
-
-    @JsonProperty("swagger")
-    public SwaggerBundleConfiguration swaggerBundleConfiguration;
+    private DataSourceFactory dataSourceFactory = new DataSourceFactory();
 }

src/main/java/telraam/api/responses/Saying.java

@@ -1,30 +1,16 @@
 package telraam.api.responses;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class Saying {
     private long id;
 
     @Length(max = 3)
     private String content;
-
-    public Saying() {
-        // Jackson deserialization
-    }
-
-    public Saying(long id, String content) {
-        this.id = id;
-        this.content = content;
-    }
-
-    @JsonProperty
-    public long getId() {
-        return id;
-    }
-
-    @JsonProperty
-    public String getContent() {
-        return content;
-    }
 }

src/main/java/telraam/api/responses/Template.java

@@ -1,18 +1,16 @@
 package telraam.api.responses;
 
+import lombok.AllArgsConstructor;
+
 import java.util.Optional;
 
 import static java.lang.String.format;
 
+@AllArgsConstructor
 public class Template {
     private final String content;
     private final String defaultName;
 
-    public Template(String content, String defaultName) {
-        this.content = content;
-        this.defaultName = defaultName;
-    }
-
     public String render(Optional<String> name) {
         return format(content, name.orElse(defaultName));
     }

src/main/java/telraam/monitoring/BatonDetectionManager.java

@@ -12,12 +12,12 @@
 import java.util.Map;
 
 public class BatonDetectionManager {
-    private DetectionDAO detectionDAO;
-    private TeamDAO teamDAO;
-    private BatonSwitchoverDAO batonSwitchoverDAO;
+    private final DetectionDAO detectionDAO;
+    private final TeamDAO teamDAO;
+    private final BatonSwitchoverDAO batonSwitchoverDAO;
 
     // Map of a baton id to it's detections
-    private Map<Integer, List<BatonDetection>> batonDetectionMap = new HashMap<>();
+    private final Map<Integer, List<BatonDetection>> batonDetectionMap = new HashMap<>();
     private Integer handledDetectionId = 0;
 
     public BatonDetectionManager(DetectionDAO detectionDAO, TeamDAO teamDAO, BatonSwitchoverDAO batonSwitchoverDAO) {
@@ -60,7 +60,7 @@ public Map<Integer, List<BatonDetection>> getBatonDetections() {
             }
             var batonDetections = batonDetectionMap.get(batonId);
             var team = teamMap.get(batonTeamMap.get(batonId));
-            var batonDetection = new BatonDetection(Math.toIntExact(d.getTimestamp().getTime() / 1000), d.getRssi(), d.getStationId(), batonId, team.getName());
+            var batonDetection = new BatonDetection(Math.toIntExact(d.getTimestamp().getTime() / 1000), d.getRssi(), batonId /* FIXME: BatonDetection expects a teamId here? */, d.getStationId(), team.getName());
             batonDetections.add(batonDetection);
         });
         return batonDetectionMap;

src/main/java/telraam/monitoring/BatonStatusHolder.java

@@ -15,15 +15,15 @@
 
 public class BatonStatusHolder {
     // Map from batonMac to batonStatus
-    private HashMap<String, BatonStatus> batonStatusMap = new HashMap<>();
-    private HashMap<Integer, String> batonIdToMac = new HashMap<>();
+    private final HashMap<String, BatonStatus> batonStatusMap = new HashMap<>();
+    private final HashMap<Integer, String> batonIdToMac = new HashMap<>();
 
-    private BatonDAO batonDAO;
-    private DetectionDAO detectionDAO;
+    private final BatonDAO batonDAO;
+    private final DetectionDAO detectionDAO;
 
-    public BatonStatusHolder(BatonDAO BDAO, DetectionDAO DDAO) {
-        batonDAO = BDAO;
-        detectionDAO = DDAO;
+    public BatonStatusHolder(BatonDAO batonDAO, DetectionDAO detectionDAO) {
+        this.batonDAO = batonDAO;
+        this.detectionDAO = detectionDAO;
     }
 
     private BatonStatus getStatusForBaton(String batonMac) {

src/main/java/telraam/monitoring/StationDetectionManager.java

@@ -11,9 +11,9 @@
 import java.util.Optional;
 
 public class StationDetectionManager {
-    private DetectionDAO detectionDAO;
+    private final DetectionDAO detectionDAO;
 
-    private StationDAO stationDAO;
+    private final StationDAO stationDAO;
 
     public StationDetectionManager(DetectionDAO detectionDAO, StationDAO stationDAO) {
         this.detectionDAO = detectionDAO;
@@ -27,7 +27,7 @@ public Map<String, Long> timeSinceLastDetectionPerStation() {
             Optional<Detection> maybeDetection = this.detectionDAO.latestDetectionByStationId(stationId);
             Optional<Station> maybeStation = this.stationDAO.getById(stationId);
             if (maybeDetection.isPresent() && maybeStation.isPresent()) {
-                Long time = maybeDetection.get().getTimestamp().getTime();
+                long time = maybeDetection.get().getTimestamp().getTime();
                 stationIdToTimeSinceLatestDetection.put(maybeStation.get().getName(), (System.currentTimeMillis() - time) / 1000);
             }
         }

src/main/java/telraam/monitoring/models/BatonDetection.java

@@ -1,7 +1,13 @@
 package telraam.monitoring.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
+@AllArgsConstructor
 public class BatonDetection {
     @JsonProperty("detected_time")
     private Integer detectionTime;
@@ -13,52 +19,4 @@ public class BatonDetection {
     private Integer stationId;
     @JsonProperty("team_name")
     private String teamName;
-
-    public BatonDetection(Integer detectionTime, Integer rssi, Integer stationId, Integer teamId, String teamName) {
-        this.detectionTime = detectionTime;
-        this.rssi = rssi;
-        this.stationId = stationId;
-        this.teamId = teamId;
-        this.teamName = teamName;
-    }
-
-    public Integer getDetectionTime() {
-        return detectionTime;
-    }
-
-    public void setDetectionTime(Integer detectionTime) {
-        this.detectionTime = detectionTime;
-    }
-
-    public Integer getRssi() {
-        return rssi;
-    }
-
-    public void setRssi(Integer rssi) {
-        this.rssi = rssi;
-    }
-
-    public Integer getTeamId() {
-        return teamId;
-    }
-
-    public void setTeamId(Integer teamId) {
-        this.teamId = teamId;
-    }
-
-    public Integer getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(Integer stationId) {
-        this.stationId = stationId;
-    }
-
-    public String getTeamName() {
-        return teamName;
-    }
-
-    public void setTeamName(String teamName) {
-        this.teamName = teamName;
-    }
 }