quick cleanup

12urenloop · Mar 25, 2024 · c1d8482 · c1d8482
1 parent ac75872
commit c1d8482
Show file tree

Hide file tree

Showing 37 changed files with 20 additions and 906 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;
 

diff --git a/src/main/java/telraam/database/models/Id.java b/src/main/java/telraam/database/models/Id.java
diff --git a/...raam/logic/robustLapper/RobustLapper.java → ...va/telraam/logic/robust/RobustLapper.java b/...raam/logic/robustLapper/RobustLapper.java → ...va/telraam/logic/robust/RobustLapper.java
@@ -1,4 +1,4 @@
-package telraam.logic.robustLapper;
+package telraam.logic.robust;
 
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import org.jdbi.v3.core.Jdbi;

diff --git a/...main/java/telraam/logic/SimpleLapper.java → ...va/telraam/logic/simple/SimpleLapper.java b/...main/java/telraam/logic/SimpleLapper.java → ...va/telraam/logic/simple/SimpleLapper.java
@@ -1,10 +1,11 @@
-package telraam.logic;
+package telraam.logic.simple;
 
 import io.dropwizard.jersey.setup.JerseyEnvironment;
 import org.jdbi.v3.core.Jdbi;
 import telraam.database.daos.LapDAO;
 import telraam.database.daos.LapSourceDAO;
 import telraam.database.models.*;
+import telraam.logic.Lapper;
 
 import java.util.ArrayList;
 import java.util.HashMap;