Merge pull request opentripplanner#7083 from HSLdevcom/extend-checkstyle-usage

Use checkstyle for all java code

Author: leonardehrenfried

application/pom.xml

@@ -504,6 +504,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <sourceDirectories>
+                        <sourceDirectory>src/main/java</sourceDirectory>
+                        <sourceDirectory>src/ext/java</sourceDirectory>
+                        <sourceDirectory>src/ext-test/java</sourceDirectory>
+                        <sourceDirectory>src/test-fixtures/java</sourceDirectory>
+                    </sourceDirectories>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.hubspot.maven.plugins</groupId>
                 <artifactId>prettier-maven-plugin</artifactId>

application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java

@@ -11,7 +11,6 @@
 import org.opentripplanner.model.fare.FareMedium;
 import org.opentripplanner.model.fare.FareProduct;
 import org.opentripplanner.model.fare.RiderCategory;
-import org.opentripplanner.model.fare.RiderCategoryBuilder;
 import org.opentripplanner.transit.model.basic.Money;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 

application/src/ext-test/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterTest.java

@@ -5,7 +5,22 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;

application/src/ext-test/java/org/opentripplanner/ext/trias/trias/OjpMapperTest.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.ext.trias.trias;
 
-import static jakarta.xml.bind.Marshaller.*;
+import static jakarta.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT;
 import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
 
 import de.vdv.ojp20.OJP;

application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java

@@ -1,7 +1,6 @@
 package org.opentripplanner.ext.vectortiles.layers.vehiclerental.mapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeFactory.vehicleType;
 import static org.opentripplanner.street.model.RentalFormFactor.BICYCLE;
 import static org.opentripplanner.street.model.RentalFormFactor.SCOOTER;
@@ -10,12 +9,9 @@
 import java.util.Locale;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.framework.i18n.TranslatedString;
-import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
-import org.opentripplanner.street.model.RentalFormFactor;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 
 class DigitransitVehicleRentalStationPropertyMapperTest {

application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTrip.java

@@ -2,15 +2,13 @@
 
 import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
 import org.opentripplanner.transit.model.framework.LogInfo;
 import org.opentripplanner.transit.model.framework.TransitBuilder;
-import org.opentripplanner.transit.model.site.AreaStop;
 
 /**
  * Represents a driver's carpool journey with planned route, timing, and passenger capacity.

application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java

@@ -6,7 +6,6 @@
 import java.util.List;
 import org.opentripplanner.transit.model.framework.AbstractEntityBuilder;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
-import org.opentripplanner.transit.model.site.AreaStop;
 
 public class CarpoolTripBuilder extends AbstractEntityBuilder<CarpoolTrip, CarpoolTripBuilder> {
 

application/src/ext/java/org/opentripplanner/ext/fares/impl/gtfs/DefaultFareService.java

@@ -283,7 +283,9 @@ protected Optional<FareAndId> getBestFareAndId(
       FareAttribute attribute = ruleSet.getFareAttribute();
       // fares also don't really have an agency id, they will have the per-feed default id
       // check only if the fare is not mapped to an agency
-      if (!attribute.getId().getFeedId().equals(feedId)) continue;
+      if (!attribute.getId().getFeedId().equals(feedId)) {
+        continue;
+      }
 
       if (
         ruleSet.matches(

application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/_RouteRequestTestContext.java

@@ -3,7 +3,6 @@
 import static java.util.Map.entry;
 import static org.opentripplanner.apis.gtfs.SchemaObjectMappersForTests.mapCoordinate;
 
-import graphql.ExecutionInput;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.DataFetchingEnvironmentImpl;
 import java.util.HashMap;
@@ -103,13 +102,6 @@ public Locale locale() {
   }
 
   DataFetchingEnvironment executionContext(Map<String, Object> arguments) {
-    ExecutionInput executionInput = ExecutionInput.newExecutionInput()
-      .query("")
-      .operationName("planConnection")
-      .context(context)
-      .locale(locale)
-      .build();
-
     var executionContext = DataFetchingSupport.executionContext();
     return DataFetchingEnvironmentImpl.newDataFetchingEnvironment(executionContext)
       .arguments(arguments)

application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java

@@ -8,14 +8,12 @@
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
 import static org.opentripplanner.utils.time.TimeUtils.time;
 
-import graphql.ExecutionInput;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.DataFetchingEnvironmentImpl;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -417,13 +415,6 @@ public void testExplicitModesBikeAccess() {
   }
 
   private DataFetchingEnvironment executionContext(Map<String, Object> arguments) {
-    ExecutionInput executionInput = ExecutionInput.newExecutionInput()
-      .query("")
-      .operationName("trip")
-      .context(context)
-      .locale(Locale.ENGLISH)
-      .build();
-
     var executionContext = DataFetchingSupport.executionContext();
 
     var env = DataFetchingEnvironmentImpl.newDataFetchingEnvironment(executionContext)