Merge pull request #112 from 12urenloop/2024-cleanup

Cleanup codebase
12urenloop · Mar 25, 2024 · b107fdb · b107fdb
2 parents c6894ee + 514c34c
commit b107fdb
Show file tree

Hide file tree

Showing 62 changed files with 95 additions and 962 deletions.
diff --git a/.gitignore b/.gitignore
@@ -192,4 +192,6 @@ flycheck_*.el
 
 !gradle-wrapper.jar
 
-node_modules/
+node_modules/
+
+.idea
diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations/Telraam__build_.xml b/.idea/runConfigurations/Telraam__build_.xml
diff --git a/.idea/runConfigurations/Telraam__migrateDevelopmentDatabase_.xml b/.idea/runConfigurations/Telraam__migrateDevelopmentDatabase_.xml
diff --git a/.idea/runConfigurations/Telraam__migrateProductionDatabase_.xml b/.idea/runConfigurations/Telraam__migrateProductionDatabase_.xml
diff --git a/.idea/runConfigurations/Telraam__migrateTestingDatabase_.xml b/.idea/runConfigurations/Telraam__migrateTestingDatabase_.xml
diff --git a/.idea/runConfigurations/Telraam__runDev_.xml b/.idea/runConfigurations/Telraam__runDev_.xml
diff --git a/.idea/runConfigurations/Telraam__runProd_.xml b/.idea/runConfigurations/Telraam__runProd_.xml
diff --git a/.idea/runConfigurations/Telraam__test_.xml b/.idea/runConfigurations/Telraam__test_.xml
diff --git a/.idea/runConfigurations/Telraam__test_force_.xml b/.idea/runConfigurations/Telraam__test_force_.xml
diff --git a/.idea/sonarlint-state.xml b/.idea/sonarlint-state.xml
diff --git a/.idea/sonarlint.xml b/.idea/sonarlint.xml
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/main/java/telraam/App.java b/src/main/java/telraam/App.java
@@ -16,7 +16,7 @@
 import telraam.healthchecks.TemplateHealthCheck;
 import telraam.logic.Lapper;
 import telraam.logic.external.ExternalLapper;
-import telraam.logic.robustLapper.RobustLapper;
+import telraam.logic.robust.RobustLapper;
 import telraam.station.Fetcher;
 import telraam.util.AcceptedLapsUtil;
 
@@ -106,7 +106,7 @@ public void run(AppConfiguration configuration, Environment environment) throws
         // Add URL mapping
         cors.addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, "/*");
 
-        if (! testing) {
+        if (!testing) {
             // Set up lapper algorithms
             Set<Lapper> lappers = new HashSet<>();
 

diff --git a/src/main/java/telraam/api/AcceptedLapsResource.java b/src/main/java/telraam/api/AcceptedLapsResource.java
@@ -2,18 +2,13 @@
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import telraam.database.daos.LapDAO;
-import telraam.database.daos.LapSourceSwitchoverDAO;
 import telraam.database.models.Lap;
-import telraam.database.models.LapSourceSwitchover;
 import telraam.util.AcceptedLapsUtil;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 @Path("/accepted-laps")

diff --git a/src/main/java/telraam/api/BatonResource.java b/src/main/java/telraam/api/BatonResource.java
@@ -1,10 +1,12 @@
 package telraam.api;
 
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import telraam.database.daos.BatonDAO;
 import telraam.database.models.Baton;
 
-import javax.ws.rs.*;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
 import java.util.Optional;