minor code clean-ups

Future was not removed from the reader instance after close() has been
called, so re-opening was not possible. Remove the instance after
termination allows calling open() again.

.drone.yml

@@ -1,18 +1,31 @@
 kind: pipeline
+type: docker
 name: java8
 
 steps:
   - name: test
-    image: maven:3-jdk-8-alpine
+    image: maven:3-openjdk-8
     commands:
-      - mvn clean test
+      - mvn -B clean test
 
 ---
 kind: pipeline
+type: docker
 name: java11
 
 steps:
   - name: test
-    image: maven:3-jdk-11-slim
+    image: maven:3-openjdk-11
     commands:
-      - mvn clean test
+      - mvn -B clean test
+
+---
+kind: pipeline
+type: docker
+name: java17
+
+steps:
+  - name: test
+    image: maven:3-openjdk-17
+    commands:
+      - 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: [ 8, 11, 17 ]
+        include:
+          - jdk: 11
+            analysis: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        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:
-  - openjdk8
-  - openjdk11
-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 jacoco clean package sonar:sonar; else mvn clean test; fi

CHANGELOG.md

@@ -1,6 +1,28 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.3.2 - 2022-08-30
+
+### Improvements
+* Dependency updates
+
+
+## 1.3.1 - 2020-12-12
+### Fixed
+* Allow reopening an `AsyncUraTripReader` without raising an exception (#13)
+
+### Improvements
+* Dependency updates
+
+
+## 1.3.0 - 2019-12-04
+### Security
+* Updated dependencies
+
+### Features
+* Added support for reading messages, using `getMessages()` method (#5)
+
+
 ## 1.2.0 - 2019-06-20
 ### Security
 * Updated dependencies
@@ -8,11 +30,12 @@ All notable changes to this project will be documented in this file.
 ### Features
 * Added support for stream API with asynchronous reader, using `getTripsStream()` method (#1)
 
+
 ## 1.1.4 - 2018-11-19
 ### Fixed
 * Fixed issue with direction ID as `String` instead if `Integer` (#2)
 * Fixed issue with vehicle ID being `null` (#3)
-* Fixed issue with spaces in search parametes (#4)
+* Fixed issue with spaces in search parameters (#4)
 
 
 ## 1.1.3 - 2018-11-13

CONTRIBUTING.md

@@ -49,7 +49,7 @@ Feel free to adapt these naming scheme to your forks.
 ### Merge Requirements
 
 To be merged into the master branch, your code has to pass the automated continuous integration tests, to ensure compatibility.
-In Addition your code has to be approved by a project member.
+In addition, your code has to be approved by a project member.
 
 #### What if my code fails the tests?
 
@@ -77,7 +77,7 @@ You might sign your work, although that's no must.
 
 Short answer: When it makes sense.
 
-Bugfixes should be merged in time - assuming they pass the above criteria.
+Bug fixes should be merged in time - assuming they pass the above criteria.
 New features might be assigned to a certain milestone and as a result of this be scheduled according to the planned release cycle.
 
 
@@ -87,7 +87,7 @@ This projects tries to adapt the [Semantic Versioning](https://semver.org).
 In short, bug fixes without do not affect any compatibility will raise the third number only, new features will be reflected in the second number and any change breaking compatibility with the public API require raising the first number.
 
 If you have to make a decision for which version to go please keep this in mind.
-However for most non-member commits this is mostly informative, as the decision will be made by the project team later.
+However, for most non-member commits this is mostly informative, as the decision will be made by the project team later.
 
 
 ## Build Environment
@@ -114,5 +114,5 @@ Keep in mind that the ruleset is not yet perfect, so not every minor issue has t
 
 ## Still Open Questions?
 
-If anything is still left unanswered and you're unsure if you got it right, don't hesitate to contact a team member.
+If anything is still left unanswered, and you're unsure if you got it right, don't hesitate to contact a team member.
 In any case you might submit your request/issue anyway, we won't refuse good code only for formal reasons.

README.md

@@ -17,7 +17,7 @@ local bus station or any other custom queries. API versions 1.x and 2.x are supp
 // Instantiate the client (e.g. using the TFL API)
 UraClient ura = new UraClient("http://countdown.api.tfl.gov.uk");
 
-// Initiailize the API with non-standard endpoints (e.g. ASEAG with API V2)
+// Initialize the API with non-standard endpoints (e.g. ASEAG with API V2)
 UraClient ura = new UraClient("http://ivu.aseag.de", 
                               "interfaces/ura/instant_V2", 
                               "interfaces/ura/stream_V2");
@@ -50,20 +50,23 @@ List<Trip> trips = ura.forStopByName("Piccadilly Circus")
                       .getTrips();
 ```
 
-## Maven Artifact
+### Get Messages
+
+```java
+// Get next 10 trips for given stops and lines in a single direction (all filters optional)
+List<Message> msgs = ura.forStop("100000")
+                        .getMessages();
 ```
+
+## Maven Artifact
+```xml
 <dependency>
     <groupId>de.stklcode.pubtrans</groupId>
     <artifactId>juraclient</artifactId>
-    <version>1.1.4</version>
+    <version>1.3.2</version>
 </dependency>
 ```
 
-## Planned Features
-
-* More refined query parameters
-* Stream API with asynchronous consumer
-
 ## License
 
 The project is licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).

pom.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.stklcode.pubtrans</groupId>
     <artifactId>juraclient</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.2</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,7 +21,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>
@@ -47,48 +46,47 @@
     </issueManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.9.9</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.9</version>
+            <version>2.13.3</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.4.2</version>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-junit</artifactId>
-            <version>2.0.0.0</version>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>1.9.13</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy-agent</artifactId>
-            <version>1.9.13</version>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <version>2.33.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.9.1.2184</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -97,7 +95,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -116,32 +114,18 @@
 
     <profiles>
         <profile>
-            <id>jacoco</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>org.jacoco.agent</artifactId>
-                    <version>0.8.4</version>
-                    <classifier>runtime</classifier>
-                </dependency>
-            </dependencies>
+            <id>coverage</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.4</version>
+                        <version>0.8.8</version>
                         <executions>
                             <execution>
-                                <id>default-instrument</id>
+                                <id>prepare-agent</id>
                                 <goals>
-                                    <goal>instrument</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>default-restore-instrumented-classes</id>
-                                <goals>
-                                    <goal>restore-instrumented-classes</goal>
+                                    <goal>prepare-agent</goal>
                                 </goals>
                             </execution>
                             <execution>
@@ -150,22 +134,9 @@
                                 <goals>
                                     <goal>report</goal>
                                 </goals>
-                                <configuration>
-                                    <dataFile>${project.build.directory}/coverage.exec</dataFile>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.22.2</version>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -180,7 +151,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -204,9 +175,10 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.4.1</version>
                         <configuration>
                             <overview>${basedir}/src/main/javadoc/overview.html</overview>
+                            <source>1.8</source>
                         </configuration>
                         <executions>
                             <execution>
@@ -228,7 +200,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/UraClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package de.stklcode.pubtrans.ura;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import de.stklcode.pubtrans.ura.model.Message;
 import de.stklcode.pubtrans.ura.model.Stop;
 import de.stklcode.pubtrans.ura.model.Trip;
 import de.stklcode.pubtrans.ura.reader.AsyncUraTripReader;
@@ -39,6 +40,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
  * @author Stefan Kalscheuer
  */
 public class UraClient implements Serializable {
+    private static final long serialVersionUID = -1183740075816686611L;
+
     private static final String DEFAULT_INSTANT_URL = "/interfaces/ura/instant_V1";
     private static final String DEFAULT_STREAM_URL = "/interfaces/ura/stream_V1";
 
@@ -58,14 +61,21 @@ public class UraClient implements Serializable {
     private static final String PAR_ESTTIME = "EstimatedTime";
     private static final String PAR_TOWARDS = "Towards";
     private static final String PAR_CIRCLE = "Circle";
+    private static final String PAR_MSG_UUID = "MessageUUID";
+    private static final String PAR_MSG_TYPE = "MessageType";
+    private static final String PAR_MSG_PRIORITY = "MessagePriority";
+    private static final String PAR_MSG_TEXT = "MessageText";
 
     private static final Integer RES_TYPE_STOP = 0;
     private static final Integer RES_TYPE_PREDICTION = 1;
+    private static final Integer RES_TYPE_FLEX_MESSAGE = 2;
     private static final Integer RES_TYPE_URA_VERSION = 4;
 
     private static final String[] REQUEST_STOP = {PAR_STOP_NAME, PAR_STOP_ID, PAR_STOP_INDICATOR, PAR_STOP_STATE, PAR_GEOLOCATION};
     private static final String[] REQUEST_TRIP = {PAR_STOP_NAME, PAR_STOP_ID, PAR_STOP_INDICATOR, PAR_STOP_STATE, PAR_GEOLOCATION,
             PAR_VISIT_NUMBER, PAR_LINE_ID, PAR_LINE_NAME, PAR_DIR_ID, PAR_DEST_NAME, PAR_DEST_TEXT, PAR_VEHICLE_ID, PAR_TRIP_ID, PAR_ESTTIME};
+    private static final String[] REQUEST_MESSAGE = {PAR_STOP_NAME, PAR_STOP_ID, PAR_STOP_INDICATOR, PAR_STOP_STATE, PAR_GEOLOCATION,
+            PAR_MSG_UUID, PAR_MSG_TYPE, PAR_MSG_PRIORITY, PAR_MSG_TEXT};
 
     private final String baseURL;
     private final String instantURL;
@@ -226,7 +236,7 @@ public class UraClient implements Serializable {
             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)) {
@@ -248,6 +258,8 @@ public class UraClient implements Serializable {
      *
      * @param query    The query.
      * @param consumer Consumer(s) for single trips.
+     * @return Trip reader.
+     * @throws IOException Error reading response.
      * @see #getTripsStream(Query, List)
      * @since 1.2.0
      */
@@ -260,6 +272,8 @@ public class UraClient implements Serializable {
      *
      * @param query     The query.
      * @param consumers Consumer(s) for single trips.
+     * @return Trip reader.
+     * @throws IOException Error retrieving stream response.
      * @since 1.2.0
      */
     public AsyncUraTripReader getTripsStream(final Query query, final List<Consumer<Trip>> consumers) throws IOException {
@@ -278,7 +292,7 @@ public class UraClient implements Serializable {
     /**
      * Get list of stops without filters.
      *
-     * @return Lhe list.
+     * @return The list of stops.
      */
     public List<Stop> getStops() {
         return getStops(new Query());
@@ -297,7 +311,7 @@ public class UraClient implements Serializable {
              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));
@@ -309,6 +323,61 @@ public class UraClient implements Serializable {
         return stops;
     }
 
+    /**
+     * Get list of messages.
+     *
+     * @return List of messages.
+     * @since 1.3
+     */
+    public List<Message> getMessages() {
+        return getMessages(new Query(), null);
+    }
+
+
+    /**
+     * Get list of messages.
+     * If forStops() has been called, those will be used as filter.
+     *
+     * @param query The query.
+     * @return List of trips.
+     * @since 1.3
+     */
+    public List<Message> getMessages(final Query query) {
+        return getMessages(query, null);
+    }
+
+    /**
+     * Get list of messages for given stopIDs with result limit.
+     *
+     * @param query The query.
+     * @param limit Maximum number of results.
+     * @return List of trips.
+     * @since 1.3
+     */
+    public List<Message> getMessages(final Query query, final Integer limit) {
+        List<Message> messages = new ArrayList<>();
+        try (InputStream is = requestInstant(REQUEST_MESSAGE, query);
+             BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
+            String version = null;
+            String line = br.readLine();
+            while (line != null && (limit == null || messages.size() < limit)) {
+                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)) {
+                        version = l.get(1).toString();
+                    } else if (l.get(0).equals(RES_TYPE_FLEX_MESSAGE)) {
+                        messages.add(new Message(l, version));
+                    }
+                }
+                line = br.readLine();
+            }
+        } catch (IOException e) {
+            throw new IllegalStateException("Failed to read from API", e);
+        }
+        return messages;
+    }
+
     /**
      * Issue request to instant endpoint and return input stream.
      *
@@ -367,7 +436,7 @@ public class UraClient implements Serializable {
      *
      * @param url The URL.
      * @return Input Stream of results.
-     * @throws IOException Error opening conneciton or reading data.
+     * @throws IOException Error opening connection or reading data.
      */
     private InputStream request(String url) throws IOException {
         return new URL(url).openStream();
@@ -501,6 +570,8 @@ public class UraClient implements Serializable {
          * Get trips for set filters.
          *
          * @param consumer Consumer for single trips.
+         * @return Trip reader.
+         * @throws IOException Errors retrieving stream response.
          * @see #getTripsStream(List)
          * @since 1.2.0
          */
@@ -512,10 +583,22 @@ public class UraClient implements Serializable {
          * Get trips for set filters.
          *
          * @param consumers Consumers for single trips.
+         * @return Trip reader.
+         * @throws IOException Errors retrieving stream response.
          * @since 1.2.0
          */
         public AsyncUraTripReader getTripsStream(List<Consumer<Trip>> consumers) throws IOException {
             return UraClient.this.getTripsStream(this, consumers);
         }
+
+        /**
+         * Get trips for set filters.
+         *
+         * @return List of matching messages.
+         * @since 1.3
+         */
+        public List<Message> getMessages() {
+            return UraClient.this.getMessages(this);
+        }
     }
 }

src/main/java/de/stklcode/pubtrans/ura/model/Message.java

@@ -0,0 +1,167 @@
+package de.stklcode.pubtrans.ura.model;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Entity for a message.
+ *
+ * @author Stefan Kalscheuer
+ * @since 1.3
+ */
+public class Message implements Model {
+    private static final long serialVersionUID = 5233610751062774273L;
+
+    private static final int MSG_UUID = 7;
+    private static final int MSG_TYPE = 8;
+    private static final int MSG_PRIORITY = 9;
+    private static final int MSG_TEXT = 10;
+    private static final int NUM_OF_FIELDS = 11;
+
+    private final Stop stop;
+    private final String uuid;
+    private final Integer type;
+    private final Integer priority;
+    private final String text;
+
+    /**
+     * Construct Message object from complete set of data.
+     *
+     * @param stopID        Stop ID.
+     * @param stopName      Stop name.
+     * @param stopIndicator Stop Indicator.
+     * @param stopState     Stop state.
+     * @param stopLatitude  Stop geolocation latitude.
+     * @param stopLongitude Stop geolocation latitude.
+     * @param msgUUID       Message UUID.
+     * @param msgType       Message type.
+     * @param msgPriority   Message priority.
+     * @param msgText       Message text.
+     */
+    public Message(final String stopID,
+                   final String stopName,
+                   final String stopIndicator,
+                   final Integer stopState,
+                   final Double stopLatitude,
+                   final Double stopLongitude,
+                   final String msgUUID,
+                   final Integer msgType,
+                   final Integer msgPriority,
+                   final String msgText) {
+        this(new Stop(stopID,
+                        stopName,
+                        stopIndicator,
+                        stopState,
+                        stopLatitude,
+                        stopLongitude),
+                msgUUID,
+                msgType,
+                msgPriority,
+                msgText);
+    }
+
+    /**
+     * Construct Message object from Stop model and set of additional data.
+     *
+     * @param stop        Stop model
+     * @param msgUUID     Message UUID.
+     * @param msgType     Message type.
+     * @param msgPriority Message priority.
+     * @param msgText     Message text.
+     */
+    public Message(final Stop stop,
+                   final String msgUUID,
+                   final Integer msgType,
+                   final Integer msgPriority,
+                   final String msgText) {
+        this.stop = stop;
+        this.uuid = msgUUID;
+        this.type = msgType;
+        this.priority = msgPriority;
+        this.text = msgText;
+    }
+
+    /**
+     * Construct Message object from raw list of attributes parsed from JSON.
+     *
+     * @param raw List of attributes from JSON line
+     * @throws IOException Thrown on invalid line format.
+     */
+    public Message(final List<?> raw) throws IOException {
+        this(raw, null);
+    }
+
+    /**
+     * Construct Message object from raw list of attributes parsed from JSON with explicitly specified version.
+     *
+     * @param raw     List of attributes from JSON line
+     * @param version API version
+     * @throws IOException Thrown on invalid line format.
+     */
+    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");
+        }
+
+        stop = new Stop(raw);
+
+        if (raw.get(MSG_UUID) instanceof String) {
+            uuid = (String) raw.get(MSG_UUID);
+        } else {
+            throw Model.typeErrorString(MSG_UUID, raw.get(MSG_UUID).getClass());
+        }
+
+        if (raw.get(MSG_TYPE) instanceof Integer) {
+            type = (Integer) raw.get(MSG_TYPE);
+        } else {
+            throw Model.typeError(MSG_TYPE, raw.get(MSG_TYPE).getClass(), "Integer");
+        }
+
+        if (raw.get(MSG_PRIORITY) instanceof Integer) {
+            priority = (Integer) raw.get(MSG_PRIORITY);
+        } else {
+            throw Model.typeError(MSG_PRIORITY, raw.get(MSG_PRIORITY).getClass(), "Integer");
+        }
+
+        if (raw.get(MSG_TEXT) instanceof String) {
+            text = (String) raw.get(MSG_TEXT);
+        } else {
+            throw Model.typeErrorString(MSG_TEXT, raw.get(MSG_TEXT).getClass());
+        }
+    }
+
+    /**
+     * @return The affected stop.
+     */
+    public Stop getStop() {
+        return stop;
+    }
+
+    /**
+     * @return Message's unique identifier.
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * @return Message type.
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * @return Message priority. Lower value equals higher priority.
+     */
+    public Integer getPriority() {
+        return priority;
+    }
+
+    /**
+     * @return Message text.
+     */
+    public String getText() {
+        return text;
+    }
+}

src/main/java/de/stklcode/pubtrans/ura/model/Model.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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 @@ interface Model extends Serializable {
      * @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()));
     }

src/main/java/de/stklcode/pubtrans/ura/model/Stop.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ import java.util.List;
  * @author Stefan Kalscheuer
  */
 public final class Stop implements Model {
+    private static final long serialVersionUID = 202040044477267787L;
+
     private static final int F_STOP_NAME = 1;
     private static final int F_STOP_ID = 2;
     private static final int F_INDICATOR = 3;
@@ -70,7 +72,7 @@ public final class Stop implements Model {
      * @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");
         }
@@ -143,7 +145,7 @@ public final class Stop implements Model {
     }
 
     /**
-     * @return The stop geoloaction latitude.
+     * @return The stop geolocation latitude.
      */
     public Double getLatitude() {
         return latitude;

src/main/java/de/stklcode/pubtrans/ura/model/Trip.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ import java.util.List;
  * @author Stefan Kalscheuer
  */
 public final class Trip implements Model {
+    private static final long serialVersionUID = 7477381188869237381L;
+
     private static final int VISIT_ID = 7;
     private static final int LINE_ID = 8;
     private static final int LINE_NAME = 9;
@@ -140,18 +142,18 @@ public final class Trip implements Model {
      * @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);
     }
 
     /**
-     * Construct Stop object from raw list of attributes parsed from JSON with explicitly specified version.
+     * Construct Trip object from raw list of attributes parsed from JSON with explicitly specified version.
      *
      * @param raw     List of attributes from JSON line
      * @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");
         }

src/main/java/de/stklcode/pubtrans/ura/model/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/stklcode/pubtrans/ura/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 import java.util.function.Consumer;
 
 /**
- * Asynchronous stream reader foR URA stream API.
+ * Asynchronous stream reader for URA stream API.
  * <p>
  * This reader provides a handler for asynchronous stream events.
  *
@@ -44,7 +44,7 @@ public class AsyncUraTripReader implements AutoCloseable {
     private final List<Consumer<Trip>> consumers;
     private final URL url;
     private CompletableFuture<Void> future;
-    private boolean cancelled;
+    private boolean canceled;
 
     /**
      * Initialize trip reader.
@@ -70,7 +70,7 @@ public class AsyncUraTripReader implements AutoCloseable {
     }
 
     public void open() {
-        // Throw exeption, if future is already present.
+        // Throw exception, if future is already present.
         if (future != null) {
             throw new IllegalStateException("Reader already opened");
         }
@@ -82,8 +82,8 @@ public class AsyncUraTripReader implements AutoCloseable {
                  BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
                 String version = null;
                 String line = br.readLine();
-                while (line != null && !this.cancelled) {
-                    List l = mapper.readValue(line, List.class);
+                while (line != null && !this.canceled) {
+                    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)) {
@@ -113,8 +113,8 @@ public class AsyncUraTripReader implements AutoCloseable {
 
     /**
      * Close the reader.
-     * This is done by signaliung cancel to the asyncronous task. If the task is not completed
-     * within 1 second however it is cancelled hard.
+     * This is done by signaling cancel to the asynchronous task. If the task is not completed
+     * within 1 second however it is canceled hard.
      */
     @Override
     public void close() {
@@ -124,7 +124,7 @@ public class AsyncUraTripReader implements AutoCloseable {
         }
 
         // Signal cancelling to gracefully stop future.
-        cancelled = true;
+        canceled = true;
         try {
             future.get(1, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
@@ -134,6 +134,8 @@ public class AsyncUraTripReader implements AutoCloseable {
         } catch (TimeoutException e) {
             // Task failed to finish within 1 second.
             future.cancel(true);
+        } finally {
+            future = null;
         }
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,23 @@
 
 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 de.stklcode.pubtrans.ura.model.Message;
 import de.stklcode.pubtrans.ura.model.Stop;
 import de.stklcode.pubtrans.ura.model.Trip;
-import net.bytebuddy.ByteBuddy;
-import net.bytebuddy.agent.ByteBuddyAgent;
-import net.bytebuddy.dynamic.loading.ClassReloadingStrategy;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 import java.util.Optional;
 
-import static net.bytebuddy.implementation.MethodDelegation.to;
-import static net.bytebuddy.matcher.ElementMatchers.named;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.instanceOf;
@@ -44,30 +45,30 @@ import static org.hamcrest.core.Is.is;
  *
  * @author Stefan Kalscheuer
  */
-public class UraClientTest {
-    // Mocked resource URL and exception message.
-    private static String mockResource = null;
-    private static String mockException = null;
+class UraClientTest {
+    private static WireMockServer httpMock;
 
     @BeforeAll
-    public static void initByteBuddy() {
-        // Install ByteBuddy Agent.
-        ByteBuddyAgent.install();
+    static void setUp() {
+        // Initialize HTTP mock.
+        httpMock = new WireMockServer(WireMockConfiguration.options().dynamicPort());
+        httpMock.start();
+        WireMock.configureFor("localhost", httpMock.port());
+    }
 
-        new ByteBuddy().redefine(UraClient.class)
-                .method(named("request"))
-                .intercept(to(UraClientTest.class))
-                .make()
-                .load(UraClient.class.getClassLoader(), ClassReloadingStrategy.fromInstalledAgent());
+    @AfterAll
+    static void tearDown() {
+        httpMock.stop();
+        httpMock = null;
     }
 
     @Test
-    public void getStopsTest() {
+    void getStopsTest() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V2_stops.txt");
+        mockHttpToFile(2, "instant_V2_stops.txt");
 
         // List stops and verify some values.
-        List<Stop> stops = new UraClient("mocked").getStops();
+        List<Stop> stops = new UraClient(httpMock.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"));
@@ -76,36 +77,26 @@ public class UraClientTest {
         assertThat(stops.get(4).getLongitude(), is(6.0708663));
 
         // Test Exception handling.
-        mockHttpToException("Provoked Exception 1");
+        mockHttpToError(500);
 
         try {
-            new UraClient("mocked").getStops();
+            new UraClient(httpMock.baseUrl()).getStops();
         } catch (RuntimeException e) {
             assertThat(e, is(instanceOf(IllegalStateException.class)));
             assertThat(e.getCause(), is(instanceOf(IOException.class)));
-            assertThat(e.getCause().getMessage(), is("Provoked Exception 1"));
+            assertThat(e.getCause().getMessage(), startsWith("Server returned HTTP response code: 500 for URL"));
         }
     }
 
-    public static InputStream request(String originalURL) throws IOException {
-        if (mockResource == null && mockException != null) {
-            IOException e = new IOException(mockException);
-            mockException = null;
-            throw e;
-        }
-
-        InputStream res = UraClientTest.class.getResourceAsStream(mockResource);
-        mockResource = null;
-        return res;
-    }
-
     @Test
-    public void getStopsForLineTest() {
+    void getStopsForLineTest() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V2_stops_line.txt");
+        mockHttpToFile(2, "instant_V2_stops_line.txt");
 
         // List stops and verify some values.
-        List<Stop> stops = new UraClient("mocked").forLines("33").getStops();
+        List<Stop> stops = new UraClient(httpMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
+                .forLines("33")
+                .getStops();
         assertThat(stops, hasSize(47));
         assertThat(stops.get(0).getId(), is("100000"));
         assertThat(stops.get(1).getName(), is("Kuckelkorn"));
@@ -116,12 +107,12 @@ public class UraClientTest {
     }
 
     @Test
-    public void getStopsForPositionTest() {
+    void getStopsForPositionTest() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V1_stops_circle.txt");
+        mockHttpToFile(1, "instant_V1_stops_circle.txt");
 
         // List stops and verify some values.
-        List<Stop> stops = new UraClient("mocked")
+        List<Stop> stops = new UraClient(httpMock.baseUrl())
                 .forPosition(51.51009, -0.1345734, 200)
                 .getStops();
         assertThat(stops, hasSize(13));
@@ -132,8 +123,8 @@ public class UraClientTest {
         assertThat(stops.get(4).getLongitude(), is(-0.134172));
         assertThat(stops.get(5).getIndicator(), is(nullValue()));
 
-        mockHttpToFile("instant_V1_stops_circle_name.txt");
-        stops = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_stops_circle_name.txt");
+        stops = new UraClient(httpMock.baseUrl())
                 .forStopsByName("Piccadilly Circus")
                 .forPosition(51.51009, -0.1345734, 200)
                 .getStops();
@@ -142,18 +133,18 @@ public class UraClientTest {
     }
 
     @Test
-    public void getTripsForDestinationNamesTest() {
+    void getTripsForDestinationNamesTest() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V1_trips_destination.txt");
+        mockHttpToFile(1, "instant_V1_trips_destination.txt");
 
         // List stops and verify some values.
-        List<Trip> trips = new UraClient("mocked").forDestinationNames("Piccadilly Circus").getTrips();
+        List<Trip> trips = new UraClient(httpMock.baseUrl()).forDestinationNames("Piccadilly Circus").getTrips();
         assertThat(trips, hasSize(9));
         assertThat(trips.stream().filter(t -> !t.getDestinationName().equals("Piccadilly Cir")).findAny(),
                 is(Optional.empty()));
 
-        mockHttpToFile("instant_V1_trips_stop_destination.txt");
-        trips = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_trips_stop_destination.txt");
+        trips = new UraClient(httpMock.baseUrl())
                 .forStops("156")
                 .forDestinationNames("Marble Arch")
                 .getTrips();
@@ -165,27 +156,27 @@ public class UraClientTest {
     }
 
     @Test
-    public void getTripsTowardsTest() {
+    void getTripsTowardsTest() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V1_trips_towards.txt");
+        mockHttpToFile(1, "instant_V1_trips_towards.txt");
 
         /* List stops and verify some values */
-        List<Trip> trips = new UraClient("mocked").towards("Marble Arch").getTrips();
+        List<Trip> trips = new UraClient(httpMock.baseUrl()).towards("Marble Arch").getTrips();
         assertThat(trips, hasSize(10));
 
-        mockHttpToFile("instant_V1_trips_stop_towards.txt");
-        trips = new UraClient("mocked").forStops("156").towards("Marble Arch").getTrips();
+        mockHttpToFile(1, "instant_V1_trips_stop_towards.txt");
+        trips = new UraClient(httpMock.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()));
     }
 
     @Test
-    public void getTripsTest() {
+    void getTripsTest() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V1_trips_all.txt");
+        mockHttpToFile(1, "instant_V1_trips_all.txt");
 
         // Get trips without filters and verify some values.
-        List<Trip> trips = new UraClient("mocked").getTrips();
+        List<Trip> trips = new UraClient(httpMock.baseUrl()).getTrips();
         assertThat(trips, hasSize(10));
         assertThat(trips.get(0).getId(), is("27000165015001"));
         assertThat(trips.get(1).getLineID(), is("55"));
@@ -199,10 +190,11 @@ public class UraClientTest {
         assertThat(trips.get(9).getStop().getId(), is("100002"));
 
         // Repeat test for API V2.
-        mockHttpToFile("instant_V2_trips_all.txt");
+        mockHttpToFile(2, "instant_V2_trips_all.txt");
 
         // Get trips without filters and verify some values.
-        trips = new UraClient("mocked").getTrips();
+        trips = new UraClient(httpMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream")
+                .getTrips();
         assertThat(trips, hasSize(10));
         assertThat(trips.get(0).getId(), is("27000165015001"));
         assertThat(trips.get(1).getLineID(), is("55"));
@@ -216,28 +208,28 @@ public class UraClientTest {
         assertThat(trips.get(9).getStop().getId(), is("100002"));
 
         // Get limited number of trips.
-        mockHttpToFile("instant_V1_trips_all.txt");
-        trips = new UraClient("mocked").getTrips(5);
+        mockHttpToFile(1, "instant_V1_trips_all.txt");
+        trips = new UraClient(httpMock.baseUrl()).getTrips(5);
         assertThat(trips, hasSize(5));
 
         // Test mockException handling.
-        mockHttpToException("Provoked mockException 2");
+        mockHttpToError(502);
         try {
-            new UraClient("mocked").getTrips();
+            new UraClient(httpMock.baseUrl()).getTrips();
         } catch (RuntimeException e) {
             assertThat(e, is(instanceOf(IllegalStateException.class)));
             assertThat(e.getCause(), is(instanceOf(IOException.class)));
-            assertThat(e.getCause().getMessage(), is("Provoked mockException 2"));
+            assertThat(e.getCause().getMessage(), startsWith("Server returned HTTP response code: 502 for URL"));
         }
     }
 
     @Test
-    public void getTripsForStopTest() {
+    void getTripsForStopTest() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V1_trips_stop.txt");
+        mockHttpToFile(1, "instant_V1_trips_stop.txt");
 
         // Get trips for stop ID 100000 (Aachen Bushof) and verify some values.
-        List<Trip> trips = new UraClient("mocked")
+        List<Trip> trips = new UraClient(httpMock.baseUrl())
                 .forStops("100000")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -248,8 +240,8 @@ public class UraClientTest {
         assertThat(trips.get(3).getStop().getIndicator(), is("H.15"));
 
         // Get trips for stop name "Uniklinik" and verify some values.
-        mockHttpToFile("instant_V1_trips_stop_name.txt");
-        trips = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_trips_stop_name.txt");
+        trips = new UraClient(httpMock.baseUrl())
                 .forStopsByName("Uniklinik")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -262,12 +254,12 @@ public class UraClientTest {
     }
 
     @Test
-    public void getTripsForLine() {
+    void getTripsForLine() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V1_trips_line.txt");
+        mockHttpToFile(1, "instant_V1_trips_line.txt");
 
         // Get trips for line ID 3 and verify some values.
-        List<Trip> trips = new UraClient("mocked")
+        List<Trip> trips = new UraClient(httpMock.baseUrl())
                 .forLines("3")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -278,8 +270,8 @@ public class UraClientTest {
         assertThat(trips.get(3).getStop().getIndicator(), is("H.4 (Pontwall)"));
 
         // Get trips for line name "3.A" and verify some values.
-        mockHttpToFile("instant_V1_trips_line_name.txt");
-        trips = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_trips_line_name.txt");
+        trips = new UraClient(httpMock.baseUrl())
                 .forLinesByName("3.A")
                 .getTrips();
         assertThat(trips, hasSize(10));
@@ -290,8 +282,8 @@ public class UraClientTest {
         assertThat(trips.get(3).getStop().getName(), is("Aachen Gartenstraße"));
 
         // Get trips for line 3 with direction 1 and verify some values.
-        mockHttpToFile("instant_V1_trips_line_direction.txt");
-        trips = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_trips_line_direction.txt");
+        trips = new UraClient(httpMock.baseUrl())
                 .forLines("412")
                 .forDirection(2)
                 .getTrips();
@@ -300,8 +292,8 @@ public class UraClientTest {
         assertThat(trips.stream().filter(t -> !t.getDirectionID().equals(2)).findAny(), is(Optional.empty()));
 
         // Test lineID and direction in different order.
-        mockHttpToFile("instant_V1_trips_line_direction.txt");
-        trips = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_trips_line_direction.txt");
+        trips = new UraClient(httpMock.baseUrl())
                 .forDirection(2)
                 .forLines("412")
                 .getTrips();
@@ -311,12 +303,12 @@ public class UraClientTest {
     }
 
     @Test
-    public void getTripsForStopAndLine() {
+    void getTripsForStopAndLine() {
         // Mock the HTTP call.
-        mockHttpToFile("instant_V1_trips_stop_line.txt");
+        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("mocked")
+        List<Trip> trips = new UraClient(httpMock.baseUrl())
                 .forLines("25", "35")
                 .forStops("100000")
                 .getTrips();
@@ -331,11 +323,56 @@ public class UraClientTest {
     }
 
 
-    private static void mockHttpToFile(String newResourceFile) {
-        mockResource = newResourceFile;
+    @Test
+    void getMessages() {
+        // Mock the HTTP call.
+        mockHttpToFile(1, "instant_V1_messages.txt");
+
+        // Get messages without filter and verify some values.
+        List<Message> messages = new UraClient(httpMock.baseUrl())
+                .getMessages();
+        assertThat(messages, hasSize(2));
+        assertThat(messages.get(0).getStop().getId(), is("100707"));
+        assertThat(messages.get(0).getUuid(), is("016e1231d4e30014_100707"));
+        assertThat(messages.get(1).getStop().getName(), is("Herzogenr. Rathaus"));
+        assertThat(messages.get(1).getUuid(), is("016e2cc3a3750006_210511"));
+        assertThat(messages.get(0).getType(), is(0));
+        assertThat(messages.get(1).getPriority(), is(0));
+        assertThat(messages.get(0).getText(), is("Sehr geehrte Fahrgäste, wegen Strassenbauarbeiten kann diese Haltestelle nicht von den Bussen der Linien 17, 44 und N2 angefahren werden."));
+        assertThat(messages.get(1).getText(), is("Sehr geehrte Fahrgäste, diese Haltestelle wird vorübergehend von den Linien 47, 147 und N3 nicht angefahren."));
     }
 
-    private static void mockHttpToException(String newException) {
-        mockException = newException;
+    @Test
+    void getMessagesForStop() {
+        // Mock the HTTP call.
+        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")
+                .forStops("100707")
+                .getMessages();
+        assertThat(messages, hasSize(1));
+        assertThat(messages.stream().filter(t -> !t.getStop().getId().equals("100707")).findAny(), is(Optional.empty()));
+        assertThat(messages.get(0).getUuid(), is("016e1231d4e30014_100707"));
+        assertThat(messages.get(0).getType(), is(0));
+        assertThat(messages.get(0).getPriority(), is(3));
+        assertThat(messages.get(0).getText(), is("Sehr geehrte Fahrgäste, wegen Strassenbauarbeiten kann diese Haltestelle nicht von den Bussen der Linien 17, 44 und N2 angefahren werden."));
+    }
+
+
+    private static void mockHttpToFile(int version, String resourceFile) {
+        WireMock.stubFor(
+                get(urlPathEqualTo("/interfaces/ura/instant_V" + version)).willReturn(
+                        aResponse().withBodyFile(resourceFile)
+                )
+        );
+    }
+
+    private static void mockHttpToError(int code) {
+        WireMock.stubFor(
+                get(anyUrl()).willReturn(
+                        aResponse().withStatus(code)
+                )
+        );
     }
 }

src/test/java/de/stklcode/pubtrans/ura/model/MessageTest.java

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2016-2022 Stefan Kalscheuer
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.stklcode.pubtrans.ura.model;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Unit test for the {@link Message} meta model.
+ *
+ * @author Stefan Kalscheuer
+ */
+public class MessageTest {
+    @Test
+    public void basicConstructorTest() {
+        Message message = new Message("sid",
+                "name",
+                "indicator",
+                1,
+                2.345,
+                6.789,
+                "msg_uuid",
+                1,
+                3,
+                "message text");
+        assertThat(message.getStop().getId(), is("sid"));
+        assertThat(message.getStop().getName(), is("name"));
+        assertThat(message.getStop().getIndicator(), is("indicator"));
+        assertThat(message.getStop().getState(), is(1));
+        assertThat(message.getStop().getLatitude(), is(2.345));
+        assertThat(message.getStop().getLongitude(), is(6.789));
+        assertThat(message.getUuid(), is("msg_uuid"));
+        assertThat(message.getType(), is(1));
+        assertThat(message.getPriority(), is(3));
+        assertThat(message.getText(), is("message text"));
+    }
+
+    @Test
+    public void listConstructorTest() {
+        /* Create valid raw data list */
+        List<Object> raw = new ArrayList<>();
+        raw.add(1);
+        raw.add("stopName");
+        raw.add("stopId");
+        raw.add("stopIndicator");
+        raw.add(9);
+        raw.add(8.765);
+        raw.add(43.21);
+        raw.add("msg_uuid");
+        raw.add(1);
+        raw.add(3);
+        raw.add("message text");
+
+        try {
+            Message message = new Message(raw);
+            assertThat(message.getStop().getId(), is("stopId"));
+            assertThat(message.getStop().getName(), is("stopName"));
+            assertThat(message.getStop().getIndicator(), is("stopIndicator"));
+            assertThat(message.getStop().getState(), is(9));
+            assertThat(message.getStop().getLatitude(), is(8.765));
+            assertThat(message.getStop().getLongitude(), is(43.21));
+            assertThat(message.getUuid(), is("msg_uuid"));
+            assertThat(message.getType(), is(1));
+            assertThat(message.getPriority(), is(3));
+            assertThat(message.getText(), is("message text"));
+        } catch (IOException e) {
+            fail("Creation of Message from valid list failed: " + e.getMessage());
+        }
+
+        /* Excess elements should be ignored */
+        raw.add("foo");
+        try {
+            Message message = new Message(raw);
+            assertThat(message, is(notNullValue()));
+            raw.remove(11);
+        } catch (IOException e) {
+            fail("Creation of Message from valid list failed: " + e.getMessage());
+        }
+
+        /* Test exceptions on invalid data */
+        List<Object> invalid = new ArrayList<>(raw);
+        invalid.remove(7);
+        invalid.add(7, 123L);
+        try {
+            new Message(invalid);
+            fail("Creation of Message with invalid UUID field successful");
+        } catch (Exception e) {
+            assertThat(e, is(instanceOf(IOException.class)));
+        }
+
+        invalid = new ArrayList<>(raw);
+        invalid.remove(8);
+        invalid.add(8, "abc");
+        try {
+            new Message(invalid);
+            fail("Creation of Message with invalid type field successful");
+        } catch (Exception e) {
+            assertThat(e, is(instanceOf(IOException.class)));
+        }
+
+        invalid = new ArrayList<>(raw);
+        invalid.remove(9);
+        invalid.add(9, "xyz");
+        try {
+            new Message(invalid);
+            fail("Creation of Message with invalid priority field successful");
+        } catch (Exception e) {
+            assertThat(e, is(instanceOf(IOException.class)));
+        }
+
+        invalid = new ArrayList<>(raw);
+        invalid.remove(10);
+        invalid.add(10, 1.23);
+        try {
+            new Message(invalid);
+            fail("Creation of Message with invalid text field successful");
+        } catch (Exception e) {
+            assertThat(e, is(instanceOf(IOException.class)));
+        }
+
+        invalid = new ArrayList<>(raw);
+        invalid.remove(10);
+        try {
+            new Message(invalid);
+            fail("Creation of Message with too short list successful");
+        } catch (Exception e) {
+            assertThat(e, is(instanceOf(IOException.class)));
+        }
+    }
+}

src/test/java/de/stklcode/pubtrans/ura/model/StopTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
- * Unit test for the Stop metamodel.
+ * Unit test for the {@link Stop} meta model.
  *
  * @author Stefan Kalscheuer
  */
@@ -85,7 +85,7 @@ public class StopTest {
         invalid.add(1, 5);
         try {
             new Stop(invalid);
-            fail("Creation of Stop with invalid name field successfull");
+            fail("Creation of Stop with invalid name field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -95,7 +95,7 @@ public class StopTest {
         invalid.add(2, 0);
         try {
             new Stop(invalid);
-            fail("Creation of Stop with invalid id field successfull");
+            fail("Creation of Stop with invalid id field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -105,7 +105,7 @@ public class StopTest {
         invalid.add(3, -1.23);
         try {
             new Stop(invalid);
-            fail("Creation of Stop with invalid indicator field successfull");
+            fail("Creation of Stop with invalid indicator field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -115,7 +115,7 @@ public class StopTest {
         invalid.add(4, "foo");
         try {
             new Stop(invalid);
-            fail("Creation of Stop with invalid state field successfull");
+            fail("Creation of Stop with invalid state field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -125,7 +125,7 @@ public class StopTest {
         invalid.add(5, "123");
         try {
             new Stop(invalid);
-            fail("Creation of Stop with invalid latitude field successfull");
+            fail("Creation of Stop with invalid latitude field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -135,7 +135,7 @@ public class StopTest {
         invalid.add(6, 456);
         try {
             new Stop(invalid);
-            fail("Creation of Stop with invalid longitude field successfull");
+            fail("Creation of Stop with invalid longitude field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -144,7 +144,7 @@ public class StopTest {
         invalid.remove(6);
         try {
             new Stop(invalid);
-            fail("Creation of Stop with too short list successfull");
+            fail("Creation of Stop with too short list successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }

src/test/java/de/stklcode/pubtrans/ura/model/TripTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
- * Unit test for the Trip metamodel.
+ * Unit test for the {@link Trip} meta model.
  *
  * @author Stefan Kalscheuer
  */
@@ -156,7 +156,7 @@ public class TripTest {
         invalid.add(7, "123");
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid visitID field successfull");
+            fail("Creation of Trip with invalid visitID field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -166,7 +166,7 @@ public class TripTest {
         invalid.add(8, 25);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid lineID field successfull");
+            fail("Creation of Trip with invalid lineID field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -176,7 +176,7 @@ public class TripTest {
         invalid.add(9, 234L);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid line name field successfull");
+            fail("Creation of Trip with invalid line name field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -186,7 +186,7 @@ public class TripTest {
         invalid.add(10, "7");   // Strings are generally OK, but 7 is out of range (#2).
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid directionID field successfull");
+            fail("Creation of Trip with invalid directionID field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -196,7 +196,7 @@ public class TripTest {
         invalid.add(11, 987);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid destinationName field successfull");
+            fail("Creation of Trip with invalid destinationName field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -206,7 +206,7 @@ public class TripTest {
         invalid.add(12, 456.78);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid destinationText field successfull");
+            fail("Creation of Trip with invalid destinationText field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -216,7 +216,7 @@ public class TripTest {
         invalid.add(13, 'x');
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid vehicleID field successfull");
+            fail("Creation of Trip with invalid vehicleID field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -226,7 +226,7 @@ public class TripTest {
         invalid.add(14, 1.2);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid id field successfull");
+            fail("Creation of Trip with invalid id field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -236,7 +236,7 @@ public class TripTest {
         invalid.add(15, 456);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with invalid estimatedTime field successfull");
+            fail("Creation of Trip with invalid estimatedTime field successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -245,7 +245,7 @@ public class TripTest {
         invalid.remove(15);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with too short list successfull");
+            fail("Creation of Trip with too short list successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }
@@ -254,7 +254,7 @@ public class TripTest {
         invalid.set(10, 3);
         try {
             new Trip(invalid);
-            fail("Creation of Trip with direction ID 3 successfull");
+            fail("Creation of Trip with direction ID 3 successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }

src/test/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReaderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2022 Stefan Kalscheuer
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,50 +16,61 @@
 
 package de.stklcode.pubtrans.ura.reader;
 
-import de.stklcode.pubtrans.ura.UraClientTest;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.common.FileSource;
+import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.http.ChunkedDribbleDelay;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.Response;
 import de.stklcode.pubtrans.ura.model.Trip;
-import net.bytebuddy.ByteBuddy;
-import net.bytebuddy.agent.ByteBuddyAgent;
-import net.bytebuddy.dynamic.loading.ClassReloadingStrategy;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.io.*;
+import java.io.IOException;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Collections;
+import java.util.Deque;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static net.bytebuddy.implementation.MethodDelegation.to;
-import static net.bytebuddy.matcher.ElementMatchers.named;
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assume.assumeThat;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * Unit test for the asynchronous URA Trip reader.
+ * <p>
+ * Because this test runs asynchronously, it might not work as expected in debugging environments.
+ * Stream input files are normalized to equal line length and split into chunks, one line each 500ms.
  *
  * @author Stefan Kalscheuer
  */
 public class AsyncUraTripReaderTest {
-    private static final Queue<String> MOCK_LINES = new ArrayDeque<>();
-    private static PipedOutputStream mockOutputStream = new PipedOutputStream();
+    private static WireMockServer httpMock;
 
     @BeforeAll
-    public static void initByteBuddy() {
-        // Install ByteBuddy Agent.
-        ByteBuddyAgent.install();
+    public static void setUp() {
+        // Initialize HTTP mock.
+        httpMock = new WireMockServer(WireMockConfiguration.options().dynamicPort()
+                .asynchronousResponseEnabled(true)
+                .extensions(StreamTransformer.class)
+        );
+        httpMock.start();
+        WireMock.configureFor("localhost", httpMock.port());
+    }
 
-        // Mock the URL.openStream() call.
-        new ByteBuddy().redefine(AsyncUraTripReader.class)
-                .method(named("getInputStream"))
-                .intercept(to(AsyncUraTripReaderTest.class))
-                .make()
-                .load(AsyncUraTripReader.class.getClassLoader(), ClassReloadingStrategy.fromInstalledAgent());
+    @AfterAll
+    public static void tearDown() {
+        httpMock.stop();
+        httpMock = null;
     }
 
     /**
@@ -79,10 +90,10 @@ public class AsyncUraTripReaderTest {
         Deque<Trip> trips = new ConcurrentLinkedDeque<>();
 
         // Start with V1 data and read file to mock list.
-        readLinesToMock(UraClientTest.class.getResource("stream_V1_stops_all.txt"));
+        readLinesToMock(1, "/__files/stream_V1_stops_all.txt", 8);
 
         AsyncUraTripReader tr = new AsyncUraTripReader(
-                UraClientTest.class.getResource("stream_V1_stops_all.txt"),
+                new URL(httpMock.baseUrl() + "/interfaces/ura/stream_V1"),
                 Collections.singletonList(
                         trip -> {
                             trips.add(trip);
@@ -91,83 +102,57 @@ public class AsyncUraTripReaderTest {
                 )
         );
 
-        // Open the rewader.
+        // Open the reader.
         tr.open();
         // Read for 1 second.
         TimeUnit.SECONDS.sleep(1);
-        assumeThat("Trips should empty after 1s without reading", trips, is(empty()));
+        assumeTrue(trips.isEmpty(), "Trips should empty after 1s without reading");
 
-        // Now write a single line to the stream pipe.
-        assumeTrue("First line (version info) should be written", writeNextLine());
-        assumeTrue("Second line (first record) should be written", writeNextLine());
+        // Wait another 1s for the callback to be triggered.
+        TimeUnit.SECONDS.sleep(1);
 
-        // Wait up to 1s for the callback to be triggered.
-        int i = 10;
-        while (counter.get() < 1 && i-- > 0) {
-            TimeUnit.MILLISECONDS.sleep(100);
-        }
-
-        assertThat("Unexpected number of trips after first entry", trips.size(), is(1));
+        assertThat("Unexpected number of trips after first entry", trips.size(), is(2));
 
         // Flush all remaining lines.
-        while (writeNextLine()) {
-            TimeUnit.MILLISECONDS.sleep(10);
-        }
-
-        i = 10;
-        counter.set(0);
-        while (counter.get() < 1 && i-- > 0) {
-            TimeUnit.MILLISECONDS.sleep(100);
-        }
-
-        tr.close();
+        TimeUnit.SECONDS.sleep(3);
 
         assertThat("Unexpected number of trips after all lines have been flushed", trips.size(), is(7));
 
         // Clear trip list and repeat with V2 data.
         trips.clear();
-        readLinesToMock(UraClientTest.class.getResource("stream_V2_stops_all.txt"));
+        readLinesToMock(2, "/__files/stream_V2_stops_all.txt", 8);
+
         tr = new AsyncUraTripReader(
-                UraClientTest.class.getResource("stream_V2_stops_all.txt"),
-                Collections.singletonList(trips::add)
+                new URL(httpMock.baseUrl() + "/interfaces/ura/stream_V2"),
+                trips::add
         );
 
         // Open the reader.
         tr.open();
         // Read for 1 second.
         TimeUnit.SECONDS.sleep(1);
-        assumeThat("Trips should empty after 1s without reading", trips, is(empty()));
+        assumeTrue(trips.isEmpty(), "Trips should empty after 1s without reading");
 
-        assumeTrue("First line of v2 (version info) should be written", writeNextLine());
-        assumeTrue("Second line of v2 (first record) should be written", writeNextLine());
-
-        i = 10;
-        counter.set(0);
-        while (counter.get() < 1 && i-- > 0) {
-            TimeUnit.MILLISECONDS.sleep(100);
-        }
-        assertThat("Unexpected number of v2 trips after first entry", trips.size(), is(1));
+        TimeUnit.SECONDS.sleep(1);
+        assertThat("Unexpected number of v2 trips after first entry", trips.size(), is(2));
 
         // Add a second consumer that pushes to another list.
         Deque<Trip> trips2 = new ConcurrentLinkedDeque<>();
         tr.addConsumer(trips2::add);
 
         // Flush all remaining lines.
-        while (writeNextLine()) {
-            TimeUnit.MILLISECONDS.sleep(10);
-        }
-
-        i = 10;
-        counter.set(0);
-        while (counter.get() < 1 && i-- > 0) {
-            TimeUnit.MILLISECONDS.sleep(100);
-        }
+        TimeUnit.SECONDS.sleep(3);
 
         tr.close();
 
         assertThat("Unexpected number of v2 trips after all lines have been flushed", trips.size(), is(7));
-        assertThat("Unexpected number of v2 trips in list 2 after all lines have been flushed", trips2.size(), is(6));
+        assertThat("Unexpected number of v2 trips in list 2 after all lines have been flushed", trips2.size(), is(5));
         assertThat("Same object should have been pushed to both lists", trips.containsAll(trips2));
+
+        // Opening the reader twice should raise an exception.
+        assertDoesNotThrow(tr::open, "Opening the reader after closing should not fail");
+        assertThrows(IllegalStateException.class, tr::open, "Opening the reader twice should raise an exception");
+        tr.close();
     }
 
     /**
@@ -177,7 +162,7 @@ public class AsyncUraTripReaderTest {
      * @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);
 
@@ -185,10 +170,10 @@ public class AsyncUraTripReaderTest {
         Deque<Trip> trips = new ConcurrentLinkedDeque<>();
 
         // Start with V1 data and read file to mock list.
-        readLinesToMock(UraClientTest.class.getResource("stream_V1_stops_all.txt"));
+        readLinesToMock(1, "/__files/stream_V1_stops_all.txt", 8);
 
         AsyncUraTripReader tr = new AsyncUraTripReader(
-                UraClientTest.class.getResource("stream_V1_stops_all.txt"),
+                new URL(httpMock.baseUrl() + "/interfaces/ura/stream_V1"),
                 Collections.singletonList(
                         trip -> {
                             trips.add(trip);
@@ -202,31 +187,18 @@ public class AsyncUraTripReaderTest {
 
         // Read for 100ms.
         TimeUnit.MILLISECONDS.sleep(100);
-        assumeThat("Trips should empty after 100ms without reading", trips, is(empty()));
+        assumeTrue(trips.isEmpty(), "Trips should empty after 100ms without reading");
 
-        // Now write a single line to the stream pipe.
-        assumeTrue("First line (version info) should be written", writeNextLine());
-        assumeTrue("Second line (first record) should be written", writeNextLine());
+        // Wait for 1s for the callback to be triggered.
+        TimeUnit.SECONDS.sleep(1);
 
-        // Wait up to 1s for the callback to be triggered.
-        int i = 10;
-        while (counter.get() < 1 && i-- > 0) {
-            TimeUnit.MILLISECONDS.sleep(100);
-        }
-
-        assumeThat("Unexpected number of trips after first entry", trips.size(), is(1));
+        assumeTrue(1 == trips.size(), "Unexpected number of trips after first entry");
 
         // Close the stream.
-        mockOutputStream.close();
-
-        i = 10;
-        counter.set(0);
-        while (counter.get() < 1 && i-- > 0) {
-            TimeUnit.MILLISECONDS.sleep(100);
-        }
-
         tr.close();
 
+        // Wait for another second.
+        TimeUnit.MILLISECONDS.sleep(100);
         assertThat("Unexpected number of trips after all lines have been flushed", trips.size(), is(1));
 
     }
@@ -234,47 +206,34 @@ public class AsyncUraTripReaderTest {
     /**
      * Read an input file to the line buffer.
      *
-     * @param url Input URL.
-     * @throws IOException Error reading the data.
+     * @param version      API version.
+     * @param resourceFile Resource file name.
+     * @param chunks       Number of chunks.
      */
-    private static void readLinesToMock(URL url) throws IOException {
-        try (InputStream is = url.openStream();
-             BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
-            String line = br.readLine();
-            while (line != null) {
-                MOCK_LINES.add(line);
-                line = br.readLine();
-            }
-        }
+    private void readLinesToMock(int version, String resourceFile, int chunks) {
+        WireMock.stubFor(get(urlPathEqualTo("/interfaces/ura/stream_V" + version))
+                .willReturn(aResponse()
+                        .withTransformer("stream-transformer", "source", resourceFile)
+                        .withTransformer("stream-transformer", "chunks", chunks)
+                )
+        );
     }
 
-    /**
-     * Write next line from the buffer to the mocked stream pipe.
-     *
-     * @return {@code true} if a line has been written.
-     * @throws IOException Errir writing the data.
-     */
-    private static boolean writeNextLine() throws IOException {
-        String line = MOCK_LINES.poll();
-        if (line != null) {
-            line += "\n";
-            mockOutputStream.write(line.getBytes(StandardCharsets.UTF_8));
-            mockOutputStream.flush();
-            return true;
-        } else {
-            return false;
+    public static class StreamTransformer extends ResponseTransformer {
+        @Override
+        public Response transform(Request request, Response response, FileSource files, Parameters parameters) {
+            int chunks = parameters.getInt("chunks", 1);
+            return Response.Builder.like(response)
+                    // Read source file to response.
+                    .body(() -> AsyncUraTripReaderTest.class.getResourceAsStream(parameters.getString("source")))
+                    // Split response in given number of chunks with 500ms delay.
+                    .chunkedDribbleDelay(new ChunkedDribbleDelay(chunks, chunks * 500))
+                    .build();
         }
-    }
 
-    /**
-     * Function to mock the static {@code AsyncUraTripReader#getInputStream(URL)} method.
-     *
-     * @param url URL to read from.
-     * @return Input Stream.
-     * @throws IOException On errors.
-     */
-    public static InputStream getInputStream(URL url) throws IOException {
-        mockOutputStream = new PipedOutputStream();
-        return new PipedInputStream(mockOutputStream);
+        @Override
+        public String getName() {
+            return "stream-transformer";
+        }
     }
 }

src/test/resources/__files/instant_V1_messages.txt

@@ -0,0 +1,3 @@
+[4,"1.0",1572882473479]
+[2,"Berensberger Str.","100707","",0,50.8087069,6.0607177,"016e1231d4e30014_100707",0,3,"Sehr geehrte Fahrgäste, wegen Strassenbauarbeiten kann diese Haltestelle nicht von den Bussen der Linien 17, 44 und N2 angefahren werden."]
+[2,"Herzogenr. Rathaus","210511","",0,50.8718175,6.1025675,"016e2cc3a3750006_210511",0,0,"Sehr geehrte Fahrgäste, diese Haltestelle wird vorübergehend von den Linien 47, 147 und N3 nicht angefahren."]

src/test/resources/__files/instant_V2_messages_stop.txt

@@ -0,0 +1,2 @@
+[4,"2.0",1572882473479]
+[2,"Berensberger Str.","100707","",0,50.8087069,6.0607177,"016e1231d4e30014_100707",0,3,"Sehr geehrte Fahrgäste, wegen Strassenbauarbeiten kann diese Haltestelle nicht von den Bussen der Linien 17, 44 und N2 angefahren werden."]