prepare release 2.0.4

docs: correct forStops() calls in README
allow getMessages with limit directly from Query instance
2022-11-21 14:54:29 +01:00 · 2022-11-21 14:39:26 +01:00 · 2022-11-21 14:38:37 +01:00 · 2022-11-21 14:38:36 +01:00 · 2022-11-21 14:38:13 +01:00 · 2022-11-21 14:05:09 +01:00
49 changed files with 2606 additions and 367 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,31 @@
+kind: pipeline
+type: docker
+name: java11
+
+steps:
+  - name: test
+    image: maven:3-eclipse-temurin-11
+    commands:
+      - mvn -B clean test
+
+---
+kind: pipeline
+type: docker
+name: java17
+
+steps:
+  - name: test
+    image: maven:3-eclipse-temurin-17
+    commands:
+      - mvn -B clean test
+
+---
+kind: pipeline
+type: docker
+name: java19
+
+steps:
+  - name: test
+    image: maven:3-eclipse-temurin-19
+    commands:
+      - mvn -B clean test
--- a/.github/workflows/ci.yml
+++ b/.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, 19 ]
+        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
+        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 }}
--- a/.travis.yml
+++ b/.travis.yml
@ -1,15 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-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:
-  - mvn -P jacoco clean package sonar:sonar
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,15 +1,118 @@
-## 1.1.2 [2018-03-24]
-* [improvement] Added automatic module name for JPMS compatibility
+# Changelog
+All notable changes to this project will be documented in this file.

-## 1.1.1 [2018-02-20]
-* [improvement] On connection or parsing errors, the `IOException` is no longer ignored, but encapsulated in `RuntimeException` (no StackTraces printed)
-* [internal] Code cleanup and minor improvements
-* [dependeny] Minor dependency updates
+## 2.0.4 - 2022-11-21
+### Security
+* Updated Jackson dependency to 2.14.0

-## 1.1.0 [2017-01-07]
-* [feature] Filter stops by coordinates and radius
-* [feature] Filter trips by destination and and towards fields
-* [test] Test coverage 100% (line); tested against ASEAG and TFL APIs
+### Fixed
+* Querying trips and messages with limit directly from `Query` instance (#18)

-## 1.0.0 [2017-01-02]
-* Initial release
+### Misc
+* Tested with JDK 19
+
+
+## 2.0.3 - 2022-08-30
+### Security
+* Updated dependencies
+
+
+## 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
+
+### Changes
+* Using native Java 11 HTTP client
+* Client configuration with separate `UraClientConfiguration` class and builder
+* Client throws custom checked exception `UraClientException` instead of runtime exceptions on errors (#10)
+
+### Features
+* Configuration builder for client initialization (#9)
+* Configurable connect and read timeouts (#14)
+
+### Fixed
+* Allow reopening an `AsyncUraTripReader` without raising an exception (#12)
+
+----
+
+## 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
+
+### 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 parameters (#4)
+
+
+## 1.1.3 - 2018-11-13
+### Security
+* Updates Jackson dependency 2.9.4 to 2.9.7 (CVE-2018-7489)
+
+### Improvements
+* Client and model classes implement `Serializable`
+* Dependency updates
+
+
+## 1.1.2 - 2018-03-24
+### Improvements
+* Added automatic module name for JPMS compatibility
+
+
+## 1.1.1 - 2018-02-20
+### Improvements
+* On connection or parsing errors, the `IOException` is no longer ignored, but encapsulated in `RuntimeException` (no StackTraces printed)
+* Code cleanup and minor improvements
+* Minor dependency updates
+
+
+## 1.1.0 - 2017-01-07
+### Features
+* Filter stops by coordinates and radius
+* Filter trips by destination and and towards fields
+
+### Misc
+* Test coverage 100% (line); tested against ASEAG and TFL APIs
+
+
+## 1.0.0 - 2017-01-02
+* Initial release
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,119 @@
+# How to contribute
+
+As for all great Open Source projects, contributions in form of bug reports and code are welcome and important to keep the project alive.
+
+In general, this project follows the [GitHub Flow](https://guides.github.com/introduction/flow/). 
+Fork the project, commit your changes to your branch, open a pull request and it will probably be merged.
+However, to ensure maintainability and quality of the code, there are some guidelines you might be more or less familiar with. 
+For that purpose, this document describes the important points.
+
+
+## Opening an Issue
+
+If you experience any issues with the plugin or the code, don't hesitate to file an issue.
+
+### Bug Reports
+
+Think you found a bug?
+Please clearly state what happens and describe your environment to help tracking down the issue.
+ 
+* Which version of the project are you running?
+* Which version of Java?
+* Which API do you try to query?
+
+### Feature Requests
+
+Missing a feature or like to have certain functionality enhanced?
+No problem, please open an issue and describe what and why you think this change is required.
+
+
+## Pull Requests
+
+If you want to contribute your code to solve an issue or implement a desired feature yourself, you might open a pull request.
+If the changes introduce new functionality or affect major parts of existing code, please consider opening an issue for discussion first.
+
+For adding new functionality a new test case the corresponding JUnit test would be nice (no hard criterion though).
+
+### Branches
+
+The `master` branch represents the current state of development.
+Please ensure your initial code is up to date with it at the time you start development.
+The `master` should also be target for most pull requests.
+
+In addition, this project features a `develop` branch, which holds bleeding edge developments, not necessarily considered stable or even compatible.
+Do not expect this code to run smoothly, but you might have a look into the history to see if some work on an issue has already been started there.
+
+For fixes and features, there might be additional branches, likely prefixed by `feature/` `fix/` followed by an issue number (if applicable) and/or a title.
+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.
+
+#### What if my code fails the tests?
+
+Don't worry, you can submit your PR anyway. 
+The reviewing process might help you to solve remaining issues.
+
+### Commit messages
+
+Please use speaking titles and messages for your commits, to ensure a transparent history.
+If your patch fixes an issue, reference the ID in the first line.
+If you feel like you have to _briefly_ explain your changes, do it (for long explanations and discussion, consider opening an issue or describe in the PR).
+
+**Example commit:**
+```text
+Fix nasty bug (#1337)
+
+This example commit fixes the issue that some people write non-speaking
+commit messages like 'done magic'.
+A short description is helpful sometimes.
+```
+
+You might sign your work, although that's no must.
+
+
+### When will it be merged?
+
+Short answer: When it makes sense.
+
+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.
+
+
+## Versioning
+
+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.
+
+
+## Build Environment
+
+All you need to start off - besides your favorite IDE of course - is Java and Maven.
+The project requires Java 8 or higher, both OpenJDK and Oracle JDK are supported.
+All build steps are executed by calling e.g. `mvn clean package` in the project's root directory,
+
+
+## Unit Tests
+
+The Java code is tested by a set of JUnit tests.
+All test files are located in the `src/test` directory. 
+Files ending with `Test.java` will be automatically included into the test suite.
+
+
+## Continuous Integration
+
+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.
+
+
+## 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.
+In any case you might submit your request/issue anyway, we won't refuse good code only for formal reasons.
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # jURAclient 
-[![Build status](https://travis-ci.org/stklcode/juraclient.svg?branch=master)](https://travis-ci.org/stklcode/juraclient)
-[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=de.stklcode.pubtrans%3Ajuraclient)](https://sonarcloud.io/dashboard?id=de.stklcode.pubtrans%3Ajuraclient) 
+[![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)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/stklcode/juraclient/blob/master/LICENSE.txt)
@ -10,17 +10,35 @@ Java client for URA based public transport APIs.
 This client allows to simply connect any Java application to the public transport API to implement a monitor for the 
 local bus station or any other custom queries. API versions 1.x and 2.x are supported.

+## Supported versions
+Version 2.x requires Java 11 or later.
+It also contains some new features and allows configuration using a dedicated configuration object.
+
+Version 1.x requires Java 8 or later.
+This version currently receives security and bugfix updates.
+However, new features might not be backported.
+
 ## Usage Examples

 ### Initialization
 ```java
-// Instantiate the client (e.g. using the TFL API)
-UraClient ura = new UraClient("http://countdown.api.tfl.gov.uk");
+// Instantiate the client.
+UraClient ura = new UraClient("https://ura.example.com");

-// Initiailize the API with non-standard endpoints (e.g. ASEAG with API V2)
-UraClient ura = new UraClient("http://ivu.aseag.de", 
+// Initialize the API with non-standard endpoints.
+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("https://ura.example.com")
+                          .withInstantPath("interfaces/ura/instant_V2")
+                          .withStreamPath("interfaces/ura/stream_V2")
+                          .withConnectTimeout(Duration.ofSeconds(2))
+                          .withTimeout(Duration.ofSeconds(10))
+                          .build()
+);
 ```

 ### List Stops
@ -39,31 +57,34 @@ List<Stop> stops = ura.forPosition(51.51009, -0.1345734, 200)

 ```java
 // Get next 10 trips for given stops and lines in a single direction (all filters optional)
-List<Trip> trips = ura.forStop("100000")
+List<Trip> trips = ura.forStops("100000")
                      .forLines("25", "35")
                      .forDirection(1)
                      .getTrips(10);

 // Get trips from given stop towards your destination
-List<Trip> trips = ura.forStopByName("Piccadilly Circus")
+List<Trip> trips = ura.forStopsByName("Piccadilly Circus")
                      .towards("Marble Arch")
                      .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.forStops("100000")
+                        .getMessages();
 ```
+
+## Maven Artifact
+```xml
 <dependency>
    <groupId>de.stklcode.pubtrans</groupId>
    <artifactId>juraclient</artifactId>
-    <version>1.1.2</version>
+    <version>2.0.4</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).
+The project is licensed under [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0).
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@

    <groupId>de.stklcode.pubtrans</groupId>
    <artifactId>juraclient</artifactId>
-    <version>1.1.2</version>
+    <version>2.0.4</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>
@ -47,95 +47,92 @@
    </issueManagement>

    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.9.4</version>
-        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.9.4</version>
+            <version>2.14.0</version>
        </dependency>
+
        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.9.1</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>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.0-beta.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.0-beta.5</version>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <version>2.35.0</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.7.0</version>
+                <version>3.10.1</version>
                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
+                    <source>11</source>
+                    <target>11</target>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.3.0</version>
                <configuration>
                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
                        <manifestEntries>
                            <Automatic-Module-Name>de.stklcode.pubtrans.juraclient</Automatic-Module-Name>
                        </manifestEntries>
                    </archive>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
        </plugins>
    </build>
+
    <profiles>
        <profile>
-            <id>jacoco</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>org.jacoco.agent</artifactId>
-                    <version>0.8.0</version>
-                    <classifier>runtime</classifier>
-                </dependency>
-            </dependencies>
+            <id>coverage</id>
            <build>
                <plugins>
                    <plugin>
                        <groupId>org.jacoco</groupId>
                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.0</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>
@ -144,22 +141,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.20.1</version>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
                </plugins>
            </build>
        </profile>
@ -174,7 +158,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.2.1</version>
                        <executions>
                            <execution>
                                <id>attach-sources</id>
@ -198,7 +182,11 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.4.1</version>
+                        <configuration>
+                            <overview>${basedir}/src/main/javadoc/overview.html</overview>
+                            <source>11</source>
+                        </configuration>
                        <executions>
                            <execution>
                                <id>attach-javadocs</id>
@ -212,5 +200,57 @@
            </build>
        </profile>

+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <keyname>${gpg.keyname}</keyname>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>local</id>
+            <distributionManagement>
+                <repository>
+                    <id>local</id>
+                    <url>${dist.repo.local}</url>
+                </repository>
+                <snapshotRepository>
+                    <id>local</id>
+                    <url>${dist.repo.local.snapshot}</url>
+                </snapshotRepository>
+            </distributionManagement>
+        </profile>
+
+        <profile>
+            <id>sonatype</id>
+            <distributionManagement>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+            </distributionManagement>
+        </profile>
    </profiles>
 </project>
--- a/src/main/java/de/stklcode/pubtrans/ura/UraClient.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/UraClient.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2021 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,25 +17,35 @@
 package de.stklcode.pubtrans.ura;

 import com.fasterxml.jackson.databind.ObjectMapper;
+import de.stklcode.pubtrans.ura.exception.UraClientConfigurationException;
+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 de.stklcode.pubtrans.ura.reader.AsyncUraTripReader;

-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
+import java.io.*;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
+
+import static java.nio.charset.StandardCharsets.UTF_8;

 /**
 * Client for URA based public transport API.
+ * <p>
+ * This client features builder pattern style query functionality to obtain {@link Trip} and {@link Stop} information.
 *
 * @author Stefan Kalscheuer
 */
-public class UraClient {
-    private static final String DEFAULT_INSTANT_URL = "/interfaces/ura/instant_V1";
-    private static final String DEFAULT_STREAM_URL = "/interfaces/ura/stream_V1";
+public class UraClient implements Serializable {
+    private static final long serialVersionUID = -1183740075816686611L;

    private static final String PAR_STOP_ID = "StopID";
    private static final String PAR_STOP_NAME = "StopPointName";
@ -53,41 +63,66 @@ public class UraClient {
    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;
-    private final String streamURL;
+    /**
+     * The client configuration.
+     */
+    private final UraClientConfiguration config;
+
+    /**
+     * The JSON mapper.
+     */
    private final ObjectMapper mapper;

+    /**
+     * Constructor from {@link UraClientConfiguration}.
+     *
+     * @param config The configuration.
+     * @since 2.0
+     */
+    public UraClient(final UraClientConfiguration config) {
+        this.config = config;
+        this.mapper = new ObjectMapper();
+    }
+
    /**
     * Constructor with base URL and default API paths.
     *
     * @param baseURL The base URL (with protocol, without trailing slash).
     */
    public UraClient(final String baseURL) {
-        this(baseURL, DEFAULT_INSTANT_URL, DEFAULT_STREAM_URL);
+        this(UraClientConfiguration.forBaseURL(baseURL).build());
    }

    /**
     * Constructor with base URL and custom API paths.
     *
-     * @param baseURL    The base URL (including protocol).
-     * @param instantURL The path for instant requests.
-     * @param streamURL  The path for stream requests.
+     * @param baseURL     The base URL (including protocol).
+     * @param instantPath The path for instant requests.
+     * @param streamPath  The path for stream requests.
     */
-    public UraClient(final String baseURL, final String instantURL, final String streamURL) {
-        this.baseURL = baseURL;
-        this.instantURL = instantURL;
-        this.streamURL = streamURL;
-        this.mapper = new ObjectMapper();
+    public UraClient(final String baseURL, final String instantPath, final String streamPath) {
+        this(
+                UraClientConfiguration.forBaseURL(baseURL)
+                        .withInstantPath(instantPath)
+                        .withStreamPath(streamPath)
+                        .build()
+        );
    }

    /**
@ -180,19 +215,25 @@ public class UraClient {
     * If forStops() and/or forLines() has been called, those will be used as filter.
     *
     * @return List of trips.
+     * @throws UraClientException Error with API communication.
+     * @since 1.0
+     * @since 2.0 Throws {@link UraClientException}.
     */
-    public List<Trip> getTrips() {
+    public List<Trip> getTrips() throws UraClientException {
        return getTrips(new Query(), null);
    }

    /**
     * Get list of trips with limit.
-     * If forStops() and/or forLines() has been called, those will be used as filter.
+     * If {@link #forStops(String...)} and/or {@link #forLines(String...)} has been called, those will be used as filter.
     *
     * @param limit Maximum number of results.
     * @return List of trips.
+     * @throws UraClientException Error with API communication.
+     * @since 1.0
+     * @since 2.0 Throws {@link UraClientException}.
     */
-    public List<Trip> getTrips(final Integer limit) {
+    public List<Trip> getTrips(final Integer limit) throws UraClientException {
        return getTrips(new Query(), limit);
    }

@ -202,8 +243,12 @@ public class UraClient {
     *
     * @param query The query.
     * @return List of trips.
+     * @throws UraClientException Error with API communication.
+     * @throws UraClientException Error with API communication.
+     * @since 1.0
+     * @since 2.0 Throws {@link UraClientException}.
     */
-    public List<Trip> getTrips(final Query query) {
+    public List<Trip> getTrips(final Query query) throws UraClientException {
        return getTrips(query, null);
    }

@ -213,15 +258,18 @@ public class UraClient {
     * @param query The query.
     * @param limit Maximum number of results.
     * @return List of trips.
+     * @throws UraClientException Error with API communication.
+     * @since 1.0
+     * @since 2.0 Throws {@link UraClientException}.
     */
-    public List<Trip> getTrips(final Query query, final Integer limit) {
+    public List<Trip> getTrips(final Query query, final Integer limit) throws UraClientException {
        List<Trip> trips = new ArrayList<>();
        try (InputStream is = requestInstant(REQUEST_TRIP, query);
             BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
            String version = null;
            String line = br.readLine();
            while (line != null && (limit == null || trips.size() < limit)) {
-                List l = mapper.readValue(line, List.class);
+                List<Serializable> l = mapper.readValue(line, mapper.getTypeFactory().constructCollectionType(List.class, Serializable.class));
                /* Check if result exists and has correct response type */
                if (l != null && !l.isEmpty()) {
                    if (l.get(0).equals(RES_TYPE_URA_VERSION)) {
@ -233,84 +281,249 @@ public class UraClient {
                line = br.readLine();
            }
        } catch (IOException e) {
-            throw new IllegalStateException("Failed to read from API", e);
+            throw new UraClientException("Failed to read trips from API", e);
        }
        return trips;
    }

+    /**
+     * Get trips for given stopIDs and lineIDs using stream API and pass each result to given consumer.
+     *
+     * @param query    The query.
+     * @param consumer Consumer(s) for single trips.
+     * @return Trip reader.
+     * @throws UraClientConfigurationException Error reading response.
+     * @see #getTripsStream(Query, List)
+     * @since 1.2
+     */
+    public AsyncUraTripReader getTripsStream(final Query query, final Consumer<Trip> consumer) throws UraClientConfigurationException {
+        return getTripsStream(query, Collections.singletonList(consumer));
+    }
+
+    /**
+     * Get trips for given stopIDs and lineIDs using stream API and pass each result to given consumers.
+     *
+     * @param query     The query.
+     * @param consumers Consumer(s) for single trips.
+     * @return Trip reader.
+     * @throws UraClientConfigurationException Error retrieving stream response.
+     * @since 1.2
+     * @since 2.0 Throws {@link UraClientConfigurationException}.
+     */
+    public AsyncUraTripReader getTripsStream(final Query query, final List<Consumer<Trip>> consumers) throws UraClientConfigurationException {
+        // Create the reader.
+        try {
+            AsyncUraTripReader reader = new AsyncUraTripReader(
+                    URI.create(requestURL(config.getBaseURL() + config.getStreeamPath(), REQUEST_TRIP, query)),
+                    config,
+                    consumers
+            );
+
+            // Open the reader, i.e. start reading from API.
+            reader.open();
+
+            return reader;
+        } catch (IllegalArgumentException e) {
+            throw new UraClientConfigurationException("Invalid API URL, check client configuration.", e);
+        }
+    }
+
    /**
     * Get list of stops without filters.
     *
-     * @return Lhe list.
+     * @return The list of stops.
+     * @throws UraClientException Error with API communication.
+     * @since 1.0
+     * @since 2.0 Throws {@link UraClientException}.
     */
-    public List<Stop> getStops() {
+    public List<Stop> getStops() throws UraClientException {
        return getStops(new Query());
    }

    /**
     * List available stopIDs.
-     * If forStops() and/or forLines() has been called, those will be used as filter.
+     * If {@link #forStops(String...)} and/or {@link #forLines(String...)} has been called, those will be used as filter.
     *
     * @param query The query.
     * @return The list.
+     * @throws UraClientException Error with API communication.
+     * @since 1.0
+     * @since 2.0 Throws {@link UraClientException}.
     */
-    public List<Stop> getStops(final Query query) {
+    public List<Stop> getStops(final Query query) throws UraClientException {
        List<Stop> stops = new ArrayList<>();
        try (InputStream is = requestInstant(REQUEST_STOP, query);
             BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
            String line;
            while ((line = br.readLine()) != null) {
-                List l = mapper.readValue(line, List.class);
+                List<Serializable> l = mapper.readValue(line, mapper.getTypeFactory().constructCollectionType(List.class, Serializable.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));
                }
            }
        } catch (IOException e) {
-            throw new IllegalStateException("Failed to read from API", e);
+            throw new UraClientException("Failed to read stops from API", e);
        }
        return stops;
    }

+    /**
+     * Get list of messages.
+     *
+     * @return List of messages.
+     * @throws UraClientException Error with API communication.
+     * @since 1.3
+     * @since 2.0 Throw {@link UraClientException}.
+     */
+    public List<Message> getMessages() throws UraClientException {
+        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.
+     * @throws UraClientException Error with API communication.
+     * @since 1.3
+     * @since 2.0 Throw {@link UraClientException}.
+     */
+    public List<Message> getMessages(final Query query) throws UraClientException {
+        return getMessages(query, null);
+    }
+
+
+    /**
+     * Get list of messages with limit.
+     * If forStops() has been called, those will be used as filter.
+     *
+     * @param limit Maximum number of results.
+     * @return List of trips.
+     * @throws UraClientException Error with API communication.
+     * @since 2.0.4
+     */
+    public List<Message> getMessages(final Integer limit) throws UraClientException {
+        return getMessages(new Query(), limit);
+    }
+
+    /**
+     * Get list of messages for given stopIDs with result limit.
+     *
+     * @param query The query.
+     * @param limit Maximum number of results.
+     * @return List of trips.
+     * @throws UraClientException Error with API communication.
+     * @since 1.3
+     * @since 2.0 Throw {@link UraClientException}.
+     */
+    public List<Message> getMessages(final Query query, final Integer limit) throws UraClientException {
+        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<Serializable> l = mapper.readValue(line, mapper.getTypeFactory().constructCollectionType(List.class, Serializable.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 UraClientException("Failed to read messages from API", e);
+        }
+        return messages;
+    }
+
    /**
     * Issue request to instant endpoint and return input stream.
     *
     * @param returnList Fields to fetch.
     * @param query      The query.
-     * @return Input stream of the URL
+     * @return Response {@link InputStream}.
     * @throws IOException on errors
     */
    private InputStream requestInstant(final String[] returnList, final Query query) throws IOException {
-        String urlStr = baseURL + instantURL + "?ReturnList=" + String.join(",", returnList);
+        return request(requestURL(config.getBaseURL() + config.getInstantPath(), returnList, query));
+    }

-        if (query.stopIDs != null && query.stopIDs.length > 0) {
-            urlStr += "&" + PAR_STOP_ID + "=" + String.join(",", query.stopIDs);
-        }
-        if (query.stopNames != null && query.stopNames.length > 0) {
-            urlStr += "&" + PAR_STOP_NAME + "=" + String.join(",", query.stopNames);
-        }
-        if (query.lineIDs != null && query.lineIDs.length > 0) {
-            urlStr += "&" + PAR_LINE_ID + "=" + String.join(",", query.lineIDs);
-        }
-        if (query.lineNames != null && query.lineNames.length > 0) {
-            urlStr += "&" + PAR_LINE_NAME + "=" + String.join(",", query.lineNames);
-        }
+    /**
+     * Build request URL from given parameters.
+     *
+     * @param endpointURL Endpoint URL.
+     * @param returnList  Fields to fetch.
+     * @param query       The query.
+     * @return The URL
+     * @since 1.2
+     * @since 2.0 Does not throw exception anymore.
+     */
+    private String requestURL(final String endpointURL, final String[] returnList, final Query query) {
+        StringBuilder urlStr = new StringBuilder(endpointURL)
+                .append("?ReturnList=")
+                .append(String.join(",", returnList));
+
+        addParameterArray(urlStr, PAR_STOP_ID, query.stopIDs);
+        addParameterArray(urlStr, PAR_STOP_NAME, query.stopNames);
+        addParameterArray(urlStr, PAR_LINE_ID, query.lineIDs);
+        addParameterArray(urlStr, PAR_LINE_NAME, query.lineNames);
        if (query.direction != null) {
-            urlStr += "&" + PAR_DIR_ID + "=" + query.direction;
-        }
-        if (query.destinationNames != null) {
-            urlStr += "&" + PAR_DEST_NAME + "=" + String.join(",", query.destinationNames);
-        }
-        if (query.towards != null) {
-            urlStr += "&" + PAR_TOWARDS + "=" + String.join(",", query.towards);
+            urlStr.append("&").append(PAR_DIR_ID).append("=").append(query.direction);
        }
+        addParameterArray(urlStr, PAR_DEST_NAME, query.destinationNames);
+        addParameterArray(urlStr, PAR_TOWARDS, query.towards);
        if (query.circle != null) {
-            urlStr += "&" + PAR_CIRCLE + "=" + String.join(",", query.circle);
+            urlStr.append("&").append(PAR_CIRCLE).append("=").append(URLEncoder.encode(query.circle, UTF_8));
        }

-        URL url = new URL(urlStr);
+        return urlStr.toString();
+    }

-        return url.openStream();
+    /**
+     * Open given URL as InputStream.
+     *
+     * @param url The URL.
+     * @return Response {@link InputStream}.
+     * @throws IOException Error opening connection or reading data.
+     */
+    private InputStream request(String url) throws IOException {
+        try {
+            var clientBuilder = HttpClient.newBuilder();
+            if (config.getConnectTimeout() != null) {
+                clientBuilder.connectTimeout(config.getConnectTimeout());
+            }
+
+            var reqBuilder = HttpRequest.newBuilder(URI.create(url)).GET();
+            if (config.getTimeout() != null) {
+                reqBuilder.timeout(config.getTimeout());
+            }
+
+            return clientBuilder.build().send(reqBuilder.build(), HttpResponse.BodyHandlers.ofInputStream()).body();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IOException("API request interrupted", e);
+        }
+    }
+
+    /**
+     * Add a URL parameter with list of values, if filled.
+     *
+     * @param urlBuilder StringBuilder holding the current URL.
+     * @param parameter  Parameter key.
+     * @param values     List of parameter values (might be {@code null} or empty)
+     */
+    private static void addParameterArray(StringBuilder urlBuilder, String parameter, String[] values) {
+        if (values != null && values.length > 0) {
+            urlBuilder.append("&").append(parameter)
+                    .append("=").append(URLEncoder.encode(String.join(",", values), UTF_8));
+        }
    }

    /**
@ -423,8 +636,11 @@ public class UraClient {
         * Get stops for set filters.
         *
         * @return List of matching trips.
+         * @throws UraClientException Error with API communication.
+         * @since 1.0
+         * @since 2.0 Throws {@link UraClientException}.
         */
-        public List<Stop> getStops() {
+        public List<Stop> getStops() throws UraClientException {
            return UraClient.this.getStops(this);
        }

@ -432,9 +648,73 @@ public class UraClient {
         * Get trips for set filters.
         *
         * @return List of matching trips.
+         * @throws UraClientException Error with API communication.
+         * @since 1.0
+         * @since 2.0 Throws {@link UraClientException}.
         */
-        public List<Trip> getTrips() {
+        public List<Trip> getTrips() throws UraClientException {
            return UraClient.this.getTrips(this);
        }
+
+        /**
+         * Get trips for set filters with limit.
+         *
+         * @param limit Maximum number of results.
+         * @return List of matching trips.
+         * @throws UraClientException Error with API communication.
+         * @since 2.0.4
+         */
+        public List<Trip> getTrips(final Integer limit) throws UraClientException {
+            return UraClient.this.getTrips(this, limit);
+        }
+
+        /**
+         * Get trips for set filters.
+         *
+         * @param consumer Consumer for single trips.
+         * @return Trip reader.
+         * @throws UraClientConfigurationException Error reading response.
+         * @see #getTripsStream(List)
+         * @since 1.2
+         */
+        public AsyncUraTripReader getTripsStream(Consumer<Trip> consumer) throws UraClientConfigurationException {
+            return UraClient.this.getTripsStream(this, consumer);
+        }
+
+        /**
+         * Get trips for set filters.
+         *
+         * @param consumers Consumers for single trips.
+         * @return Trip reader.
+         * @throws UraClientConfigurationException Errors retrieving stream response.
+         * @since 1.2
+         */
+        public AsyncUraTripReader getTripsStream(List<Consumer<Trip>> consumers) throws UraClientConfigurationException {
+            return UraClient.this.getTripsStream(this, consumers);
+        }
+
+        /**
+         * Get trips for set filters.
+         *
+         * @return List of matching messages.
+         * @throws UraClientException Error with API communication.
+         * @since 1.3
+         * @since 2.0 Throws {@link UraClientException}.
+         */
+        public List<Message> getMessages() throws UraClientException {
+            return UraClient.this.getMessages(this);
+        }
+
+        /**
+         * Get trips for set filters.
+         *
+         * @param limit Maximum number of results.
+         * @return List of matching messages.
+         * @throws UraClientException Error with API communication.
+         * @since 2.0.4
+         */
+        public List<Message> getMessages(final Integer limit) throws UraClientException {
+            return UraClient.this.getMessages(this, limit);
+        }
    }
 }
--- a/src/main/java/de/stklcode/pubtrans/ura/UraClientConfiguration.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/UraClientConfiguration.java
@ -0,0 +1,189 @@
+package de.stklcode.pubtrans.ura;
+
+import java.io.Serializable;
+import java.time.Duration;
+
+/**
+ * Configuration Object for the {@link UraClient}.
+ *
+ * @author Stefan Kalscheuer
+ * @since 2.0
+ */
+public class UraClientConfiguration implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private static final String DEFAULT_INSTANT_PATH = "/interfaces/ura/instant_V1";
+    private static final String DEFAULT_STREAM_PATH = "/interfaces/ura/stream_V1";
+
+    /**
+     * API base URL.
+     */
+    private final String baseURL;
+
+    /**
+     * Path to instant API endpoint.
+     */
+    private final String instantPath;
+
+    /**
+     * Path to stream API endpoint.
+     */
+    private final String streamPath;
+
+    /**
+     * Optional connection timeout.
+     */
+    private final Duration connectTimeout;
+
+    /**
+     * Optional read timeout.
+     */
+    private final Duration timeout;
+
+    /**
+     * Get new configuration {@link Builder} for given base URL.
+     * This URL is the only option required.
+     *
+     * @param baseURL The base URL (with protocol, without trailing slash).
+     * @return Configuration Builder instance.
+     */
+    public static Builder forBaseURL(final String baseURL) {
+        return new Builder(baseURL);
+    }
+
+    /**
+     * Construct new configuration object from Builder.
+     *
+     * @param builder The builder instance.
+     */
+    private UraClientConfiguration(Builder builder) {
+        this.baseURL = builder.baseURL;
+        this.instantPath = builder.instantPath;
+        this.streamPath = builder.streamPath;
+        this.connectTimeout = builder.connectTimeout;
+        this.timeout = builder.timeout;
+    }
+
+    /**
+     * Get the API base URL.
+     *
+     * @return Base URL.
+     */
+    public String getBaseURL() {
+        return baseURL;
+    }
+
+    /**
+     * Get the API instant endpoint path.
+     *
+     * @return Instant endpoint path.
+     */
+    public String getInstantPath() {
+        return this.instantPath;
+    }
+
+    /**
+     * Get the API stream endpoint path.
+     *
+     * @return Stream endpoint path.
+     */
+    public String getStreeamPath() {
+        return this.streamPath;
+    }
+
+    /**
+     * Get the connection timeout, if any.
+     *
+     * @return Timeout duration or {@code null} if none specified.
+     */
+    public Duration getConnectTimeout() {
+        return this.connectTimeout;
+    }
+
+    /**
+     * Get the response timeout, if any.
+     *
+     * @return Timeout duration or {@code null} if none specified.
+     */
+    public Duration getTimeout() {
+        return this.timeout;
+    }
+
+    /**
+     * Builder for {@link UraClientConfiguration} objects.
+     */
+    public static class Builder {
+        private final String baseURL;
+        private String instantPath;
+        private String streamPath;
+        private Duration connectTimeout;
+        private Duration timeout;
+
+        /**
+         * Initialize the builder with mandatory base URL.
+         * Use {@link UraClientConfiguration#forBaseURL(String)} to get a builder instance.
+         *
+         * @param baseURL The base URL.
+         */
+        private Builder(String baseURL) {
+            this.baseURL = baseURL;
+            this.instantPath = DEFAULT_INSTANT_PATH;
+            this.streamPath = DEFAULT_STREAM_PATH;
+            this.connectTimeout = null;
+            this.timeout = null;
+        }
+
+        /**
+         * Specify a custom path to the instant API.
+         *
+         * @param instantPath Instant endpoint path.
+         * @return The builder.
+         */
+        public Builder withInstantPath(String instantPath) {
+            this.instantPath = instantPath;
+            return this;
+        }
+
+        /**
+         * Specify a custom path to the stream API.
+         *
+         * @param streamPath Stream endpoint path.
+         * @return The builder.
+         */
+        public Builder withStreamPath(String streamPath) {
+            this.streamPath = streamPath;
+            return this;
+        }
+
+        /**
+         * Specify a custom connection timeout duration.
+         *
+         * @param connectTimeout Timeout duration.
+         * @return The builder.
+         */
+        public Builder withConnectTimeout(Duration connectTimeout) {
+            this.connectTimeout = connectTimeout;
+            return this;
+        }
+
+        /**
+         * Specify a custom timeout duration.
+         *
+         * @param timeout Timeout duration.
+         * @return The builder.
+         */
+        public Builder withTimeout(Duration timeout) {
+            this.timeout = timeout;
+            return this;
+        }
+
+        /**
+         * Finally build the configuration object.
+         *
+         * @return The configuration.
+         */
+        public UraClientConfiguration build() {
+            return new UraClientConfiguration(this);
+        }
+    }
+}
--- a/src/main/java/de/stklcode/pubtrans/ura/exception/UraClientConfigurationException.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/exception/UraClientConfigurationException.java
@ -0,0 +1,37 @@
+/*
+ * Copyright 2016-2021 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.exception;
+
+/**
+ * Custom exception class indicating an error with the URA client configuration.
+ *
+ * @author Stefan Kalscheuer
+ * @since 2.0
+ */
+public class UraClientConfigurationException extends UraClientException {
+    private static final long serialVersionUID = -8035752391477338659L;
+
+    /**
+     * Default constructor.
+     *
+     * @param message The detail message (which is saved for later retrieval by the {@link #getMessage()} method)
+     * @param cause   The cause (which is saved for later retrieval by the {@link #getCause()} method).
+     */
+    public UraClientConfigurationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
--- a/src/main/java/de/stklcode/pubtrans/ura/exception/UraClientException.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/exception/UraClientException.java
@ -0,0 +1,39 @@
+/*
+ * Copyright 2016-2021 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.exception;
+
+import java.io.IOException;
+
+/**
+ * Custom exception class indicating an error with the URA API communication.
+ *
+ * @author Stefan Kalscheuer
+ * @since 2.0
+ */
+public class UraClientException extends IOException {
+    private static final long serialVersionUID = 4585240685746203433L;
+
+    /**
+     * Default constructor.
+     *
+     * @param message The detail message (which is saved for later retrieval by the {@link #getMessage()} method)
+     * @param cause   The cause (which is saved for later retrieval by the {@link #getCause()} method).
+     */
+    public UraClientException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
--- a/src/main/java/de/stklcode/pubtrans/ura/exception/package-info.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/exception/package-info.java
@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2021 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.
+ */
+
+/**
+ * jURAclient exceptions thrown by the client.
+ */
+package de.stklcode.pubtrans.ura.exception;
--- a/src/main/java/de/stklcode/pubtrans/ura/model/Message.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/model/Message.java
@ -0,0 +1,206 @@
+package de.stklcode.pubtrans.ura.model;
+
+import java.io.IOException;
+import java.io.Serializable;
+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;
+
+    /**
+     * Corresponding stop.
+     */
+    private final Stop stop;
+
+    /**
+     * Message UUID.
+     */
+    private final String uuid;
+
+    /**
+     * Message type.
+     */
+    private final Integer type;
+
+    /**
+     * Message priority.
+     */
+    private final Integer priority;
+
+    /**
+     * Message text.
+     */
+    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<Serializable> 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<Serializable> 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());
+        }
+    }
+
+    /**
+     * The stop, the message is targeted.
+     *
+     * @return The affected stop.
+     */
+    public Stop getStop() {
+        return stop;
+    }
+
+    /**
+     * This is the unique identifier of the flexible message.
+     *
+     * @return Message's unique identifier.
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Messages are assigned a type.
+     * This is predominantly in order to define how they should be displayed on on-street signs, however can be used to
+     * alter display on other devices.
+     * <ul>
+     * <li>0: “Normal”</li>
+     * <li>1: “Special”</li>
+     * <li>2: “Full Matrix” – Stop is temporarily out of service and predictions should not be presented</li>
+     * </ul>
+     *
+     * @return Message type.
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * Messages are assigned a priority in order for them to be ranked.
+     * Since it is possible for a stop to be assigned multiple messages it is important to ensure priority is given.
+     * Priorities are between 1 and 10 (where 1 is the highest priority). By default the message priority is set to 3.
+     *
+     * @return Message priority.
+     */
+    public Integer getPriority() {
+        return priority;
+    }
+
+    /**
+     * The text of the message. This should be displayed to the public.
+     *
+     * @return Message text.
+     */
+    public String getText() {
+        return text;
+    }
+}
--- a/src/main/java/de/stklcode/pubtrans/ura/model/Model.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/model/Model.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2021 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,12 +17,15 @@
 package de.stklcode.pubtrans.ura.model;

 import java.io.IOException;
+import java.io.Serializable;

 /**
+ * Interface for model classes to bundle common methods.
+ *
 * @author Stefan Kalscheuer
 * @since 1.1.1
 */
-interface Model {
+interface Model extends Serializable {
    /**
     * Generate exception for unmatched type when String is expected.
     *
@ -30,7 +33,7 @@ interface Model {
     * @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");
    }

@ -42,7 +45,7 @@ interface Model {
     * @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()));
    }
--- a/src/main/java/de/stklcode/pubtrans/ura/model/Stop.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/model/Stop.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2021 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.model;

 import java.io.IOException;
+import java.io.Serializable;
 import java.util.List;

 /**
@ -25,6 +26,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;
@ -33,11 +36,34 @@ public final class Stop implements Model {
    private static final int F_LONGITUDE = 6;
    private static final int F_NUM_OF_FIELDS = 7;

+    /**
+     * Stop identifier.
+     */
    private final String id;
+
+    /**
+     * The name of the bus stop.
+     */
    private final String name;
+
+    /**
+     * The stop indicator.
+     */
    private final String indicator;
+
+    /**
+     * The stop state
+     */
    private final Integer state;
+
+    /**
+     * The stop geolocation latitude.
+     */
    private final Double latitude;
+
+    /**
+     * The stop geolocation longitude.
+     */
    private final Double longitude;

    /**
@ -70,7 +96,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<Serializable> raw) throws IOException {
        if (raw == null || raw.size() < F_NUM_OF_FIELDS) {
            throw new IOException("Invalid number of fields");
        }
@ -115,6 +141,8 @@ public final class Stop implements Model {
    }

    /**
+     * Stop identifier.
+     *
     * @return The stop ID.
     */
    public String getId() {
@ -122,6 +150,8 @@ public final class Stop implements Model {
    }

    /**
+     * The name of the bus stop.
+     *
     * @return The stop name.
     */
    public String getName() {
@ -129,6 +159,9 @@ public final class Stop implements Model {
    }

    /**
+     * The letter(s) that are displayed on top of the bus stop flag (e.g. SA).
+     * These are used to help passengers easily identify a bus stop from others in the locality.
+     *
     * @return The stop indicator.
     */
    public String getIndicator() {
@ -136,20 +169,35 @@ public final class Stop implements Model {
    }

    /**
-     * @return The stop indicator.
+     * The different stop states and their definitions are provided below:
+     * <ul>
+     * <li>0: “Open”: Bus stop is being served as usual</li>
+     * <li>1: “Temporarily Closed” : Vehicles are not serving the stop but may be serving a nearby bus stop,
+     *                               predictions may be available</li>
+     * <li>2: “Closed” : Vehicles are not serving the stop.
+     *                   Stop should display the closed message and predictions should not be shown.</li>
+     * <li>3: “Suspended” : Vehicles are not serving the stop.
+     *                      Stop should display the closed message and predictions should not be shown.</li>
+     * </ul>
+     *
+     * @return The stop state.
     */
    public Integer getState() {
        return state;
    }

    /**
-     * @return The stop geoloaction latitude.
+     * The latitude of the stop. This is expressed using the WGS84 coordinate system.
+     *
+     * @return The stop geolocation latitude.
     */
    public Double getLatitude() {
        return latitude;
    }

    /**
+     * The longitude of the stop. This isexpressed using the WGS84 coordinate system.
+     *
     * @return The stop geolocation longitude.
     */
    public Double getLongitude() {
--- a/src/main/java/de/stklcode/pubtrans/ura/model/Trip.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/model/Trip.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2021 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.model;

 import java.io.IOException;
+import java.io.Serializable;
 import java.util.List;

 /**
@ -25,6 +26,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;
@ -36,15 +39,54 @@ public final class Trip implements Model {
    private static final int ESTIMATED_TIME = 15;
    private static final int NUM_OF_FIELDS = 16;

+    /**
+     * The starting stop.
+     */
    private final Stop stop;
+
+    /**
+     * The identifier of the specific trip that the prediction is for.
+     */
    private final String id;
+
+    /**
+     * Visit identifier.
+     */
    private final Integer visitID;
+
+    /**
+     * The line ID.
+     */
    private final String lineID;
+
+    /**
+     * The line name
+     */
    private final String lineName;
+
+    /**
+     * The direction ID.
+     */
    private final Integer directionID;
+
+    /**
+     * The destination name.
+     */
    private final String destinationName;
+
+    /**
+     * The destination text.
+     */
    private final String destinationText;
+
+    /**
+     * The estimated departure time.
+     */
    private final Long estimatedTime;
+
+    /**
+     * The vehicle ID.
+     */
    private final String vehicleID;

    /**
@ -140,18 +182,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<Serializable> 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<Serializable> raw, final String version) throws IOException {
        if (raw == null || raw.size() < NUM_OF_FIELDS) {
            throw new IOException("Invalid number of fields");
        }
@ -176,13 +218,15 @@ public final class Trip implements Model {
            throw Model.typeErrorString(LINE_NAME, raw.get(LINE_NAME).getClass());
        }

-        if (raw.get(DIRECTION_ID) instanceof Integer) {
-            directionID = (Integer) raw.get(DIRECTION_ID);
+        if (raw.get(DIRECTION_ID) instanceof String                 // Also accept Strings (#2)
+                || raw.get(DIRECTION_ID) instanceof Integer
+                || raw.get(DIRECTION_ID) instanceof Long) {
+            directionID = Integer.valueOf(raw.get(DIRECTION_ID).toString());
            if (directionID < 0 || directionID > 2) {
                throw new IOException("Direction out of range. Expected 1 or 2, found " + directionID);
            }
        } else {
-            throw Model.typeError(DIRECTION_ID, raw.get(DIRECTION_ID).getClass(), "Integer");
+            throw Model.typeError(DIRECTION_ID, raw.get(DIRECTION_ID).getClass(), "String/Long/Integer");
        }

        if (raw.get(DESTINATION_NAME) instanceof String) {
@ -202,6 +246,8 @@ public final class Trip implements Model {
                || raw.get(VEHICLE_ID) instanceof Integer
                || raw.get(VEHICLE_ID) instanceof Long) {
            vehicleID = raw.get(VEHICLE_ID).toString();
+        } else if (raw.get(VEHICLE_ID) == null) {   // Only fail of field is not NULL (#3).
+            vehicleID = null;
        } else {
            throw Model.typeError(VEHICLE_ID, raw.get(VEHICLE_ID).getClass(), "String/Integer/Long");
        }
@ -222,6 +268,8 @@ public final class Trip implements Model {
    }

    /**
+     * The starting stop.
+     *
     * @return The (starting) stop.
     */
    public Stop getStop() {
@ -236,6 +284,8 @@ public final class Trip implements Model {
    }

    /**
+     * Visit identifier.
+     *
     * @return The visit ID.
     */
    public Integer getVisitID() {
@ -243,6 +293,9 @@ public final class Trip implements Model {
    }

    /**
+     * The identifier of a route. This is an internal identifier and is not equal to the route number displayed on
+     * the front of the bus. It should not be displayed to the public.
+     *
     * @return The line ID.
     */
    public String getLineID() {
@ -250,6 +303,8 @@ public final class Trip implements Model {
    }

    /**
+     * This is the route number that is displayed on the front of the bus and on any publicity advertising the route.
+     *
     * @return The line name.
     */
    public String getLineName() {
@ -257,6 +312,9 @@ public final class Trip implements Model {
    }

    /**
+     * This identifies the direction of the trip that the vehicle is on.
+     * It indicates whether the vehicle is on an outbound or inbound trip.
+     *
     * @return The direction ID.
     */
    public Integer getDirectionID() {
@ -264,6 +322,9 @@ public final class Trip implements Model {
    }

    /**
+     * The full length destination name of the trip the vehicle is on.
+     * The destination name is based on the route and end point of the trip.
+     *
     * @return The destination name.
     */
    public String getDestinationName() {
@ -271,6 +332,9 @@ public final class Trip implements Model {
    }

    /**
+     * The abbreviated destination name of the trip the vehicle is on.
+     * The destination text is based on the route and end point of the trip.
+     *
     * @return The destination text.
     */
    public String getDestinationText() {
@ -278,6 +342,9 @@ public final class Trip implements Model {
    }

    /**
+     * This is the predicted time of arrival for the vehicle at a specific stop.
+     * It is an absolute time in UTC as per Unix epoch (in milliseconds).
+     *
     * @return The estimated departure time.
     */
    public Long getEstimatedTime() {
@ -285,7 +352,9 @@ public final class Trip implements Model {
    }

    /**
-     * @return The vehicle ID.
+     * The unique identifier of the vehicle. This is an internal identifier and should not be displayed to the public.
+     *
+     * @return The vehicle ID or {@code null} if not present.
     */
    public String getVehicleID() {
        return vehicleID;
--- a/src/main/java/de/stklcode/pubtrans/ura/model/package-info.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/model/package-info.java
@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2021 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.
+ */
+
+/**
+ * jURAclient model classes that represent responses returned by the URA interface.
+ */
+package de.stklcode.pubtrans.ura.model;
--- a/src/main/java/de/stklcode/pubtrans/ura/package-info.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/package-info.java
@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2021 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.
+ */
+
+/**
+ * jURAclient base package - see {@link de.stklcode.pubtrans.ura.UraClient} for usage.
+ */
+package de.stklcode.pubtrans.ura;
--- a/src/main/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReader.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReader.java
@ -0,0 +1,225 @@
+/*
+ * Copyright 2016-2021 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.reader;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import de.stklcode.pubtrans.ura.UraClientConfiguration;
+import de.stklcode.pubtrans.ura.model.Trip;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.function.Consumer;
+
+/**
+ * Asynchronous stream reader for URA stream API.
+ * <p>
+ * This reader provides a handler for asynchronous stream events.
+ *
+ * @author Stefan Kalscheuer
+ * @since 1.2.0
+ */
+public class AsyncUraTripReader implements AutoCloseable {
+    private static final Integer RES_TYPE_PREDICTION = 1;
+    private static final Integer RES_TYPE_URA_VERSION = 4;
+
+    private final List<Consumer<Trip>> consumers;
+    private final URI uri;
+    private final UraClientConfiguration config;
+    private JsonLineSubscriber subscriber;
+    private CompletableFuture<Void> future;
+
+    /**
+     * Initialize trip reader.
+     *
+     * @param uri      URL to read trips from.
+     * @param consumer Initial consumer.
+     * @since 2.0 Parameter of Type {@link URI} instead of {@link java.net.URL}.
+     */
+    public AsyncUraTripReader(URI uri, Consumer<Trip> consumer) {
+        this(uri, null, new ArrayList<>(0));
+        this.consumers.add(consumer);
+    }
+
+    /**
+     * Initialize trip reader.
+     *
+     * @param uri       URL to read trips from.
+     * @param consumers Initial list of consumers.
+     * @since 2.0 Parameter of Type {@link URI} instead of {@link java.net.URL}.
+     */
+    public AsyncUraTripReader(URI uri, List<Consumer<Trip>> consumers) {
+        this(uri, null, consumers);
+    }
+
+    /**
+     * Initialize trip reader.
+     *
+     * @param uri       URL to read trips from.
+     * @param config    Client configuration for additional parameters.
+     * @param consumers Initial list of consumers.
+     * @since 2.0 Configuration added.
+     */
+    public AsyncUraTripReader(URI uri, UraClientConfiguration config, List<Consumer<Trip>> consumers) {
+        this.uri = uri;
+        this.config = config;
+        this.consumers = new ArrayList<>(consumers);
+    }
+
+    /**
+     * Open the reader, i.e. initiate connection to the API and start reading the response stream.
+     */
+    public void open() {
+        // Throw exception, if future is already present.
+        if (future != null) {
+            throw new IllegalStateException("Reader already opened");
+        }
+
+        this.subscriber = new JsonLineSubscriber();
+
+        HttpClient.Builder clientBuilder = HttpClient.newBuilder();
+        if (config != null && config.getConnectTimeout() != null) {
+            clientBuilder.connectTimeout(config.getConnectTimeout());
+        }
+
+        HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(uri).GET();
+        if (config != null && config.getTimeout() != null) {
+            reqBuilder.timeout(config.getTimeout());
+        }
+
+        clientBuilder.build().sendAsync(
+                reqBuilder.build(),
+                HttpResponse.BodyHandlers.fromLineSubscriber(subscriber)
+        ).exceptionally(throwable -> {
+            subscriber.onError(throwable);
+            return null;
+        });
+        this.future = subscriber.getState();
+    }
+
+    /**
+     * Register an additional consumer.
+     *
+     * @param consumer New consumer.
+     */
+    public void addConsumer(Consumer<Trip> consumer) {
+        consumers.add(consumer);
+    }
+
+    /**
+     * Close the reader.
+     * 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() {
+        // Nothing to do if future is not yet started.
+        if (future == null) {
+            return;
+        }
+
+        // Signal cancelling to gracefully stop future.
+        subscriber.cancel();
+        try {
+            future.get(1, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        } catch (ExecutionException e) {
+            throw new IllegalStateException("Failed to close API connection", e);
+        } catch (TimeoutException e) {
+            // Task failed to finish within 1 second.
+            future.cancel(true);
+        } finally {
+            future = null;
+        }
+    }
+
+    /**
+     * JSON line subscriber for asynchronous response handling.
+     *
+     * @since 2.0
+     */
+    private class JsonLineSubscriber implements Flow.Subscriber<String> {
+        private final ObjectMapper mapper = new ObjectMapper();
+        private final CompletableFuture<Void> state = new CompletableFuture<>();
+        private Flow.Subscription subscription;
+        private String version = null;
+
+        @Override
+        public void onSubscribe(Flow.Subscription subscription) {
+            this.subscription = subscription;
+            this.subscription.request(1);
+        }
+
+        @Override
+        public void onNext(String item) {
+            try {
+                List<Serializable> l = mapper.readValue(item, mapper.getTypeFactory().constructCollectionType(List.class, Serializable.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_PREDICTION)) {
+                        // Parse Trip and pass to each consumer.
+                        Trip trip = new Trip(l, version);
+                        consumers.forEach(c -> c.accept(trip));
+                    }
+                }
+
+                // Request next item.
+                this.subscription.request(1);
+            } catch (IOException e) {
+                onError(e);
+            }
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            state.completeExceptionally(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            state.complete(null);
+        }
+
+        /**
+         * Retrieve the state future.
+         *
+         * @return State future.
+         */
+        public CompletableFuture<Void> getState() {
+            return state;
+        }
+
+        /**
+         * Cancel the current subscription.
+         */
+        public void cancel() {
+            state.complete(null);
+            if (subscription != null) {
+                subscription.cancel();
+            }
+        }
+    }
+}
--- a/src/main/java/de/stklcode/pubtrans/ura/reader/package-info.java
+++ b/src/main/java/de/stklcode/pubtrans/ura/reader/package-info.java
@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2021 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.
+ */
+
+/**
+ * jURAclient utility classes for asynchronous reading from the API.
+ */
+package de.stklcode.pubtrans.ura.reader;
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@ -0,0 +1,29 @@
+/*
+ * Copyright 2016-2021 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.
+ */
+
+/**
+ * jURAclient main module.
+ */
+module de.stklcode.pubtrans.juraclient {
+    exports de.stklcode.pubtrans.ura;
+    exports de.stklcode.pubtrans.ura.exception;
+    exports de.stklcode.pubtrans.ura.model;
+    exports de.stklcode.pubtrans.ura.reader;
+
+    requires java.base;
+    requires java.net.http;
+    requires com.fasterxml.jackson.databind;
+}
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>API Overview</title>
+</head>
+<body>
+<p>Java client for URA based public transport APIs.</p>
+<p>
+    This client allows to simply connect any Java application to the public transport API to implement a monitor for the
+    local bus station or any other custom queries. API versions 1.x and 2.x are supported.
+</p>
+</body>
+</html>
--- a/src/test/java/de/stklcode/pubtrans/ura/UraClientConfigurationTest.java
+++ b/src/test/java/de/stklcode/pubtrans/ura/UraClientConfigurationTest.java
@ -0,0 +1,49 @@
+package de.stklcode.pubtrans.ura;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * Unit test for {@link UraClientConfiguration}.
+ *
+ * @author Stefan Kalscheuer
+ */
+public class UraClientConfigurationTest {
+    @Test
+    public void configBuilderTest() {
+        final String baseURL = "https://ura.example.com";
+        final String instantPath = "/path/to/instant";
+        final String streamPath = "/path/to/stream";
+        final Duration timeout = Duration.ofSeconds(2);
+        final Duration conTimeout = Duration.ofSeconds(41);
+
+        // With Base-URL only.
+        UraClientConfiguration config = UraClientConfiguration.forBaseURL(baseURL).build();
+        assertEquals(baseURL, config.getBaseURL(), "Unexpected base URL");
+        assertEquals("/interfaces/ura/instant_V1", config.getInstantPath(), "Unexpected default instant path");
+        assertEquals("/interfaces/ura/stream_V1", config.getStreeamPath(), "Unexpected default stream path");
+        assertNull(config.getConnectTimeout(), "No default connection timeout expected");
+        assertNull(config.getTimeout(), "No default timeout expected");
+
+        // With custom paths.
+        config = UraClientConfiguration.forBaseURL(baseURL)
+                .withInstantPath(instantPath)
+                .withStreamPath(streamPath)
+                .build();
+        assertEquals(baseURL, config.getBaseURL(), "Unexpected base URL");
+        assertEquals(instantPath, config.getInstantPath(), "Unexpected custom instant path");
+        assertEquals(streamPath, config.getStreeamPath(), "Unexpected custom stream path");
+
+        // With timeouts. (#14)
+        config = UraClientConfiguration.forBaseURL(baseURL)
+                .withConnectTimeout(conTimeout)
+                .withTimeout(timeout)
+                .build();
+        assertEquals(conTimeout, config.getConnectTimeout(), "Unexpected connection timeout value");
+        assertEquals(timeout, config.getTimeout(), "Unexpected timeout value");
+    }
+}
--- a/src/test/java/de/stklcode/pubtrans/ura/UraClientTest.java
+++ b/src/test/java/de/stklcode/pubtrans/ura/UraClientTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2021 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,111 +16,109 @@

 package de.stklcode.pubtrans.ura;

+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.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;

 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
+import java.net.http.HttpConnectTimeoutException;
+import java.net.http.HttpTimeoutException;
+import java.time.Duration;
 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;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.Is.is;
+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
- *  TFL API (http://http://countdown.api.tfl.gov.uk)
+ * Tests run against mocked data collected from ASEAG API (no longer available) and
+ * TFL API (http://countdown.api.tfl.gov.uk)
 *
 * @author Stefan Kalscheuer
 */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ UraClient.class, URL.class })
 public class UraClientTest {
-    @Test
-    public void getStopsTest() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V2_stops.txt"));

-        /* List stops and verify some values */
-        List<Stop> stops = new UraClient("mocked").getStops();
+    @RegisterExtension
+    public static WireMockExtension wireMock = WireMockExtension.newInstance()
+            .options(wireMockConfig().dynamicPort())
+            .build();
+
+    @Test
+    public void getStopsTest() throws UraClientException {
+        // Mock the HTTP call.
+        mockHttpToFile(2, "instant_V2_stops.txt");
+
+        // List stops and verify some values.
+        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"));
-        assertThat(stops.get(2).getState(), is(0));;
+        assertThat(stops.get(2).getState(), is(0));
        assertThat(stops.get(3).getLatitude(), is(50.7578775));
        assertThat(stops.get(4).getLongitude(), is(6.0708663));

-        /* Test exception handling */
-        PowerMockito.when(mockURL.openStream()).thenReturn(new InputStream() {
-            @Override
-            public int read() throws IOException {
-                throw new IOException("Provoked exception 1.");
-            }
-        });
+        // Test Exception handling.
+        mockHttpToError(500);
+
        try {
-            new UraClient("mocked").getStops();
+            new UraClient(wireMock.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"));
        }
    }

    @Test
-    public void getStopsForLineTest() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V2_stops_line.txt"));
+    public void getStopsForLineTest() throws UraClientException {
+        // Mock the HTTP call.
+        mockHttpToFile(2, "instant_V2_stops_line.txt");

-        /* List stops and verify some values */
-        List<Stop> stops = new UraClient("mocked").forLines("33").getStops();
+        // List stops and verify some values.
+        List<Stop> stops = new UraClient(wireMock.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"));
-        assertThat(stops.get(2).getState(), is(0));;
+        assertThat(stops.get(2).getState(), is(0));
        assertThat(stops.get(3).getLatitude(), is(50.7690688));
        assertThat(stops.get(4).getIndicator(), is("H.1"));
        assertThat(stops.get(5).getLongitude(), is(6.2314072));
    }

    @Test
-    public void getStopsForPositionTest() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_stops_circle.txt"));
+    public void getStopsForPositionTest() throws UraClientException {
+        // Mock the HTTP call.
+        mockHttpToFile(1, "instant_V1_stops_circle.txt");

-        /* List stops and verify some values */
-        List<Stop> stops = new UraClient("mocked")
+        // List stops and verify some values.
+        List<Stop> stops = new UraClient(wireMock.baseUrl())
                .forPosition(51.51009, -0.1345734, 200)
                .getStops();
        assertThat(stops, hasSize(13));
        assertThat(stops.get(0).getId(), is("156"));
        assertThat(stops.get(1).getName(), is("Piccadilly Circus"));
-        assertThat(stops.get(2).getState(), is(0));;
+        assertThat(stops.get(2).getState(), is(0));
        assertThat(stops.get(3).getLatitude(), is(51.509154));
        assertThat(stops.get(4).getLongitude(), is(-0.134172));
        assertThat(stops.get(5).getIndicator(), is(nullValue()));

-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_stops_circle_name.txt"));
-        stops = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_stops_circle_name.txt");
+        stops = new UraClient(wireMock.baseUrl())
                .forStopsByName("Piccadilly Circus")
                .forPosition(51.51009, -0.1345734, 200)
                .getStops();
@ -129,22 +127,18 @@ public class UraClientTest {
    }

    @Test
-    public void getTripsForDestinationNamesTest() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_destination.txt"));
+    public void getTripsForDestinationNamesTest() throws UraClientException {
+        // Mock the HTTP call.
+        mockHttpToFile(1, "instant_V1_trips_destination.txt");

-        /* List stops and verify some values */
-        List<Trip> trips = new UraClient("mocked").forDestinationNames("Piccadilly Circus").getTrips();
+        // List stops and verify some values.
+        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()));

-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_stop_destination.txt"));
-        trips = new UraClient("mocked")
+        mockHttpToFile(1, "instant_V1_trips_stop_destination.txt");
+        trips = new UraClient(wireMock.baseUrl())
                .forStops("156")
                .forDestinationNames("Marble Arch")
                .getTrips();
@ -156,38 +150,31 @@ public class UraClientTest {
    }

    @Test
-    public void getTripsTowardsTest() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_towards.txt"));
+    public void getTripsTowardsTest() throws UraClientException {
+        // Mock the HTTP call.
+        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(wireMock.baseUrl()).towards("Marble Arch").getTrips();
        assertThat(trips, hasSize(10));

-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("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(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()));
    }

    @Test
-    public void getTripsTest() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_all.txt"));
+    public void getTripsTest() throws UraClientException {
+        // Mock the HTTP call.
+        mockHttpToFile(1, "instant_V1_trips_all.txt");

-        /* Get trips without filters and verify some values */
-        List<Trip> trips = new UraClient("mocked").getTrips();
+        // Get trips without filters and verify some values.
+        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"));
-        assertThat(trips.get(2).getLineName(), is("28"));;
+        assertThat(trips.get(2).getLineName(), is("28"));
        assertThat(trips.get(3).getDirectionID(), is(1));
        assertThat(trips.get(4).getDestinationName(), is("Verlautenheide Endstr."));
        assertThat(trips.get(5).getDestinationText(), is("Aachen Bushof"));
@ -196,15 +183,22 @@ public class UraClientTest {
        assertThat(trips.get(8).getVisitID(), is(30));
        assertThat(trips.get(9).getStop().getId(), is("100002"));

-        /* Repeat test for API V2 */
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V2_trips_all.txt"));
-        /* Get trips without filters and verify some values */
-        trips = new UraClient("mocked").getTrips();
+        // With limit.
+        trips = new UraClient(wireMock.baseUrl()).getTrips(5);
+        assertThat(trips, hasSize(5));
+        trips = new UraClient(wireMock.baseUrl()).getTrips(11);
+        assertThat(trips, hasSize(10));
+
+        // Repeat test for API V2.
+        mockHttpToFile(2, "instant_V2_trips_all.txt");
+
+        // Get trips without filters and verify some values.
+        trips = new UraClient(wireMock.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"));
-        assertThat(trips.get(2).getLineName(), is("28"));;
+        assertThat(trips.get(2).getLineName(), is("28"));
        assertThat(trips.get(3).getDirectionID(), is(1));
        assertThat(trips.get(4).getDestinationName(), is("Verlautenheide Endstr."));
        assertThat(trips.get(5).getDestinationText(), is("Aachen Bushof"));
@ -213,51 +207,56 @@ public class UraClientTest {
        assertThat(trips.get(8).getVisitID(), is(30));
        assertThat(trips.get(9).getStop().getId(), is("100002"));

-        /* Get limited number of trips */
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_all.txt"));
-        trips = new UraClient("mocked").getTrips(5);
+        // Get limited number of trips.
+        mockHttpToFile(1, "instant_V1_trips_all.txt");
+        trips = new UraClient(wireMock.baseUrl()).getTrips(5);
        assertThat(trips, hasSize(5));

-        /* Test exception handling */
-        PowerMockito.when(mockURL.openStream()).thenReturn(new InputStream() {
-            @Override
-            public int read() throws IOException {
-                throw new IOException("Provoked exception 1.");
-            }
-        });
+        // Test mockException handling.
+        mockHttpToError(502);
        try {
-            new UraClient("mocked").getTrips();
+            new UraClient(wireMock.baseUrl()).getTrips();
        } 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: 502 for URL"));
        }
+
+        mockHttpToException();
+        UraClientException exception = assertThrows(
+                UraClientException.class,
+                () -> new UraClient(wireMock.baseUrl()).getTrips(),
+                "Expected reader to raise an exception"
+        );
+        assertEquals("Failed to read trips from API", exception.getMessage(), "Unexpected error message");
+        assertTrue(exception.getCause() instanceof IOException, "Unexpected error cause");
    }

    @Test
-    public void getTripsForStopTest() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_stop.txt"));
+    public void getTripsForStopTest() throws UraClientException {
+        // Mock the HTTP call.
+        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")
+        // Get trips for stop ID 100000 (Aachen Bushof) and verify some values.
+        List<Trip> trips = new UraClient(wireMock.baseUrl())
                .forStops("100000")
                .getTrips();
        assertThat(trips, hasSize(10));
        assertThat(trips.stream().filter(t -> !t.getStop().getId().equals("100000")).findAny(), is(Optional.empty()));
        assertThat(trips.get(0).getId(), is("27000158010001"));
        assertThat(trips.get(1).getLineID(), is("7"));
-        assertThat(trips.get(2).getLineName(), is("25"));;
+        assertThat(trips.get(2).getLineName(), is("25"));
        assertThat(trips.get(3).getStop().getIndicator(), is("H.15"));

-        /* Get trips for stop name "Uniklinik" and verify some values */
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_stop_name.txt"));
-        trips = new UraClient("mocked")
+        // With limit.
+        trips = new UraClient(wireMock.baseUrl())
+                .forStops("100000")
+                .getTrips(7);
+        assertThat(trips, hasSize(7));
+
+        // Get trips for stop name "Uniklinik" and verify some values.
+        mockHttpToFile(1, "instant_V1_trips_stop_name.txt");
+        trips = new UraClient(wireMock.baseUrl())
                .forStopsByName("Uniklinik")
                .getTrips();
        assertThat(trips, hasSize(10));
@ -265,46 +264,50 @@ public class UraClientTest {
                is(Optional.empty()));
        assertThat(trips.get(0).getId(), is("92000043013001"));
        assertThat(trips.get(1).getLineID(), is("5"));
-        assertThat(trips.get(2).getVehicleID(), is("317"));;
+        assertThat(trips.get(2).getVehicleID(), is("317"));
        assertThat(trips.get(3).getDirectionID(), is(1));
+
+        mockHttpToException();
+        UraClientException exception = assertThrows(
+                UraClientException.class,
+                () -> new UraClient(wireMock.baseUrl()).getStops(),
+                "Expected reader to raise an exception"
+        );
+        assertEquals("Failed to read stops from API", exception.getMessage(), "Unexpected error message");
+        assertTrue(exception.getCause() instanceof IOException, "Unexpected error cause");
    }

    @Test
-    public void getTripsForLine() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_line.txt"));
+    public void getTripsForLine() throws UraClientException {
+        // Mock the HTTP call.
+        mockHttpToFile(1, "instant_V1_trips_line.txt");

-        /* Get trips for line ID 3 and verify some values */
-        List<Trip> trips = new UraClient("mocked")
+        // Get trips for line ID 3 and verify some values.
+        List<Trip> trips = new UraClient(wireMock.baseUrl())
                .forLines("3")
                .getTrips();
        assertThat(trips, hasSize(10));
        assertThat(trips.stream().filter(t -> !t.getLineID().equals("3")).findAny(), is(Optional.empty()));
        assertThat(trips.get(0).getId(), is("27000154004001"));
        assertThat(trips.get(1).getLineID(), is("3"));
-        assertThat(trips.get(2).getLineName(), is("3.A"));;
+        assertThat(trips.get(2).getLineName(), is("3.A"));
        assertThat(trips.get(3).getStop().getIndicator(), is("H.4 (Pontwall)"));

-        /* Get trips for line name "3.A" and verify some values */
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_line_name.txt"));
-        trips = new UraClient("mocked")
+        // Get trips for line name "3.A" and verify some values.
+        mockHttpToFile(1, "instant_V1_trips_line_name.txt");
+        trips = new UraClient(wireMock.baseUrl())
                .forLinesByName("3.A")
                .getTrips();
        assertThat(trips, hasSize(10));
        assertThat(trips.stream().filter(t -> !t.getLineName().equals("3.A")).findAny(), is(Optional.empty()));
        assertThat(trips.get(0).getId(), is("92000288014001"));
        assertThat(trips.get(1).getLineID(), is("3"));
-        assertThat(trips.get(2).getLineName(), is("3.A"));;
+        assertThat(trips.get(2).getLineName(), is("3.A"));
        assertThat(trips.get(3).getStop().getName(), is("Aachen Gartenstraße"));

-        /* Get trips for line 3 with direction 1 and verify some values */
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_line_direction.txt"));
-        trips = new UraClient("mocked")
+        // Get trips for line 3 with direction 1 and verify some values.
+        mockHttpToFile(1, "instant_V1_trips_line_direction.txt");
+        trips = new UraClient(wireMock.baseUrl())
                .forLines("412")
                .forDirection(2)
                .getTrips();
@ -312,10 +315,9 @@ public class UraClientTest {
        assertThat(trips.stream().filter(t -> !t.getLineID().equals("412")).findAny(), is(Optional.empty()));
        assertThat(trips.stream().filter(t -> !t.getDirectionID().equals(2)).findAny(), is(Optional.empty()));

-        /* Test lineID and direction in different order */
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_line_direction.txt"));
-        trips = new UraClient("mocked")
+        // Test lineID and direction in different order.
+        mockHttpToFile(1, "instant_V1_trips_line_direction.txt");
+        trips = new UraClient(wireMock.baseUrl())
                .forDirection(2)
                .forLines("412")
                .getTrips();
@ -325,15 +327,12 @@ public class UraClientTest {
    }

    @Test
-    public void getTripsForStopAndLine() throws Exception {
-        /* Mock the HTTP call */
-        URL mockURL = PowerMockito.mock(URL.class);
-        PowerMockito.whenNew(URL.class).withAnyArguments().thenReturn(mockURL);
-        PowerMockito.when(mockURL.openStream())
-                .thenReturn(getClass().getResourceAsStream("instant_V1_trips_stop_line.txt"));
+    public void getTripsForStopAndLine() throws UraClientException {
+        // Mock the HTTP call.
+        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")
+        // Get trips for line ID 25 and 25 at stop 100000 and verify some values.
+        List<Trip> trips = new UraClient(wireMock.baseUrl())
                .forLines("25", "35")
                .forStops("100000")
                .getTrips();
@ -343,7 +342,141 @@ public class UraClientTest {
        assertThat(trips.stream().filter(t -> !t.getStop().getId().equals("100000")).findAny(), is(Optional.empty()));
        assertThat(trips.get(0).getId(), is("27000078014001"));
        assertThat(trips.get(1).getLineID(), is("25"));
-        assertThat(trips.get(3).getLineName(), is("35"));;
+        assertThat(trips.get(3).getLineName(), is("35"));
        assertThat(trips.get(5).getStop().getIndicator(), is("H.12"));
    }
+
+
+    @Test
+    public void getMessages() throws UraClientException {
+        UraClient uraClient = new UraClient(wireMock.baseUrl());
+
+        // Mock the HTTP call.
+        mockHttpToFile(1, "instant_V1_messages.txt");
+
+        // Get messages without filter and verify some values.
+        List<Message> messages = uraClient.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."));
+
+        // With limit.
+        messages = uraClient.getMessages(1);
+        assertThat(messages, hasSize(1));
+        messages = uraClient.getMessages(3);
+        assertThat(messages, hasSize(2));
+
+        mockHttpToException();
+        UraClientException exception = assertThrows(
+                UraClientException.class,
+                () -> new UraClient(wireMock.baseUrl()).getMessages(),
+                "Expected reader to raise an exception"
+        );
+        assertEquals("Failed to read messages from API", exception.getMessage(), "Unexpected error message");
+        assertTrue(exception.getCause() instanceof IOException, "Unexpected error cause");
+    }
+
+    @Test
+    public void getMessagesForStop() throws UraClientException {
+        UraClient uraClient = new UraClient(wireMock.baseUrl(), "/interfaces/ura/instant_V2", "/interfaces/ura/stream");
+
+        // 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 = uraClient.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."));
+
+        // With limit.
+        messages = uraClient.forStops("100707").getMessages(0);
+        assertThat(messages, hasSize(0));
+        messages = uraClient.forStops("100707").getMessages(2);
+        assertThat(messages, hasSize(1));
+    }
+
+    @Test
+    public void timeoutTest() {
+        // Try to read trips from TEST-NET-1 IP that is not routed (hopefully) and will not connect within 100ms.
+        UraClientException exception = assertThrows(
+                UraClientException.class,
+                () -> new UraClient(
+                        UraClientConfiguration.forBaseURL("http://192.0.2.1")
+                                .withConnectTimeout(Duration.ofMillis(100))
+                                .build()
+                ).forDestinationNames("Piccadilly Circus").getTrips(),
+                "Connection to TEST-NET-1 address should fail"
+        );
+        assertTrue(exception.getCause() instanceof HttpConnectTimeoutException, "Exception cause is not HttpConnectionTimeoutException");
+
+        // Mock the HTTP call with delay of 200ms, but immediate connection.
+        wireMock.stubFor(
+                get(urlPathEqualTo("/interfaces/ura/instant_V1")).willReturn(
+                        aResponse().withFixedDelay(200).withBodyFile("instant_V1_trips_destination.txt")
+                )
+        );
+        assertDoesNotThrow(
+                () -> new UraClient(
+                        UraClientConfiguration.forBaseURL(wireMock.baseUrl())
+                                .withConnectTimeout(Duration.ofMillis(100))
+                                .build()
+                ).forDestinationNames("Piccadilly Circus").getTrips(),
+                "Connection timeout should not affect response time."
+        );
+
+        // Now specify response timeout.
+        exception = assertThrows(
+                UraClientException.class,
+                () -> new UraClient(
+                        UraClientConfiguration.forBaseURL(wireMock.baseUrl())
+                                .withTimeout(Duration.ofMillis(100))
+                                .build()
+                ).forDestinationNames("Piccadilly Circus").getTrips(),
+                "Response timeout did not raise an exception"
+        );
+        assertTrue(exception.getCause() instanceof HttpTimeoutException, "Exception cause is not HttpTimeoutException");
+
+        assertDoesNotThrow(
+                () -> new UraClient(
+                        UraClientConfiguration.forBaseURL(wireMock.baseUrl())
+                                .withTimeout(Duration.ofMillis(300))
+                                .build()
+                ).forDestinationNames("Piccadilly Circus").getTrips(),
+                "Response timeout of 300ms with 100ms delay must not fail"
+        );
+    }
+
+    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)
+                )
+        );
+    }
+
+    private static void mockHttpToException() {
+        wireMock.stubFor(
+                get(anyUrl()).willReturn(
+                        aResponse().withFault(Fault.MALFORMED_RESPONSE_CHUNK)
+                )
+        );
+    }
 }
--- a/src/test/java/de/stklcode/pubtrans/ura/model/MessageTest.java
+++ b/src/test/java/de/stklcode/pubtrans/ura/model/MessageTest.java
@ -0,0 +1,154 @@
+/*
+ * Copyright 2016-2021 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.io.Serializable;
+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<Serializable> 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<Serializable> 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)));
+        }
+    }
+}
--- a/src/test/java/de/stklcode/pubtrans/ura/model/StopTest.java
+++ b/src/test/java/de/stklcode/pubtrans/ura/model/StopTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2021 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,9 +16,10 @@

 package de.stklcode.pubtrans.ura.model;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

@ -26,10 +27,10 @@ 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.Assert.fail;
+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
 */
@ -48,7 +49,7 @@ public class StopTest {
    @Test
    public void listConstructorTest() {
        /* Create valid raw data list */
-        List<Object> raw = new ArrayList<>();
+        List<Serializable> raw = new ArrayList<>();
        raw.add(1);
        raw.add("stopName");
        raw.add("stopId");
@ -80,12 +81,12 @@ public class StopTest {
        }

        /* Test exceptions on invalid data */
-        List<Object> invalid = new ArrayList<>(raw);
+        List<Serializable> invalid = new ArrayList<>(raw);
        invalid.remove(1);
        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 +96,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 +106,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 +116,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 +126,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 +136,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 +145,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)));
        }
--- a/src/test/java/de/stklcode/pubtrans/ura/model/TripTest.java
+++ b/src/test/java/de/stklcode/pubtrans/ura/model/TripTest.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Stefan Kalscheuer
+ * Copyright 2016-2021 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,9 +16,10 @@

 package de.stklcode.pubtrans.ura.model;

-import org.junit.Test;
+import org.junit.jupiter.api.Test;

 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

@ -26,10 +27,10 @@ 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.Assert.fail;
+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
 */
@ -71,7 +72,7 @@ public class TripTest {
    @Test
    public void listConstructorTest() {
        /* Create valid raw data list */
-        List<Object> raw = new ArrayList<>();
+        List<Serializable> raw = new ArrayList<>();
        raw.add(1);
        raw.add("stopName");
        raw.add("stopId");
@ -130,13 +131,33 @@ public class TripTest {
            fail("Creation of Trip from valid list failed: " + e.getMessage());
        }

+        raw.remove(10);
+        raw.add(10, 0L);    // Long values are OK.
+        try {
+            Trip trip = new Trip(raw);
+            assertThat(trip, is(notNullValue()));
+            assertThat(trip.getDirectionID(), is(0));
+        } catch (IOException e) {
+            fail("Creation of Trip from valid list failed: " + e.getMessage());
+        }
+
+        raw.remove(10);
+        raw.add(10, "0");    // String values are OK.
+        try {
+            Trip trip = new Trip(raw);
+            assertThat(trip, is(notNullValue()));
+            assertThat(trip.getDirectionID(), is(0));
+        } catch (IOException e) {
+            fail("Creation of Trip from valid list failed: " + e.getMessage());
+        }
+
        /* Test exceptions on invalid data */
-        List<Object> invalid = new ArrayList<>(raw);
+        List<Serializable> invalid = new ArrayList<>(raw);
        invalid.remove(7);
        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)));
        }
@ -146,7 +167,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)));
        }
@ -156,17 +177,17 @@ 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)));
        }

        invalid = new ArrayList<>(raw);
        invalid.remove(10);
-        invalid.add(10, "1");
+        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)));
        }
@ -176,7 +197,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)));
        }
@ -186,7 +207,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)));
        }
@ -196,7 +217,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)));
        }
@ -206,7 +227,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)));
        }
@ -216,7 +237,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)));
        }
@ -225,7 +246,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)));
        }
@ -234,7 +255,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)));
        }
--- a/src/test/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReaderTest.java
+++ b/src/test/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReaderTest.java
@ -0,0 +1,309 @@
+/*
+ * Copyright 2016-2021 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.reader;
+
+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.UraClientConfiguration;
+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 java.net.URI;
+import java.time.Duration;
+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 com.github.tomakehurst.wiremock.client.WireMock.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+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 WireMockServer httpMock;
+
+    @BeforeAll
+    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());
+    }
+
+    @AfterAll
+    public static void tearDown() {
+        httpMock.stop();
+        httpMock = null;
+    }
+
+    /**
+     * Test the reader.
+     * This test contains some timing values, which is not very nice for debugging, but should do the job here
+     * as 1s is most likely more than enough time on any reasonable build system to parse some simple JSON lines.
+     *
+     * @throws InterruptedException Thread interrupted.
+     */
+    @Test
+    public void readerTest() throws InterruptedException {
+        // Callback counter for some unhandy async mockery.
+        final AtomicInteger counter = new AtomicInteger(0);
+
+        // The list which will be populated by the callback.
+        Deque<Trip> trips = new ConcurrentLinkedDeque<>();
+
+        // Start with V1 data and read file to mock list.
+        readLinesToMock(1, "/__files/stream_V1_stops_all.txt", 8);
+
+        AsyncUraTripReader tr = new AsyncUraTripReader(
+                URI.create(httpMock.baseUrl() + "/interfaces/ura/stream_V1"),
+                Collections.singletonList(
+                        trip -> {
+                            trips.add(trip);
+                            counter.incrementAndGet();
+                        }
+                )
+        );
+
+        // Open the reader.
+        tr.open();
+        // Read for 1 second.
+        TimeUnit.SECONDS.sleep(1);
+        assumeTrue(trips.isEmpty(), "Trips should empty after 1s without reading");
+
+        // Wait another 1s for the callback to be triggered.
+        TimeUnit.SECONDS.sleep(1);
+
+        assertThat("Unexpected number of trips after first entry", trips.size(), is(2));
+
+        // Flush all remaining lines.
+        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(2, "/__files/stream_V2_stops_all.txt", 8);
+
+        tr = new AsyncUraTripReader(
+                URI.create(httpMock.baseUrl() + "/interfaces/ura/stream_V2"),
+                trips::add
+        );
+
+        // Open the reader.
+        tr.open();
+        // Read for 1 second.
+        TimeUnit.SECONDS.sleep(1);
+        assumeTrue(trips.isEmpty(), "Trips should empty after 1s without reading");
+
+        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.
+        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(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();
+    }
+
+    /**
+     * Test behavior if the stream is closed.
+     *
+     * @throws InterruptedException Thread interrupted.
+     */
+    @Test
+    public void streamClosedTest() throws InterruptedException {
+        // Callback counter for some unhandy async mockery.
+        final AtomicInteger counter = new AtomicInteger(0);
+
+        // The list which will be populated by the callback.
+        Deque<Trip> trips = new ConcurrentLinkedDeque<>();
+
+        // Start with V1 data and read file to mock list.
+        readLinesToMock(1, "/__files/stream_V1_stops_all.txt", 8);
+
+        AsyncUraTripReader tr = new AsyncUraTripReader(
+                URI.create(httpMock.baseUrl() + "/interfaces/ura/stream_V1"),
+                Collections.singletonList(
+                        trip -> {
+                            trips.add(trip);
+                            counter.incrementAndGet();
+                        }
+                )
+        );
+
+        // Open the reader.
+        tr.open();
+
+        // Read for 100ms.
+        TimeUnit.MILLISECONDS.sleep(100);
+        assumeTrue(trips.isEmpty(), "Trips should empty after 100ms without reading");
+
+        // Wait for 1s for the callback to be triggered.
+        TimeUnit.SECONDS.sleep(1);
+
+        assumeTrue(1 == trips.size(), "Unexpected number of trips after first entry");
+
+        // Close the stream.
+        tr.close();
+
+        // Wait for another second.
+        TimeUnit.MILLISECONDS.sleep(1);
+        assertThat("Unexpected number of trips after all lines have been flushed", trips.size(), is(1));
+    }
+
+    @Test
+    public void timeoutTest() throws InterruptedException {
+        // Callback counter for some unhandy async mockery.
+        final AtomicInteger counter = new AtomicInteger(0);
+
+        // The list which will be populated by the callback.
+        Deque<Trip> trips = new ConcurrentLinkedDeque<>();
+
+        // Start with V1 data and read file to mock list.
+        readLinesToMock(1, "/__files/stream_V1_stops_all.txt", 8);
+
+        AsyncUraTripReader tr = new AsyncUraTripReader(
+                URI.create(httpMock.baseUrl() + "/interfaces/ura/stream_V1"),
+                UraClientConfiguration.forBaseURL(httpMock.baseUrl())
+                        .withConnectTimeout(Duration.ofMillis(100))
+                        .build(),
+                Collections.singletonList(
+                        trip -> {
+                            trips.add(trip);
+                            counter.incrementAndGet();
+                        }
+                )
+        );
+
+        // Open the reader.
+        tr.open();
+        // Read for 1 second.
+        TimeUnit.SECONDS.sleep(1);
+        assumeTrue(trips.isEmpty(), "Trips should empty after 1s without reading");
+
+        // Wait another 1s for the callback to be triggered.
+        TimeUnit.SECONDS.sleep(1);
+
+        assertThat("Unexpected number of trips after first entry", trips.size(), is(2));
+
+        // Flush all remaining lines.
+        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(2, "/__files/stream_V2_stops_all.txt", 8);
+
+        tr = new AsyncUraTripReader(
+                URI.create(httpMock.baseUrl() + "/interfaces/ura/stream_V2"),
+                Collections.singletonList(trips::add)
+        );
+
+        // Open the reader.
+        tr.open();
+        // Read for 1 second.
+        TimeUnit.SECONDS.sleep(1);
+        assumeTrue(trips.isEmpty(), "Trips should empty after 1s without reading");
+
+        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.
+        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(5));
+        assertThat("Same object should have been pushed to both lists", trips.containsAll(trips2));
+    }
+
+    /**
+     * Read an input file to the line buffer.
+     *
+     * @param version      API version.
+     * @param resourceFile Resource file name.
+     * @param chunks       Number of chunks.
+     */
+    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)
+                )
+        );
+    }
+
+    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();
+        }
+
+        @Override
+        public String getName() {
+            return "stream-transformer";
+        }
+    }
+}
--- a/src/test/resources/__files/instant_V1_messages.txt
+++ b/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."]
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_stops_circle.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_stops_circle.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_stops_circle_name.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_stops_circle_name.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_all.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_all.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_destination.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_destination.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_line.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_line.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_line_direction.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_line_direction.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_line_name.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_line_name.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_destination.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_destination.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_line.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_line.txt
--- a/src/test/resources/__files/instant_V1_trips_stop_name.txt
+++ b/src/test/resources/__files/instant_V1_trips_stop_name.txt
@ -0,0 +1,11 @@
+[4,"2.0",1483362959788]
+[1,"Uniklinik","100600","H.2",0,50.7756388,6.04425,11,"33","33","1","Aachen Fuchserde","Aachen Fuchserde","318",92000043013001,1483362935000]
+[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,1,"5","5","1","Driescher Hof-Brand","Driescher Hof-Brand","312",92000282009001,1483362936000]
+[1,"Uniklinik","100600","H.4",0,50.7756388,6.04425,33,"45","45","1","Uniklinik","Uniklinik","317",92000285009001,1483363294000]
+[1,"Uniklinik","100600","H.3",0,50.7756388,6.04425,28,"10","3.B","1","Uniklinik-Ponttor-Hbf.","Uniklinik-Ponttor-Hbf.","347",92000053015001,1483363039000]
+[1,"Uniklinik","100600","H.3",0,50.7756388,6.04425,29,"33","33","1","Uniklinik","Uniklinik","529",92000209014001,1483363288000]
+[1,"Uniklinik","100600","H.2",0,50.7756388,6.04425,1,"73","73","1","Aachen Bf.Rothe Erde","Aachen Bf.Rothe Erde","315",92000291016001,1483363080000]
+[1,"Uniklinik","100600","H.3",0,50.7756388,6.04425,29,"10","3.B","1","Uniklinik-Ponttor-Hbf.","Uniklinik-Ponttor-Hbf.","347",92000053015001,1483363099000]
+[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,28,"3","3.A","1","Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","325",92000288012001,1483363080000]
+[1,"Uniklinik","100600","H.2",0,50.7756388,6.04425,6,"70","70","1","Aachen Adenauerallee","Aachen Adenauerallee","588",92000225009001,1483363346000]
+[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,1,"3","3.A","1","Schanz-Hbf.-Ponttor","Schanz-Hbf.-Ponttor",null,92000288013001,1483363380000]
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_towards.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_towards.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_towards.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_towards.txt
--- a/src/test/resources/__files/instant_V2_messages_stop.txt
+++ b/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."]
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V2_stops.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V2_stops.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V2_stops_line.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V2_stops_line.txt
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V2_trips_all.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V2_trips_all.txt
--- a/src/test/resources/__files/stream_V1_stops_all.txt
+++ b/src/test/resources/__files/stream_V1_stops_all.txt
@ -0,0 +1,8 @@
+[4,"1.0",1542370828725]
+[1,"Campus Melaten","100629","",0,50.78247,6.05053,4,"764","3B","2","Ponttor-Hbf.-Schanz","Ponttor-Hbf.-Schanz","327001",16000304013001,1542375720000]
+[1,"Eckenerstraße","100308","",0,50.7539658,6.1541161,15,"65","65","2","Elisenbrunnen","Elisenbrunnen","301001",16000428004001,1542372660000]
+[1,"Talbot","100111","",0,50.7845802,6.1093236,51,"1","1","2","Süsterau-Uniklinik","Süsterau-Uniklinik","305001",16000351007001,1542372900000]
+[1,"Herz. Schulzentrum","210541","",0,50.8642111,6.1053944,1,"831","HZ1","1","Hofstadt","Hofstadt","737001",16000212021001,1542375000000]
+[1,"Weisweiler Ziegelei","213237","",0,50.8254738,6.325058,14,"96","96","1","Langerwehe Schulzentr.","Langerwehe Schulzentr.",null,16000417012001,1542373320000]
+[1,"Pongs","100233","",0,50.7725688,6.1285466,24,"7","7","2","Eilendorf Am Tunnel","Eilendorf Am Tunnel","540001",16000444014001,1542377460000]
+[1,"Velau","215624","",0,50.7893811,6.2223038,17,"8","8","2","Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","568001",16000319014001,1542374400000]
--- a/src/test/resources/__files/stream_V2_stops_all.txt
+++ b/src/test/resources/__files/stream_V2_stops_all.txt
@ -0,0 +1,8 @@
+[4,"2.0",1542370788379]
+[1,"Campus Melaten","100629","",0,50.78247,6.05053,4,"764","3B","2","Ponttor-Hbf.-Schanz","Ponttor-Hbf.-Schanz","327001","16000304013001",1542375720000]
+[1,"Eckenerstraße","100308","",0,50.7539658,6.1541161,15,"65","65","2","Elisenbrunnen","Elisenbrunnen","301001","16000428004001",1542372660000]
+[1,"Talbot","100111","",0,50.7845802,6.1093236,51,"1","1","2","Süsterau-Uniklinik","Süsterau-Uniklinik","305001","16000351007001",1542372900000]
+[1,"Herz. Schulzentrum","210541","",0,50.8642111,6.1053944,1,"831","HZ1","1","Hofstadt","Hofstadt","737001","16000212021001",1542375000000]
+[1,"Weisweiler Ziegelei","213237","",0,50.8254738,6.325058,14,"96","96","1","Langerwehe Schulzentr.","Langerwehe Schulzentr.",null,"16000417012001",1542373320000]
+[1,"Pongs","100233","",0,50.7725688,6.1285466,24,"7","7","2","Eilendorf Am Tunnel","Eilendorf Am Tunnel","540001","16000444014001",1542377460000]
+[1,"Velau","215624","",0,50.7893811,6.2223038,17,"8","8","2","Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","568001","16000319014001",1542374400000]
--- a/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_name.txt
+++ b/src/test/resources/de/stklcode/pubtrans/ura/instant_V1_trips_stop_name.txt
@ -1,11 +0,0 @@
-[4,"2.0",1483362959788]
-[1,"Uniklinik","100600","H.2",0,50.7756388,6.04425,11,"33","33",1,"Aachen Fuchserde","Aachen Fuchserde","318",92000043013001,1483362935000]
-[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,1,"5","5",1,"Driescher Hof-Brand","Driescher Hof-Brand","312",92000282009001,1483362936000]
-[1,"Uniklinik","100600","H.4",0,50.7756388,6.04425,33,"45","45",1,"Uniklinik","Uniklinik","317",92000285009001,1483363294000]
-[1,"Uniklinik","100600","H.3",0,50.7756388,6.04425,28,"10","3.B",1,"Uniklinik-Ponttor-Hbf.","Uniklinik-Ponttor-Hbf.","347",92000053015001,1483363039000]
-[1,"Uniklinik","100600","H.3",0,50.7756388,6.04425,29,"33","33",1,"Uniklinik","Uniklinik","529",92000209014001,1483363288000]
-[1,"Uniklinik","100600","H.2",0,50.7756388,6.04425,1,"73","73",1,"Aachen Bf.Rothe Erde","Aachen Bf.Rothe Erde","315",92000291016001,1483363080000]
-[1,"Uniklinik","100600","H.3",0,50.7756388,6.04425,29,"10","3.B",1,"Uniklinik-Ponttor-Hbf.","Uniklinik-Ponttor-Hbf.","347",92000053015001,1483363099000]
-[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,28,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","325",92000288012001,1483363080000]
-[1,"Uniklinik","100600","H.2",0,50.7756388,6.04425,6,"70","70",1,"Aachen Adenauerallee","Aachen Adenauerallee","588",92000225009001,1483363346000]
-[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,1,"3","3.A",1,"Schanz-Hbf.-Ponttor","Schanz-Hbf.-Ponttor","325",92000288013001,1483363380000]
Author	SHA1	Message	Date
Stefan Kalscheuer	b35e78291b	prepare release 2.0.4 All checks were successful continuous-integration/drone/push Build is passing Details	2022-11-21 14:54:29 +01:00
Stefan Kalscheuer	591476cc60	docs: correct forStops() calls in README All checks were successful continuous-integration/drone/push Build is passing Details	2022-11-21 14:39:26 +01:00
Stefan Kalscheuer	7684b2e089	allow getMessages with limit directly from Query instance	2022-11-21 14:38:37 +01:00
Stefan Kalscheuer	406fe076f1	allow getTrips with limit directly from Query instance	2022-11-21 14:38:36 +01:00
Stefan Kalscheuer	7cb5aefb5b	ci: enable SonarQube analysis for pull requests All checks were successful continuous-integration/drone/push Build is passing Details	2022-11-21 14:38:13 +01:00
Stefan Kalscheuer	0573ed1ade	add implementation details and classpath to JAR manifest All checks were successful continuous-integration/drone/push Build is passing Details	2022-11-21 14:05:09 +01:00
Stefan Kalscheuer	55271011b6	deps: bump jackson-databind from 2.13.3 to 2.14.0 All checks were successful continuous-integration/drone/push Build is passing Details Plus some minor test dependency updates.	2022-11-15 12:13:40 +01:00
Stefan Kalscheuer	b7ae38a343	build and test with JDK 19 All checks were successful continuous-integration/drone/push Build is passing Details	2022-10-13 11:48:53 +02:00
Stefan Kalscheuer	c494c0c81b	deps: bump jackson-databind from 2.13.2.1 to 2.13.3 All checks were successful continuous-integration/drone/push Build is passing Details	2022-08-30 13:21:50 +02:00
Stefan Kalscheuer	bb0d11d10c	test: use JRE8+ version of WireMock for offline testing Some checks reported errors continuous-integration/drone/push Build was killed Details	2022-04-13 17:48:09 +02:00
Stefan Kalscheuer	bcc47d5f05	deps: bump jackson-databind from 2.13.0 to 2.13.2.1 Plus some minor dev-dependency updates.	2022-04-13 17:48:08 +02:00
Stefan Kalscheuer	276c12abc4	readme++ All checks were successful continuous-integration/drone/push Build is passing Details	2021-10-02 15:29:03 +02:00
Stefan Kalscheuer	6fd21e2a03	update dependencies All checks were successful continuous-integration/drone/push Build is passing Details	2021-10-02 15:20:23 +02:00
Stefan Kalscheuer	afef896f12	migrate to GH actions for CI	2021-10-02 15:14:20 +02:00
Stefan Kalscheuer	702247a818	Merge branch 'master' into develop All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-30 18:23:12 +01:00
Stefan Kalscheuer	cecd76ea10	JavaDoc++ All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-30 18:20:21 +01:00
Stefan Kalscheuer	fe14c34b8c	prepare release All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-30 17:39:53 +01:00
Stefan Kalscheuer	465767342f	update copyright notice to 2021 All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-30 17:35:48 +01:00
Stefan Kalscheuer	e723cd4096	extend unit tests for UraClientConfiguration Timeout values are tested in different cases, but for completeness the unit test for UraClientConfiguration checks the values now, too.	2021-01-30 17:34:40 +01:00
Stefan Kalscheuer	10c0967679	remove unused imports All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-30 16:59:47 +01:00
Stefan Kalscheuer	6bf976c010	add timeout configuration to asynchronous trip reader	2021-01-30 16:49:42 +01:00
Stefan Kalscheuer	9e84d9f40d	implement connection and read timeouts for synchronous requests	2021-01-30 16:49:42 +01:00
Stefan Kalscheuer	d3d16e22a0	minor dependency upadtes All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-24 17:31:11 +01:00
Stefan Kalscheuer	242a371f84	Merge branch '1.x' All checks were successful continuous-integration/drone/push Build is passing Details	2020-12-12 14:06:10 +01:00
Stefan Kalscheuer	24b69a29e2	prepare release 1.3.1 All checks were successful continuous-integration/drone/push Build is passing Details	2020-12-12 13:50:35 +01:00
Stefan Kalscheuer	3648d2d653	build with JDK 15 All checks were successful continuous-integration/drone/push Build is passing Details	2020-12-12 12:52:28 +01:00
Stefan Kalscheuer	7b8c81ab21	update dependency Jackson 2.11.3 All checks were successful continuous-integration/drone/push Build is passing Details	2020-12-12 12:26:03 +01:00
Stefan Kalscheuer	2374613a48	update dependency Jackson 2.12 All checks were successful continuous-integration/drone/push Build is passing Details	2020-12-12 12:24:30 +01:00
Stefan Kalscheuer	c314b0c6d4	[backport] remove future from trip reader after closing All checks were successful continuous-integration/drone/push Build is passing Details 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.	2020-10-14 14:22:39 +02:00
Stefan Kalscheuer	b80da71014	remove future from trip reader after closing All checks were successful continuous-integration/drone/push Build is passing Details 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.	2020-10-14 14:19:53 +02:00
Stefan Kalscheuer	69f9e0124a	migrate AsyncUraTripReader to Java 11 HttpClient with custom subscriber All checks were successful continuous-integration/drone/push Build is passing Details Instead of reading the InputStream we now use a custom line subscriber which asynchronously processes each JSON line from the response.	2020-10-14 09:29:55 +02:00
Stefan Kalscheuer	304ab9db7a	add unit tests for IOException handling All checks were successful continuous-integration/drone/push Build is passing Details	2020-10-02 11:00:12 +02:00
Stefan Kalscheuer	dc16c3ffd8	add JDK 15 to build roster All checks were successful continuous-integration/drone/push Build is passing Details	2020-10-02 10:44:55 +02:00
Stefan Kalscheuer	00d4239185	docs: update Travis CI badge All checks were successful continuous-integration/drone/push Build is passing Details	2020-09-08 18:39:47 +02:00
Stefan Kalscheuer	76c9e59244	remove module-info from test sources and re-enable surefire forks All checks were successful continuous-integration/drone/push Build is passing Details	2020-09-08 17:56:35 +02:00
Stefan Kalscheuer	c2fa01ed58	bump javadoc source level to 11	2020-09-08 17:56:26 +02:00
Stefan Kalscheuer	d4fcedc7ca	use StringBuilder for URL generation and extract repeated null checks All checks were successful continuous-integration/drone/push Build is passing Details	2020-09-02 16:47:59 +02:00
Stefan Kalscheuer	9c82481eb5	introduce custom exception class instead of RuntimeExceptions (#10 ) All checks were successful continuous-integration/drone/push Build is passing Details We now use a custom, checked exceptions on errors that can occur with the API communication or configuration. instead of throwing an unchecked IllegalStateException.	2020-09-02 15:47:41 +02:00
Stefan Kalscheuer	b14d040e4f	adjust error messages for failed read operations All checks were successful continuous-integration/drone/push Build is passing Details The error message "failed to read from API" is quite generic. We now add the information what should have been read from API if possible.	2020-08-12 11:50:42 +02:00
Stefan Kalscheuer	8017f2671d	add Serializable type to unserialized JSON lists We don't know about the exact data type from the JSON mapper, so we make it explicitly unknown, but at least Serializable here.	2020-08-12 11:48:55 +02:00
Stefan Kalscheuer	9b80a4e889	introduce UraClientConfiguration class to encapsulate client config Legacy constructors use new pattern internally.	2020-05-22 09:41:04 +02:00
Stefan Kalscheuer	7be56ad740	add module-info	2020-05-22 09:40:02 +02:00
Stefan Kalscheuer	88c10d5333	rewrite HTTP requests using Java 11 HTTP components	2020-05-22 09:40:02 +02:00
Stefan Kalscheuer	10681f4eb3	bump language level to Java 11	2020-05-22 09:40:02 +02:00
Stefan Kalscheuer	dfa4c55496	add serialVersionUID to to serializable classes	2020-05-09 18:55:57 +02:00
Stefan Kalscheuer	38eb883d7d	minor typo fixes	2020-05-09 18:37:46 +02:00
Stefan Kalscheuer	f2d385dada	fix coverage profile	2020-05-08 16:37:35 +02:00
Stefan Kalscheuer	a13dd7a194	rewrite unit tests to work with WireMock instead of class manipulation	2020-05-04 18:05:08 +02:00
Stefan Kalscheuer	706ff495e2	update copyright notice to 2020	2020-05-04 14:46:40 +02:00
Stefan Kalscheuer	9d16a90600	jackson 2.11 + dev dependency updates	2020-05-04 14:33:06 +02:00
Stefan Kalscheuer	ddf65708a7	add JDK 14 to automated builds All checks were successful continuous-integration/drone/push Build is passing Details	2020-04-08 14:37:04 +02:00
Stefan Kalscheuer	a934ee679e	ReadMe++	2019-12-04 14:38:07 +01:00
Stefan Kalscheuer	299f9556d4	prepare release 1.3.0	2019-12-04 14:30:43 +01:00
Stefan Kalscheuer	bc91529721	JavaDoc corrections	2019-12-04 14:29:56 +01:00
Stefan Kalscheuer	7d044a1f95	minor dependency updates	2019-12-04 14:19:49 +01:00
Stefan Kalscheuer	06ce5a22cf	Merge pull request #7 from stklcode/feature/5-messages fetch public messages from API (#5)	2019-12-04 11:59:29 +01:00
Stefan Kalscheuer	d1cf795106	update Jackson dependency to 2.10	2019-11-04 18:11:57 +01:00
Stefan Kalscheuer	5b6c02d6a3	implement client methods for reading messages Reading response type 2 (messages) from API with optional stop filter.	2019-11-04 18:02:59 +01:00
Stefan Kalscheuer	d0e118f1fd	explicitly declare pipeline type in Drone CI configuration	2019-11-04 17:55:34 +01:00
Stefan Kalscheuer	431de69549	typo fixes in comments and test messages [skip ci]	2019-11-04 17:55:10 +01:00
Stefan Kalscheuer	4f3d8694e1	implement model for message responses	2019-11-04 17:15:36 +01:00
Stefan Kalscheuer	2fd8d2a87c	update copyright notice to 2019	2019-11-04 16:54:29 +01:00
Stefan Kalscheuer	4bb7c595c2	update Hamcrest library for testing	2019-10-20 11:51:34 +02:00
Stefan Kalscheuer	8ce5ea3aef	add JDK 13 to automated builds Test all current LTS versions (8, 11) and the latest stable release (13)	2019-10-02 20:18:57 +02:00
Stefan Kalscheuer	ec0ceada2d	Update Jackson dependency to 2.9.10	2019-10-02 20:16:27 +02:00
Stefan Kalscheuer	71902b072b	minor dependency updates	2019-07-26 20:02:14 +02:00
Stefan Kalscheuer	e20baf7b11	fix Javadoc generation with JDK11+	2019-07-26 20:02:00 +02:00
Stefan Kalscheuer	70144573d0	test: add 100ms initial delay before starting to assume anything	2019-06-20 15:00:13 +02:00
Stefan Kalscheuer	e0e2547288	Prepare release 1.2.0	2019-06-20 14:37:12 +02:00
Stefan Kalscheuer	c61e637df9	update Drone CI config, switch to OpenJDK on Travis	2019-06-17 18:58:34 +02:00
Stefan Kalscheuer	dea83e81be	add signing and distribution profiles to POM [skip ci]	2019-06-05 15:59:27 +02:00
Stefan Kalscheuer	fd45bc3db0	Update dependencies	2019-06-02 10:06:28 +02:00
Stefan Kalscheuer	3a2f35047b	test: add unit test for behavior on closed streams	2019-06-02 10:03:53 +02:00
Stefan Kalscheuer	39e1f41c0e	Add AsyncTripReader constructor with single consumer argument	2019-06-02 10:03:14 +02:00
Stefan Kalscheuer	8f8c335e81	Update build and test dependencies	2019-03-22 17:18:23 +01:00
Stefan Kalscheuer	0ecceca35a	Merge branch 'feature/1-streamAPI' into develop	2019-02-06 14:07:59 +01:00
Stefan Kalscheuer	7b212abdc3	Extend unit test for async stream reader	2019-02-05 20:52:10 +01:00
Stefan Kalscheuer	e9e80a4a08	update Jackson dependency to 2.9.8 prevents CVE-2018-19360 through 19362	2019-01-24 20:15:04 +01:00
Stefan Kalscheuer	a2c8f416ba	update Maven images in Drone CI config	2019-01-24 20:08:44 +01:00
Stefan Kalscheuer	d571675a31	Preparations for release 1.1.4	2018-11-19 11:40:57 +01:00
Stefan Kalscheuer	f0205d1cc7	Extend unit tests for accepted Non-Integer values (#2 )	2018-11-17 12:32:14 +01:00
Stefan Kalscheuer	9ff4555ce8	Add URLEncoder to query paraemters to fix issue with special chars (#4 )	2018-11-17 12:19:34 +01:00
Stefan Kalscheuer	bd94a98a30	Add CONTRIBUTING.md [skip ci]	2018-11-16 15:25:16 +01:00
Stefan Kalscheuer	90b7c5cb35	Implement stream reader for trips (#1 )	2018-11-16 15:04:21 +01:00
Stefan Kalscheuer	e957553e80	Bump version to 1.2.0-SNAPSHOT	2018-11-16 11:21:11 +01:00
Stefan Kalscheuer	1698622fc9	Accept NULL for vehicle ID field (fix #3 )	2018-11-16 11:19:45 +01:00
Stefan Kalscheuer	b9656b386a	Accept direction ID as String instead if Integer (fix #2 )	2018-11-16 11:04:27 +01:00
Stefan Kalscheuer	ee91f05898	Preparations for release 1.1.3	2018-11-13 13:52:15 +01:00
Stefan Kalscheuer	83e6e446ba	Updated dependencies	2018-11-13 13:49:06 +01:00
Stefan Kalscheuer	e8ca106037	Migrated Drone Matrix build to Multi-Machine pipeline	2018-11-13 13:49:02 +01:00
Stefan Kalscheuer	5808365777	Fixed Sonarcloud quality gate badge [skip ci]	2018-10-02 22:17:01 +02:00
Stefan Kalscheuer	9e7a2a92ee	Add JDK11 to CI configuration	2018-10-02 22:14:51 +02:00
Stefan Kalscheuer	4de8f3f073	Add Drone CI configuration	2018-08-03 19:23:39 +02:00
Stefan Kalscheuer	8631a43ed8	Add JDK10 to CI configuration	2018-08-03 17:57:42 +02:00
Stefan Kalscheuer	c9444bbc97	Migrated tests to JUnit 5 and removed PowerMock dependency As a replacement for the static mock of the URL class, the tests have been rewritten using ByteBuddy to redefine the calling method.	2018-08-03 17:52:44 +02:00
Stefan Kalscheuer	0d0859bd3a	Updated dependencies and Maven plugins for Java 10 build system compat	2018-08-03 16:14:22 +02:00
Stefan Kalscheuer	d5e09392ef	Client and model classes implement Serializable	2018-03-25 17:37:24 +02:00
Stefan Kalscheuer	d12c585083	Add package-info and overview.html for enhanced Javadoc output	2018-03-25 14:40:37 +02:00