Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup codebase #112

Merged
merged 3 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,6 @@ flycheck_*.el

!gradle-wrapper.jar

node_modules/
node_modules/

.idea
18 changes: 0 additions & 18 deletions .idea/$PRODUCT_WORKSPACE_FILE$

This file was deleted.

2 changes: 0 additions & 2 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

23 changes: 0 additions & 23 deletions .idea/dataSources.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .idea/jarRepositories.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/jpa-buddy.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/misc.xml

This file was deleted.

23 changes: 0 additions & 23 deletions .idea/runConfigurations/Telraam__build_.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Telraam__migrateDevelopmentDatabase_.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Telraam__migrateProductionDatabase_.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Telraam__migrateTestingDatabase_.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Telraam__runDev_.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/runConfigurations/Telraam__runProd_.xml

This file was deleted.

26 changes: 0 additions & 26 deletions .idea/runConfigurations/Telraam__test_.xml

This file was deleted.

26 changes: 0 additions & 26 deletions .idea/runConfigurations/Telraam__test_force_.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/sonarlint-state.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/sonarlint.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/sqldialects.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/telraam/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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<>();

Expand Down
5 changes: 0 additions & 5 deletions src/main/java/telraam/api/AcceptedLapsResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/telraam/api/BatonResource.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading