Skip to content

Commit d337ec4

Browse files
Merge pull request opentripplanner#6870 from leonardehrenfried/remove-imports
Automatically remove unused imports
2 parents 8f891e9 + 60659b0 commit d337ec4

76 files changed

Lines changed: 32 additions & 114 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cibuild.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ on:
1515
- dev-1.x
1616
- dev-2.x
1717
env:
18-
# Since version 3.9.0 of Maven it will automatically understand this environment variable.
19-
# However, as of 2024-11 the latest versions of Ubuntu and Debian were on 3.8.8 so it will take some
20-
# time until we can remove the $MAVEN_ARGS below.
18+
# maven default arguments to make the log quieter and colourful
2119
MAVEN_ARGS: "--no-transfer-progress -Dstyle.color=always"
2220

2321
jobs:
@@ -52,8 +50,8 @@ jobs:
5250
# https://github.com/actions/runner-images/issues/1499
5351
# we set nodePath and npmPath to skip downloading the node binary, which frequently times out
5452
run: |
55-
mvn $MAVEN_ARGS jacoco:prepare-agent test jacoco:report -P prettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
56-
mvn $MAVEN_ARGS package -Dmaven.test.skip -P prettierSkip
53+
mvn jacoco:prepare-agent test jacoco:report -P prettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm spotless:check
54+
mvn package -Dmaven.test.skip -P prettierSkip
5755
5856
- name: Send coverage data to codecov.io
5957
if: github.repository_owner == 'opentripplanner'
@@ -74,7 +72,7 @@ jobs:
7472
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x')
7573
env:
7674
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77-
run: mvn $MAVEN_ARGS deploy --settings maven-settings.xml -DskipTests -DGITHUB_REPOSITORY=$GITHUB_REPOSITORY -P prettierSkip -P deployGitHub
75+
run: mvn deploy --settings maven-settings.xml -DskipTests -DGITHUB_REPOSITORY=$GITHUB_REPOSITORY -P prettierSkip -P deployGitHub
7876

7977
build-windows:
8078
timeout-minutes: 20
@@ -92,7 +90,7 @@ jobs:
9290
- name: Configure Windows Pagefile
9391
uses: al-cheb/configure-pagefile-action@v1.4
9492
- name: Run tests
95-
run: mvn $MAVEN_ARGS test -P prettierSkip
93+
run: mvn test -P prettierSkip
9694

9795
docs:
9896
if: github.repository_owner == 'opentripplanner'
@@ -205,7 +203,7 @@ jobs:
205203
distribution: temurin
206204
cache: maven
207205
- name: Compile Java code
208-
run: mvn $MAVEN_ARGS compile -DskipTests -P prettierSkip
206+
run: mvn compile -DskipTests -P prettierSkip
209207

210208
container-image:
211209
if: github.repository_owner == 'opentripplanner' && github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x' || github.ref == 'refs/heads/master')
@@ -250,4 +248,4 @@ jobs:
250248
251249
MAVEN_SKIP_ARGS="-P prettierSkip -Dmaven.test.skip=true -Dmaven.source.skip=true"
252250
253-
mvn $MAVEN_ARGS $MAVEN_SKIP_ARGS package com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_version
251+
mvn $MAVEN_SKIP_ARGS package com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_version

application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.Collection;
44
import java.util.Collections;
55
import java.util.List;
6-
import java.util.Objects;
76
import java.util.Optional;
87
import javax.annotation.Nullable;
98
import org.opentripplanner.transit.model.framework.FeedScopedId;

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertEntityTypeResolver.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.opentripplanner.transit.model.network.Route;
1212
import org.opentripplanner.transit.model.network.TripPattern;
1313
import org.opentripplanner.transit.model.organization.Agency;
14-
import org.opentripplanner.transit.model.site.RegularStop;
1514
import org.opentripplanner.transit.model.site.StopLocation;
1615
import org.opentripplanner.transit.model.site.StopLocationsGroup;
1716
import org.opentripplanner.transit.model.timetable.Trip;

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LocationGroupImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
import graphql.schema.DataFetcher;
44
import graphql.schema.DataFetchingEnvironment;
5-
import java.util.Collections;
65
import java.util.List;
76
import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
87
import org.opentripplanner.framework.graphql.GraphQLUtils;
9-
import org.opentripplanner.transit.model.site.AreaStop;
108
import org.opentripplanner.transit.model.site.GroupStop;
11-
import org.opentripplanner.utils.collection.ListUtils;
129

1310
public class LocationGroupImpl implements GraphQLDataFetchers.GraphQLLocationGroup {
1411

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopCallImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
1010
import org.opentripplanner.apis.gtfs.model.CallRealTime;
1111
import org.opentripplanner.apis.gtfs.model.CallSchedule;
12-
import org.opentripplanner.apis.gtfs.model.CallScheduledTime;
1312
import org.opentripplanner.apis.gtfs.model.CallScheduledTime.ArrivalDepartureTime;
1413
import org.opentripplanner.apis.gtfs.model.CallScheduledTime.TimeWindow;
1514
import org.opentripplanner.model.TripTimeOnDate;

application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertCauseMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.opentripplanner.apis.gtfs.mapping;
22

3-
import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
43
import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAlertCauseType;
54
import org.opentripplanner.routing.alertpatch.AlertCause;
65

application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertEffectMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.opentripplanner.apis.gtfs.mapping;
22

3-
import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
43
import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAlertEffectType;
54
import org.opentripplanner.routing.alertpatch.AlertEffect;
65

application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
import static org.opentripplanner.utils.collection.CollectionUtils.requireNullOrNonEmpty;
44

55
import org.opentripplanner.apis.gtfs.GraphQLUtils;
6-
import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
76
import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitFilterSelectInput;
8-
import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper;
97
import org.opentripplanner.routing.api.request.request.filter.SelectRequest;
10-
import org.opentripplanner.transit.model.basic.MainAndSubMode;
118
import org.opentripplanner.transit.model.framework.FeedScopedId;
129
import org.opentripplanner.utils.collection.CollectionUtils;
1310

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
1616
import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle;
1717
import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink;
18-
import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge;
1918
import org.opentripplanner.standalone.config.debuguiconfig.BackgroundTileLayer;
2019
import org.opentripplanner.street.model.StreetTraversalPermission;
2120
import org.opentripplanner.street.model.edge.AreaEdge;

application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.opentripplanner.street.model.edge.StreetEdgeBuilder;
1515
import org.opentripplanner.street.model.vertex.OsmVertex;
1616
import org.opentripplanner.street.model.vertex.Vertex;
17-
import org.opentripplanner.street.search.TraverseMode;
1817

1918
public class BarrierEdgeBuilder {
2019

0 commit comments

Comments
 (0)