minor code clean-ups

stklcode · Aug 30, 2022 · 0ee348e · 0ee348e
1 parent a910059
commit 0ee348e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -6,7 +6,7 @@ steps:
   - name: test
     image: maven:3-openjdk-8
     commands:
-      - mvn clean test
+      - mvn -B clean test
 
 ---
 kind: pipeline
@@ -17,7 +17,7 @@ steps:
   - name: test
     image: maven:3-openjdk-11
     commands:
-      - mvn clean test
+      - mvn -B clean test
 
 ---
 kind: pipeline
@@ -28,4 +28,4 @@ steps:
   - name: test
     image: maven:3-openjdk-17
     commands:
-      - mvn clean test
+      - mvn -B clean test
diff --git a/src/main/java/de/stklcode/pubtrans/ura/UraClient.java b/src/main/java/de/stklcode/pubtrans/ura/UraClient.java
@@ -236,7 +236,7 @@ public List<Trip> getTrips(final Query query, final Integer limit) {
             String version = null;
             String line = br.readLine();
             while (line != null && (limit == null || trips.size() < limit)) {
-                List l = mapper.readValue(line, List.class);
+                List<?> l = mapper.readValue(line, List.class);
                 /* Check if result exists and has correct response type */
                 if (l != null && !l.isEmpty()) {
                     if (l.get(0).equals(RES_TYPE_URA_VERSION)) {
@@ -311,7 +311,7 @@ public List<Stop> getStops(final Query query) {
              BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
             String line;
             while ((line = br.readLine()) != null) {
-                List l = mapper.readValue(line, List.class);
+                List<?> l = mapper.readValue(line, List.class);
                 /* Check if result exists and has correct response type */
                 if (l != null && !l.isEmpty() && l.get(0).equals(RES_TYPE_STOP)) {
                     stops.add(new Stop(l));
@@ -361,7 +361,7 @@ public List<Message> getMessages(final Query query, final Integer limit) {
             String version = null;
             String line = br.readLine();
             while (line != null && (limit == null || messages.size() < limit)) {
-                List l = mapper.readValue(line, List.class);
+                List<?> l = mapper.readValue(line, List.class);
                 /* Check if result exists and has correct response type */
                 if (l != null && !l.isEmpty()) {
                     if (l.get(0).equals(RES_TYPE_URA_VERSION)) {

diff --git a/src/main/java/de/stklcode/pubtrans/ura/model/Message.java b/src/main/java/de/stklcode/pubtrans/ura/model/Message.java
@@ -87,7 +87,7 @@ public Message(final Stop stop,
      * @param raw List of attributes from JSON line
      * @throws IOException Thrown on invalid line format.
      */
-    public Message(final List raw) throws IOException {
+    public Message(final List<?> raw) throws IOException {
         this(raw, null);
     }
 
@@ -98,7 +98,7 @@ public Message(final List raw) throws IOException {
      * @param version API version
      * @throws IOException Thrown on invalid line format.
      */
-    public Message(final List raw, final String version) throws IOException {
+    public Message(final List<?> raw, final String version) throws IOException {
         if (raw == null || raw.size() < NUM_OF_FIELDS) {
             throw new IOException("Invalid number of fields");
         }

diff --git a/src/main/java/de/stklcode/pubtrans/ura/model/Model.java b/src/main/java/de/stklcode/pubtrans/ura/model/Model.java
@@ -33,7 +33,7 @@ interface Model extends Serializable {
      * @param actual Actual class.
      * @return The Exception.
      */
-    static IOException typeErrorString(int field, Class actual) {
+    static IOException typeErrorString(int field, Class<?> actual) {
         return typeError(field, actual, "String");
     }
 
@@ -45,7 +45,7 @@ static IOException typeErrorString(int field, Class actual) {
      * @param expected Expected type.
      * @return The Exception.
      */
-    static IOException typeError(int field, Class actual, String expected) {
+    static IOException typeError(int field, Class<?> actual, String expected) {
         return new IOException(String.format("Field %d not of expected type %s, found %s",
                 field, expected, actual.getSimpleName()));
     }

diff --git a/src/main/java/de/stklcode/pubtrans/ura/model/Stop.java b/src/main/java/de/stklcode/pubtrans/ura/model/Stop.java
@@ -72,7 +72,7 @@ public Stop(final String id,
      * @param raw List of attributes from JSON line
      * @throws IOException Thrown on invalid line format.
      */
-    public Stop(final List raw) throws IOException {
+    public Stop(final List<?> raw) throws IOException {
         if (raw == null || raw.size() < F_NUM_OF_FIELDS) {
             throw new IOException("Invalid number of fields");
         }

diff --git a/src/main/java/de/stklcode/pubtrans/ura/model/Trip.java b/src/main/java/de/stklcode/pubtrans/ura/model/Trip.java
@@ -142,7 +142,7 @@ public Trip(final Stop stop,
      * @param raw List of attributes from JSON line
      * @throws IOException Thrown on invalid line format.
      */
-    public Trip(final List raw) throws IOException {
+    public Trip(final List<?> raw) throws IOException {
         this(raw, null);
     }
 
@@ -153,7 +153,7 @@ public Trip(final List raw) throws IOException {
      * @param version API version
      * @throws IOException Thrown on invalid line format.
      */
-    public Trip(final List raw, final String version) throws IOException {
+    public Trip(final List<?> raw, final String version) throws IOException {
         if (raw == null || raw.size() < NUM_OF_FIELDS) {
             throw new IOException("Invalid number of fields");
         }

diff --git a/src/main/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReader.java b/src/main/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReader.java
@@ -83,7 +83,7 @@ public void open() {
                 String version = null;
                 String line = br.readLine();
                 while (line != null && !this.canceled) {
-                    List l = mapper.readValue(line, List.class);
+                    List<?> l = mapper.readValue(line, List.class);
                     // Check if result exists and has correct response type.
                     if (l != null && !l.isEmpty()) {
                         if (l.get(0).equals(RES_TYPE_URA_VERSION)) {

diff --git a/src/test/java/de/stklcode/pubtrans/ura/UraClientTest.java b/src/test/java/de/stklcode/pubtrans/ura/UraClientTest.java
@@ -45,25 +45,25 @@
  *
  * @author Stefan Kalscheuer
  */
-public class UraClientTest {
+class UraClientTest {
     private static WireMockServer httpMock;
 
     @BeforeAll
-    public static void setUp() {
+    static void setUp() {
         // Initialize HTTP mock.
         httpMock = new WireMockServer(WireMockConfiguration.options().dynamicPort());
         httpMock.start();
         WireMock.configureFor("localhost", httpMock.port());
     }
 
     @AfterAll
-    public static void tearDown() {
+    static void tearDown() {
         httpMock.stop();
         httpMock = null;
     }
 
     @Test
-    public void getStopsTest() {
+    void getStopsTest() {
         // Mock the HTTP call.
         mockHttpToFile(2, "instant_V2_stops.txt");
 
@@ -89,7 +89,7 @@ public void getStopsTest() {
     }
 
     @Test
-    public void getStopsForLineTest() {
+    void getStopsForLineTest() {
         // Mock the HTTP call.
         mockHttpToFile(2, "instant_V2_stops_line.txt");
 
@@ -107,7 +107,7 @@ public void getStopsForLineTest() {
     }
 
     @Test
-    public void getStopsForPositionTest() {
+    void getStopsForPositionTest() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_stops_circle.txt");
 
@@ -133,7 +133,7 @@ public void getStopsForPositionTest() {
     }
 
     @Test
-    public void getTripsForDestinationNamesTest() {
+    void getTripsForDestinationNamesTest() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_trips_destination.txt");
 
@@ -156,7 +156,7 @@ public void getTripsForDestinationNamesTest() {
     }
 
     @Test
-    public void getTripsTowardsTest() {
+    void getTripsTowardsTest() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_trips_towards.txt");
 
@@ -171,7 +171,7 @@ public void getTripsTowardsTest() {
     }
 
     @Test
-    public void getTripsTest() {
+    void getTripsTest() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_trips_all.txt");
 
@@ -224,7 +224,7 @@ public void getTripsTest() {
     }
 
     @Test
-    public void getTripsForStopTest() {
+    void getTripsForStopTest() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_trips_stop.txt");
 
@@ -254,7 +254,7 @@ public void getTripsForStopTest() {
     }
 
     @Test
-    public void getTripsForLine() {
+    void getTripsForLine() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_trips_line.txt");
 
@@ -303,7 +303,7 @@ public void getTripsForLine() {
     }
 
     @Test
-    public void getTripsForStopAndLine() {
+    void getTripsForStopAndLine() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_trips_stop_line.txt");
 
@@ -324,7 +324,7 @@ public void getTripsForStopAndLine() {
 
 
     @Test
-    public void getMessages() {
+    void getMessages() {
         // Mock the HTTP call.
         mockHttpToFile(1, "instant_V1_messages.txt");
 
@@ -343,7 +343,7 @@ public void getMessages() {
     }
 
     @Test
-    public void getMessagesForStop() {
+    void getMessagesForStop() {
         // Mock the HTTP call.
         mockHttpToFile(2, "instant_V2_messages_stop.txt");
 

diff --git a/src/test/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReaderTest.java b/src/test/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReaderTest.java
@@ -162,7 +162,7 @@ public void readerTest() throws InterruptedException, IOException {
      * @throws IOException          Error reading or writing mocked data.
      */
     @Test
-    public void streamClosedTest() throws InterruptedException, IOException {
+    void streamClosedTest() throws InterruptedException, IOException {
         // Callback counter for some unhandy async mockery.
         final AtomicInteger counter = new AtomicInteger(0);