test: use JRE8+ version of WireMock for offline testing

Plus some minor dev-dependency updates.

.drone.yml

@@ -6,15 +6,15 @@ steps:
   - name: test
     image: maven:3-openjdk-11
     commands:
-      - mvn clean test
+      - mvn -B clean test
 
 ---
 kind: pipeline
 type: docker
-name: java15
+name: java17
 
 steps:
   - name: test
-    image: maven:3-openjdk-15
+    image: maven:3-openjdk-17
     commands:
-      - mvn clean test
+      - mvn -B clean test

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+on: [ push, pull_request ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        jdk: [ 11, 17 ]
+        include:
+          - jdk: 11
+            analysis: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Java
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.jdk }}
+          distribution: 'temurin'
+      - name: Test
+        run: mvn -B -P coverage clean verify
+      - name: Analysis
+        if: matrix.analysis && github.event_name == 'push'
+        run: >
+          mvn -B sonar:sonar
+          -Dsonar.host.url=https://sonarcloud.io
+          -Dsonar.organization=stklcode-github
+          -Dsonar.login=$SONAR_TOKEN
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.travis.yml

@@ -1,16 +0,0 @@
-language: java
-jdk:
-  - openjdk11
-  - openjdk15
-install: true
-addons:
-  sonarcloud:
-    organization: "stklcode-github"
-    token:
-        secure: "FkEe/+MKpF4pSX3ZYOgu7oeIKf0460Q3XVLUhIX9bk2dyY8hoab74oCo4FtD7jim0+ZC13JVHGDX7iOQMUtS5EZ+x+pA0qpppzCK5zV8afN/l46HJ07kJldvr+EH0klbDVMFZQ5dT7r/w6CoDzjtENHzKQAJLcheUVDNpkcuBdaplTqIAVf3lQpKtOuVjQJ5qZDwwS5wsHNqPcYbcEGrPmcKDVnp3mD3bfI6dT1bbRt845QcD73rPYkQKxen8eIwJxFf5MZStgvbj7yphPxPGwoLAsoLP6LpThTDYcrg+vgUnSs+l9GckL3IbhPAmecixLbKVnphBZzRTvpdMTt5KeOoAJ2nM6RLs5cRCqiEgLEioWkVaSH5WxoBj38Z1h4fTsDV3dTcCuQWX8GFxdeeTelu+XbatdRWMnUgiF7oax+uNvR62fasTbAc7dWPJbARiD7ZbkWH4nHEY07xKKx87xzUz36ZeEHGoBXgqnLmv/FCwqMrEpOoIT41fc0WYtdIA4wjRoAyG0u+wNBMbVlf4PK72seM4b/bmU+TtmaaVla/SvNOiz+A3DHxtJEUScPcL3QGjviddglMf+wyD6VXVViq9VuYRKZFyjpuoNpb5lwEbwmRnmLabBx8jBgyPinjpmqHYlIntcPAwuyLRaqTHFcmCrbeeZEf7KaPRYKx+Cs="
-cache:
-  directories:
-    - '$HOME/.m2/repository'
-    - '$HOME/.sonar/cache'
-script:
-  - if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]; then mvn -P coverage clean package sonar:sonar; else mvn clean test; fi

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 2.0.2 - 2022-04-13
+### Security
+* Updated dependencies
+
+
+## 2.0.1 - 2021-10-02
+### Security
+* Updated dependencies
+
+### Improvement
+* Built and tested with JDK 17
+
 ## 2.0.0 - 2021-01-30
 ### Breaking
 * Java 11 or later required

CONTRIBUTING.md

@@ -107,7 +107,7 @@ Files ending with `Test.java` will be automatically included into the test suite
 
 ## Continuous Integration
 
-Automated tests are run using [Travis CI](https://travis-ci.com/stklcode/juraclient) for every commit including pull requests.
+Automated tests are run using [GitHub Actions](https://github.com/stklcode/juraclient/actions/) for every commit including pull requests.
 
 There is also a code quality analysis pushing results to [SonarCloud](https://sonarcloud.io/dashboard?id=de.stklcode.pubtrans%3Ajuraclient).
 Keep in mind that the ruleset is not yet perfect, so not every minor issue has to be fixed immediately.

README.md

@@ -1,5 +1,5 @@
 # jURAclient 
-[![Build Status](https://travis-ci.com/stklcode/juraclient.svg?branch=master)](https://travis-ci.com/stklcode/juraclient)
+[![Build Status](https://github.com/stklcode/juraclient/actions/workflows/ci.yml/badge.svg)](https://github.com/stklcode/juraclient/actions/workflows/ci.yml)
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=de.stklcode.pubtrans%3Ajuraclient&metric=alert_status)](https://sonarcloud.io/dashboard?id=de.stklcode.pubtrans%3Ajuraclient) 
 [![Javadocs](https://www.javadoc.io/badge/de.stklcode.pubtrans/juraclient.svg)](https://www.javadoc.io/doc/de.stklcode.pubtrans/juraclient)
 [![Maven Central](https://img.shields.io/maven-central/v/de.stklcode.pubtrans/juraclient.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22de.stklcode.pubtrans%22%20AND%20a%3A%22juraclient%22)
@@ -22,17 +22,17 @@ However, new features might not be backported.
 
 ### Initialization
 ```java
-// Instantiate the client (e.g. using the TFL API)
+// Instantiate the client.
-UraClient ura = new UraClient("http://countdown.api.tfl.gov.uk");
+UraClient ura = new UraClient("https://ura.example.com");
 
-// Initialize the API with non-standard endpoints (e.g. ASEAG with API V2)
+// Initialize the API with non-standard endpoints.
-UraClient ura = new UraClient("http://ivu.aseag.de", 
+UraClient ura = new UraClient("https://ura.example.com", 
                               "interfaces/ura/instant_V2", 
                               "interfaces/ura/stream_V2");
 
 // Initialization with configuration builder (Client v2.x)
 UraClient ura = new UraClient(
-    UraClientConfiguration.forBaseURL("http://ura.example.com")
+    UraClientConfiguration.forBaseURL("https://ura.example.com")
                           .withInstantPath("interfaces/ura/instant_V2")
                           .withStreamPath("interfaces/ura/stream_V2")
                           .withConnectTimeout(Duration.ofSeconds(2))
@@ -81,10 +81,10 @@ List<Message> msgs = ura.forStop("100000")
 <dependency>
     <groupId>de.stklcode.pubtrans</groupId>
     <artifactId>juraclient</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
 </dependency>
 ```
 
 ## License
 
-The project is licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
+The project is licensed under [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0).

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.stklcode.pubtrans</groupId>
     <artifactId>juraclient</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,7 +22,7 @@
     <licenses>
         <license>
             <name>Apache License 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -50,13 +50,13 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.1</version>
+            <version>2.13.2.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.7.0</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -67,8 +67,8 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-jre8</artifactId>
-            <version>2.27.2</version>
+            <version>2.33.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -78,7 +78,7 @@
             <dependency>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.8.0.2131</version>
+                <version>3.9.1.2184</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
                     <release>11</release>
                 </configuration>
@@ -121,7 +121,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.6</version>
+                        <version>0.8.8</version>
                         <executions>
                             <execution>
                                 <id>prepare-agent</id>
@@ -176,7 +176,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
+                        <version>3.3.2</version>
                         <configuration>
                             <overview>${basedir}/src/main/javadoc/overview.html</overview>
                             <source>11</source>
@@ -201,7 +201,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

src/main/java/de/stklcode/pubtrans/ura/UraClientConfiguration.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.time.Duration;
 
 /**
- * Configurstion Object for the {@link UraClient}.
+ * Configuration Object for the {@link UraClient}.
  *
  * @author Stefan Kalscheuer
  * @since 2.0

src/test/java/de/stklcode/pubtrans/ura/UraClientTest.java

@@ -16,17 +16,14 @@
 
 package de.stklcode.pubtrans.ura;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.http.Fault;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import de.stklcode.pubtrans.ura.exception.UraClientException;
 import de.stklcode.pubtrans.ura.model.Message;
 import de.stklcode.pubtrans.ura.model.Stop;
 import de.stklcode.pubtrans.ura.model.Trip;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import java.io.IOException;
 import java.net.http.HttpConnectTimeoutException;
@@ -36,6 +33,7 @@ import java.util.List;
 import java.util.Optional;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -46,27 +44,17 @@ import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for the URA Client.
- * Tests run against mocked data collected from ASEAG API (http://ivu.aseag.de) and
+ * Tests run against mocked data collected from ASEAG API (no longer available) and
- * TFL API (http://http://countdown.api.tfl.gov.uk)
+ * TFL API (http://countdown.api.tfl.gov.uk)
  *
  * @author Stefan Kalscheuer
  */
 public class UraClientTest {
-    private static WireMockServer httpMock;
 
-    @BeforeAll
+    @RegisterExtension
-    public static void setUp() {
+    public static WireMockExtension wireMock = WireMockExtension.newInstance()
-        // Initialize HTTP mock.
+            .options(wireMockConfig().dynamicPort())
-        httpMock = new WireMockServer(WireMockConfiguration.options().dynamicPort());
+            .build();
-        httpMock.start();
-        WireMock.configureFor("localhost", httpMock.port());
-    }
-
-    @AfterAll
-    public static void tearDown() {
-        httpMock.stop();
-        httpMock = null;
-    }
 
     @Test
     public void getStopsTest() throws UraClientException {
@@ -74,7 +62,7 @@ public class UraClientTest {
         mockHttpToFile(2, "instant_V2_stops.txt");
 
         // List stops and verify some values.
-        List<Stop> stops = new UraClient(httpMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream").getStops();
+        List<Stop> stops = new UraClient(wireMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream").getStops();
         assertThat(stops, hasSize(10));
         assertThat(stops.get(0).getId(), is("100210"));
         assertThat(stops.get(1).getName(), is("Brockenberg"));
@@ -86,7 +74,7 @@ public class UraClientTest {
         mockHttpToError(500);
 
         try {
-            new UraClient(httpMock.baseUrl()).getStops();
+            new UraClient(wireMock.baseUrl()).getStops();
         } catch (RuntimeException e) {
             assertThat(e, is(instanceOf(IllegalStateException.class)));
             assertThat(e.getCause(), is(instanceOf(IOException.class)));
@@ -100,7 +88,7 @@ public class UraClientTest {
         mockHttpToFile(2, "instant_V2_stops_line.txt");
 
         // List stops and verify some values.
-        List<Stop> stops = new UraClient(httpMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
+        List<Stop> stops = new UraClient(wireMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
                 .forLines("33")
                 .getStops();
         assertThat(stops, hasSize(47));
@@ -118,7 +106,7 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_stops_circle.txt");
 
         // List stops and verify some values.
-        List<Stop> stops = new UraClient(httpMock.baseUrl())
+        List<Stop> stops = new UraClient(wireMock.baseUrl())
                 .forPosition(51.51009, -0.1345734, 200)
                 .getStops();
         assertThat(stops, hasSize(13));
@@ -130,7 +118,7 @@ public class UraClientTest {
         assertThat(stops.get(5).getIndicator(), is(nullValue()));
 
         mockHttpToFile(1, "instant_V1_stops_circle_name.txt");
-        stops = new UraClient(httpMock.baseUrl())
+        stops = new UraClient(wireMock.baseUrl())
                 .forStopsByName("Piccadilly Circus")
                 .forPosition(51.51009, -0.1345734, 200)
                 .getStops();
@@ -144,13 +132,13 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_trips_destination.txt");
 
         // List stops and verify some values.
-        List<Trip> trips = new UraClient(httpMock.baseUrl()).forDestinationNames("Piccadilly Circus").getTrips();
+        List<Trip> trips = new UraClient(wireMock.baseUrl()).forDestinationNames("Piccadilly Circus").getTrips();
         assertThat(trips, hasSize(9));
         assertThat(trips.stream().filter(t -> !t.getDestinationName().equals("Piccadilly Cir")).findAny(),
                 is(Optional.empty()));
 
         mockHttpToFile(1, "instant_V1_trips_stop_destination.txt");
-        trips = new UraClient(httpMock.baseUrl())
+        trips = new UraClient(wireMock.baseUrl())
                 .forStops("156")
                 .forDestinationNames("Marble Arch")
                 .getTrips();
@@ -167,11 +155,11 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_trips_towards.txt");
 
         /* List stops and verify some values */
-        List<Trip> trips = new UraClient(httpMock.baseUrl()).towards("Marble Arch").getTrips();
+        List<Trip> trips = new UraClient(wireMock.baseUrl()).towards("Marble Arch").getTrips();
         assertThat(trips, hasSize(10));
 
         mockHttpToFile(1, "instant_V1_trips_stop_towards.txt");
-        trips = new UraClient(httpMock.baseUrl()).forStops("156").towards("Marble Arch").getTrips();
+        trips = new UraClient(wireMock.baseUrl()).forStops("156").towards("Marble Arch").getTrips();
         assertThat(trips, hasSize(17));
         assertThat(trips.stream().filter(t -> !t.getStop().getId().equals("156")).findAny(), is(Optional.empty()));
     }
@@ -182,7 +170,7 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_trips_all.txt");
 
         // Get trips without filters and verify some values.
-        List<Trip> trips = new UraClient(httpMock.baseUrl()).getTrips();
+        List<Trip> trips = new UraClient(wireMock.baseUrl()).getTrips();
         assertThat(trips, hasSize(10));
         assertThat(trips.get(0).getId(), is("27000165015001"));
         assertThat(trips.get(1).getLineID(), is("55"));
@@ -199,7 +187,7 @@ public class UraClientTest {
         mockHttpToFile(2, "instant_V2_trips_all.txt");
 
         // Get trips without filters and verify some values.
-        trips = new UraClient(httpMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
+        trips = new UraClient(wireMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
                 .getTrips();
         assertThat(trips, hasSize(10));
         assertThat(trips.get(0).getId(), is("27000165015001"));
@@ -215,13 +203,13 @@ public class UraClientTest {
 
         // Get limited number of trips.
         mockHttpToFile(1, "instant_V1_trips_all.txt");
-        trips = new UraClient(httpMock.baseUrl()).getTrips(5);
+        trips = new UraClient(wireMock.baseUrl()).getTrips(5);
         assertThat(trips, hasSize(5));
 
         // Test mockException handling.
         mockHttpToError(502);
         try {
-            new UraClient(httpMock.baseUrl()).getTrips();
+            new UraClient(wireMock.baseUrl()).getTrips();
         } catch (RuntimeException e) {
             assertThat(e, is(instanceOf(IllegalStateException.class)));
             assertThat(e.getCause(), is(instanceOf(IOException.class)));
@@ -231,7 +219,7 @@ public class UraClientTest {
         mockHttpToException();
         UraClientException exception = assertThrows(
                 UraClientException.class,
-                () -> new UraClient(httpMock.baseUrl()).getTrips(),
+                () -> new UraClient(wireMock.baseUrl()).getTrips(),
                 "Expected reader to raise an exception"
         );
         assertEquals("Failed to read trips from API", exception.getMessage(), "Unexpected error message");
@@ -244,7 +232,7 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_trips_stop.txt");
 
         // Get trips for stop ID 100000 (Aachen Bushof) and verify some values.
-        List<Trip> trips = new UraClient(httpMock.baseUrl())
+        List<Trip> trips = new UraClient(wireMock.baseUrl())
                 .forStops("100000")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -256,7 +244,7 @@ public class UraClientTest {
 
         // Get trips for stop name "Uniklinik" and verify some values.
         mockHttpToFile(1, "instant_V1_trips_stop_name.txt");
-        trips = new UraClient(httpMock.baseUrl())
+        trips = new UraClient(wireMock.baseUrl())
                 .forStopsByName("Uniklinik")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -270,7 +258,7 @@ public class UraClientTest {
         mockHttpToException();
         UraClientException exception = assertThrows(
                 UraClientException.class,
-                () -> new UraClient(httpMock.baseUrl()).getStops(),
+                () -> new UraClient(wireMock.baseUrl()).getStops(),
                 "Expected reader to raise an exception"
         );
         assertEquals("Failed to read stops from API", exception.getMessage(), "Unexpected error message");
@@ -283,7 +271,7 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_trips_line.txt");
 
         // Get trips for line ID 3 and verify some values.
-        List<Trip> trips = new UraClient(httpMock.baseUrl())
+        List<Trip> trips = new UraClient(wireMock.baseUrl())
                 .forLines("3")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -295,7 +283,7 @@ public class UraClientTest {
 
         // Get trips for line name "3.A" and verify some values.
         mockHttpToFile(1, "instant_V1_trips_line_name.txt");
-        trips = new UraClient(httpMock.baseUrl())
+        trips = new UraClient(wireMock.baseUrl())
                 .forLinesByName("3.A")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -307,7 +295,7 @@ public class UraClientTest {
 
         // Get trips for line 3 with direction 1 and verify some values.
         mockHttpToFile(1, "instant_V1_trips_line_direction.txt");
-        trips = new UraClient(httpMock.baseUrl())
+        trips = new UraClient(wireMock.baseUrl())
                 .forLines("412")
                 .forDirection(2)
                 .getTrips();
@@ -317,7 +305,7 @@ public class UraClientTest {
 
         // Test lineID and direction in different order.
         mockHttpToFile(1, "instant_V1_trips_line_direction.txt");
-        trips = new UraClient(httpMock.baseUrl())
+        trips = new UraClient(wireMock.baseUrl())
                 .forDirection(2)
                 .forLines("412")
                 .getTrips();
@@ -332,7 +320,7 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_trips_stop_line.txt");
 
         // Get trips for line ID 25 and 25 at stop 100000 and verify some values.
-        List<Trip> trips = new UraClient(httpMock.baseUrl())
+        List<Trip> trips = new UraClient(wireMock.baseUrl())
                 .forLines("25", "35")
                 .forStops("100000")
                 .getTrips();
@@ -353,7 +341,7 @@ public class UraClientTest {
         mockHttpToFile(1, "instant_V1_messages.txt");
 
         // Get messages without filter and verify some values.
-        List<Message> messages = new UraClient(httpMock.baseUrl())
+        List<Message> messages = new UraClient(wireMock.baseUrl())
                 .getMessages();
         assertThat(messages, hasSize(2));
         assertThat(messages.get(0).getStop().getId(), is("100707"));
@@ -368,7 +356,7 @@ public class UraClientTest {
         mockHttpToException();
         UraClientException exception = assertThrows(
                 UraClientException.class,
-                () -> new UraClient(httpMock.baseUrl()).getMessages(),
+                () -> new UraClient(wireMock.baseUrl()).getMessages(),
                 "Expected reader to raise an exception"
         );
         assertEquals("Failed to read messages from API", exception.getMessage(), "Unexpected error message");
@@ -381,7 +369,7 @@ public class UraClientTest {
         mockHttpToFile(2, "instant_V2_messages_stop.txt");
 
         // Get trips for stop ID 100707 (Berensberger Str.) and verify some values.
-        List<Message> messages = new UraClient(httpMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
+        List<Message> messages = new UraClient(wireMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
                 .forStops("100707")
                 .getMessages();
         assertThat(messages, hasSize(1));
@@ -407,14 +395,14 @@ public class UraClientTest {
         assertTrue(exception.getCause() instanceof HttpConnectTimeoutException, "Exception cause is not HttpConnectionTimeoutException");
 
         // Mock the HTTP call with delay of 200ms, but immediate connection.
-        WireMock.stubFor(
+        wireMock.stubFor(
                 get(urlPathEqualTo("/interfaces/ura/instant_V1")).willReturn(
                         aResponse().withFixedDelay(200).withBodyFile("instant_V1_trips_destination.txt")
                 )
         );
         assertDoesNotThrow(
                 () -> new UraClient(
-                        UraClientConfiguration.forBaseURL(httpMock.baseUrl())
+                        UraClientConfiguration.forBaseURL(wireMock.baseUrl())
                                 .withConnectTimeout(Duration.ofMillis(100))
                                 .build()
                 ).forDestinationNames("Piccadilly Circus").getTrips(),
@@ -425,7 +413,7 @@ public class UraClientTest {
         exception = assertThrows(
                 UraClientException.class,
                 () -> new UraClient(
-                        UraClientConfiguration.forBaseURL(httpMock.baseUrl())
+                        UraClientConfiguration.forBaseURL(wireMock.baseUrl())
                                 .withTimeout(Duration.ofMillis(100))
                                 .build()
                 ).forDestinationNames("Piccadilly Circus").getTrips(),
@@ -435,7 +423,7 @@ public class UraClientTest {
 
         assertDoesNotThrow(
                 () -> new UraClient(
-                        UraClientConfiguration.forBaseURL(httpMock.baseUrl())
+                        UraClientConfiguration.forBaseURL(wireMock.baseUrl())
                                 .withTimeout(Duration.ofMillis(300))
                                 .build()
                 ).forDestinationNames("Piccadilly Circus").getTrips(),
@@ -444,7 +432,7 @@ public class UraClientTest {
     }
 
     private static void mockHttpToFile(int version, String resourceFile) {
-        WireMock.stubFor(
+        wireMock.stubFor(
                 get(urlPathEqualTo("/interfaces/ura/instant_V" + version)).willReturn(
                         aResponse().withBodyFile(resourceFile)
                 )
@@ -452,7 +440,7 @@ public class UraClientTest {
     }
 
     private static void mockHttpToError(int code) {
-        WireMock.stubFor(
+        wireMock.stubFor(
                 get(anyUrl()).willReturn(
                         aResponse().withStatus(code)
                 )
@@ -460,7 +448,7 @@ public class UraClientTest {
     }
 
     private static void mockHttpToException() {
-        WireMock.stubFor(
+        wireMock.stubFor(
                 get(anyUrl()).willReturn(
                         aResponse().withFault(Fault.MALFORMED_RESPONSE_CHUNK)
                 )