prepare for next development iteration

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.12.1 to 5.12.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.12.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

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

.gitignore

@@ -0,0 +1,15 @@
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+.idea/
+*.iml
+
+*~

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

.travis.yml

@@ -1,3 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8

CHANGELOG.md

@@ -0,0 +1,172 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## 2.0.9 - 2025-04-19
+
+### Dependencies
+* Updated Jackson dependency to 2.18.3
+
+### Improvement
+* Minor adjustments for reproducible builds
+
+
+## 2.0.8 - 2024-10-03
+
+### Fixed
+* Remove `Automatic-Module-Name` from JAR manifest
+
+### Dependencies
+* Updated Jackson dependency to 2.18.0
+
+
+## 2.0.7 - 2024-06-29
+
+### Fixed
+* renamed `UraClientConfiguration#getStreeamPath()` to `getStreamPath()`
+
+### Dependencies
+* Updated Jackson dependency to 2.17.1
+
+### Improvement
+* Generate and attach CycloneDX SBOM
+
+
+## 2.0.6 - 2024-03-23
+### Dependencies
+* Updated Jackson dependency to 2.17.0
+
+### Misc
+* Tested with JDK 21
+
+
+## 2.0.5 - 2023-10-03
+### Dependencies
+* Updated Jackson dependency to 2.15.2
+
+### Misc
+* Tested with JDK 20
+
+
+## 2.0.4 - 2022-11-21
+### Security
+* Updated Jackson dependency to 2.14.0
+
+### Fixed
+* Querying trips and messages with limit directly from `Query` instance (#18)
+
+### 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.3 - 2022-11-21
+### Security
+* Updated Jackson dependency to 2.14.0
+
+### Fixed
+* Querying trips and messages with limit directly from `Query` instance (#19)
+
+
+## 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

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.

README.md

@@ -1,46 +1,89 @@
-jURAclient [![Build status](https://travis-ci.org/stklcode/juraclient.svg?branch=master)](https://travis-ci.org/stklcode/juraclient)
-==========
-
+# jURAclient 
+[![CI](https://github.com/stklcode/juraclient/actions/workflows/ci.yml/badge.svg)](https://github.com/stklcode/juraclient/actions/workflows/ci.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=de.stklcode.pubtrans%3Ajuraclient&metric=alert_status)](https://sonarcloud.io/summary/new_code?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 Version](https://img.shields.io/maven-central/v/de.stklcode.pubtrans/juraclient.svg)](https://central.sonatype.com/artifact/de.stklcode.pubtrans/juraclient)
+[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/stklcode/juraclient/blob/master/LICENSE.txt)
 
 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.
+local bus station or any other custom queries. API versions 1.x and 2.x are supported.
 
-**Usage Example**
+## 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 is no longer supported and will not receive any future updates.
+
+## Usage Examples
+
+### Initialization
 ```java
-// Instantiate the client (e.g. using the ASEAG API)
-UraClient ura = new UraClient("http://ivu.aseag.de");
+// Instantiate the client.
+UraClient ura = new UraClient("https://ura.example.com");
 
-// Initiailize with non-standard endpoints
-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");
 
-// List available stops
-List<Stop> stops = ura.listStops();
+// 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()
+);
+```
 
-// Get next 10 trips for given stops and lines (all filters optional)
-List<Trip> trips = ura.forStop("100000")
+### List Stops
+
+```java
+// List ALL available stops
+List<Stop> stops = ura.getStops();
+
+// List available stops in a 200m radius around given coordinates
+List<Stop> stops = ura.forPosition(51.51009, -0.1345734, 200)
+                      .getStops();
+
+```
+
+### Get Trips
+
+```java
+// Get next 10 trips for given stops and lines in a single direction (all filters optional)
+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.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.0.0</version>
+    <version>2.0.9</version>
 </dependency>
 ```
 
-**Planned features:**
+## License
 
-* 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).

mvnw

@@ -0,0 +1,332 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ]; then
+
+  if [ -f /usr/local/etc/mavenrc ]; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ]; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ]; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+darwin=false
+mingw=false
+case "$(uname)" in
+CYGWIN*) cygwin=true ;;
+MINGW*) mingw=true ;;
+Darwin*)
+  darwin=true
+  # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+  # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+  if [ -z "$JAVA_HOME" ]; then
+    if [ -x "/usr/libexec/java_home" ]; then
+      JAVA_HOME="$(/usr/libexec/java_home)"
+      export JAVA_HOME
+    else
+      JAVA_HOME="/Library/Java/Home"
+      export JAVA_HOME
+    fi
+  fi
+  ;;
+esac
+
+if [ -z "$JAVA_HOME" ]; then
+  if [ -r /etc/gentoo-release ]; then
+    JAVA_HOME=$(java-config --jre-home)
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] \
+    && JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] \
+    && CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw; then
+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \
+    && JAVA_HOME="$(
+      cd "$JAVA_HOME" || (
+        echo "cannot cd into $JAVA_HOME." >&2
+        exit 1
+      )
+      pwd
+    )"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=$(which readlink)
+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
+      if $darwin; then
+        javaHome="$(dirname "$javaExecutable")"
+        javaExecutable="$(cd "$javaHome" && pwd -P)/javac"
+      else
+        javaExecutable="$(readlink -f "$javaExecutable")"
+      fi
+      javaHome="$(dirname "$javaExecutable")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ]; then
+  if [ -n "$JAVA_HOME" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="$(
+      \unset -f command 2>/dev/null
+      \command -v java
+    )"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ]; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  echo "Warning: JAVA_HOME environment variable is not set." >&2
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]; then
+    echo "Path not specified to find_maven_basedir" >&2
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ]; do
+    if [ -d "$wdir"/.mvn ]; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=$(
+        cd "$wdir/.." || exit 1
+        pwd
+      )
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(
+    cd "$basedir" || exit 1
+    pwd
+  )"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    # Remove \r in case we run on Windows within Git Bash
+    # and check out the repository with auto CRLF management
+    # enabled. Otherwise, we may read lines that are delimited with
+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+    # splitting rules.
+    tr -s '\r\n' ' ' <"$1"
+  fi
+}
+
+log() {
+  if [ "$MVNW_VERBOSE" = true ]; then
+    printf '%s\n' "$1"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
+if [ -z "$BASE_DIR" ]; then
+  exit 1
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+  log "Found $wrapperJarPath"
+else
+  log "Couldn't find $wrapperJarPath, downloading it ..."
+
+  if [ -n "$MVNW_REPOURL" ]; then
+    wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
+  else
+    wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
+  fi
+  while IFS="=" read -r key value; do
+    # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
+    safeValue=$(echo "$value" | tr -d '\r')
+    case "$key" in wrapperUrl)
+      wrapperUrl="$safeValue"
+      break
+      ;;
+    esac
+  done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+  log "Downloading from: $wrapperUrl"
+
+  if $cygwin; then
+    wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+  fi
+
+  if command -v wget >/dev/null; then
+    log "Found wget ... using wget"
+    [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+    else
+      wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+    fi
+  elif command -v curl >/dev/null; then
+    log "Found curl ... using curl"
+    [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+    else
+      curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+    fi
+  else
+    log "Falling back to using Java to download"
+    javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+    javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+    # For Cygwin, switch paths to Windows format before running javac
+    if $cygwin; then
+      javaSource=$(cygpath --path --windows "$javaSource")
+      javaClass=$(cygpath --path --windows "$javaClass")
+    fi
+    if [ -e "$javaSource" ]; then
+      if [ ! -e "$javaClass" ]; then
+        log " - Compiling MavenWrapperDownloader.java ..."
+        ("$JAVA_HOME/bin/javac" "$javaSource")
+      fi
+      if [ -e "$javaClass" ]; then
+        log " - Running MavenWrapperDownloader.java ..."
+        ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
+      fi
+    fi
+  fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+  case "$key" in wrapperSha256Sum)
+    wrapperSha256Sum=$value
+    break
+    ;;
+  esac
+done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+  wrapperSha256Result=false
+  if command -v sha256sum >/dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $wrapperSha256Result = false ]; then
+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] \
+    && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] \
+    && CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+  [ -n "$MAVEN_PROJECTBASEDIR" ] \
+    && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+# shellcheck disable=SC2086 # safe args
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,206 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo. >&2
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo. >&2
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo. >&2
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo. >&2
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
+SET WRAPPER_SHA_256_SUM=""
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
+)
+IF NOT %WRAPPER_SHA_256_SUM%=="" (
+    powershell -Command "&{"^
+       "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^
+       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
+       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
+       "  Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
+       "  Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
+       "  Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
+       "  exit 1;"^
+       "}"^
+       "}"
+    if ERRORLEVEL 1 goto error
+)
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%

pom.xml

@@ -5,61 +5,275 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.stklcode.pubtrans</groupId>
-    <artifactId>juraclien</artifactId>
-    <version>1.0.0</version>
+    <artifactId>juraclient</artifactId>
+    <version>2.0.10-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <packaging>jar</packaging>
+
+    <name>jURAclient</name>
+    <description>Java client for URA based public transport API</description>
+    <url>https://github.com/stklcode/juraclient</url>
+    <inceptionYear>2016</inceptionYear>
+
+    <licenses>
+        <license>
+            <name>Apache License 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Stefan Kalscheuer</name>
+            <email>stefan@stklcode.de</email>
+            <timezone>+1</timezone>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:git://github.com/stklcode/juraclient.git</connection>
+        <developerConnection>scm:git:git@github.com:stklcode/juraclient.git</developerConnection>
+        <url>https://github.com/stklcode/juraclient</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <issueManagement>
+        <system>github</system>
+        <url>https://github.com/stklcode/juraclient/issues</url>
+    </issueManagement>
+
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.8.5</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.5</version>
+            <version>2.18.3</version>
         </dependency>
+
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.12.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-junit</artifactId>
-            <version>2.0.0.0</version>
+            <artifactId>hamcrest</artifactId>
+            <version>3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.6</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.6</version>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>3.12.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>5.1.0.4751</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.14.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.5.3</version>
+            </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>coverage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.8.13</version>
+                        <executions>
+                            <execution>
+                                <id>prepare-agent</id>
+                                <goals>
+                                    <goal>prepare-agent</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>report</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>report</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>sources</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>javadoc</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.11.2</version>
+                        <configuration>
+                            <overview>${basedir}/src/main/javadoc/overview.html</overview>
+                            <source>11</source>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>sbom</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.cyclonedx</groupId>
+                        <artifactId>cyclonedx-maven-plugin</artifactId>
+                        <version>2.9.1</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>makeBom</goal>
+                                </goals>
+                                <configuration>
+                                    <skipNotDeployed>false</skipNotDeployed>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.2.7</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>central</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>0.7.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central</publishingServerId>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stefan Kalscheuer
+ * Copyright 2016-2024 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 <stefan@stklcode.de>
+ * @author Stefan Kalscheuer
  */
-public class UraClient {
-    private static final String DEFAULT_INSTANT_URL = "/interfaces/ura/instant_V2";
-    private static final String DEFAULT_STREAM_URL = "/interfaces/ura/stream_V2";
+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";
@@ -51,41 +61,68 @@ public class UraClient {
     private static final String PAR_VEHICLE_ID = "VehicleID";
     private static final String PAR_TRIP_ID = "TripID";
     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)
+     * @param baseURL The base URL (with protocol, without trailing slash).
      */
-    public UraClient(String baseURL) {
-        this(baseURL, DEFAULT_INSTANT_URL, DEFAULT_STREAM_URL);
+    public UraClient(final String baseURL) {
+        this(UraClientConfiguration.forBaseURL(baseURL).build());
     }
 
     /**
-     * Constructor with base URL and custom API paths
+     * 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(String baseURL, String instantURL, 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()
+        );
     }
 
     /**
@@ -94,7 +131,7 @@ public class UraClient {
      * @param stops Stop IDs
      * @return the request
      */
-    public Query forStops(final String...stops) {
+    public final Query forStops(final String... stops) {
         return new Query().forStops(stops);
     }
 
@@ -104,57 +141,99 @@ public class UraClient {
      * @param stopNames Stop Point Names
      * @return the request
      */
-    public Query forStopsByName(final String...stopNames) {
+    public final Query forStopsByName(final String... stopNames) {
         return new Query().forStopsByName(stopNames);
     }
 
     /**
      * Builder pattern to request given line IDs.
      *
-     * @param lines line IDs
-     * @return the request
+     * @param lines Line IDs.
+     * @return The request.
      */
-    public Query forLines(final String...lines) {
+    public final Query forLines(final String... lines) {
         return new Query().forLines(lines);
     }
 
     /**
      * Builder pattern to request given line names.
      *
-     * @param lineNames line names
-     * @return the request
+     * @param lineNames Line names.
+     * @return The request.
      */
-    public Query forLinesByName(final String...lineNames) {
+    public final Query forLinesByName(final String... lineNames) {
         return new Query().forLinesByName(lineNames);
     }
 
     /**
      * Builder pattern to request given direction.
      *
-     * @param direction the direction ID
-     * @return the request
+     * @param direction The direction ID.
+     * @return The request.
      */
-    public Query forDirection(final Integer direction) {
+    public final Query forDirection(final Integer direction) {
         return new Query().forDirection(direction);
     }
 
+    /**
+     * Builder pattern to request given destination names.
+     *
+     * @param destinationNames Destination names.
+     * @return The request.
+     * @since 1.1.0
+     */
+    public final Query forDestinationNames(final String... destinationNames) {
+        return new Query().forDestinationNames(destinationNames);
+    }
+
+    /**
+     * Builder pattern to request given direction defined by stop point name.
+     *
+     * @param towards Towards stop point names.
+     * @return The request.
+     * @since 1.1.0
+     */
+    public final Query towards(final String... towards) {
+        return new Query().towards(towards);
+    }
+
+    /**
+     * Builder pattern to request given destination names.
+     *
+     * @param latitude  Latitude (WGS84).
+     * @param longitude Longitude (WGS84).
+     * @param radius    Search radius (meters).
+     * @return The request.
+     * @since 1.1.0
+     */
+    public final Query forPosition(final Double latitude, final Double longitude, final Integer radius) {
+        return new Query().forPosition(latitude, longitude, radius);
+    }
+
     /**
      * Get list of trips.
      * If forStops() and/or forLines() has been called, those will be used as filter.
      *
-     * @return list of trips
+     * @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.
      *
-     * @return list of trips
+     * @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);
     }
 
@@ -162,108 +241,311 @@ public class UraClient {
      * Get list of trips.
      * If forStops() and/or forLines() has been called, those will be used as filter.
      *
-     * @return list of trips
+     * @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(Query query) {
+    public List<Trip> getTrips(final Query query) throws UraClientException {
         return getTrips(query, null);
     }
 
     /**
      * Get list of trips for given stopIDs and lineIDs with result limit.
      *
-     * @param query the request
-     * @param limit   maximum number of results
-     * @return list of trips
+     * @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.stopIDs, query.stopNames, query.lineIDs, query.lineNames, query.direction);
+        try (InputStream is = requestInstant(REQUEST_TRIP, query);
              BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
-            String line;
-            while ((line = br.readLine()) != null && (limit == null || trips.size() < limit)) {
-                List l = mapper.readValue(line, List.class);
+            String version = null;
+            String line = br.readLine();
+            while (line != null && (limit == null || trips.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.size() > 0 && l.get(0).equals(RES_TYPE_PREDICTION))
-                    trips.add(new Trip(l));
+                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)) {
+                        trips.add(new Trip(l, version));
+                    }
+                }
+                line = br.readLine();
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            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.getStreamPath(), 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 the 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.
      *
-     * @return the list
+     * @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(Query query) {
+    public List<Stop> getStops(final Query query) throws UraClientException {
         List<Stop> stops = new ArrayList<>();
-        try (InputStream is = requestInstant(REQUEST_STOP, query.stopIDs, query.stopNames, query.lineIDs, query.lineNames, query.direction);
+        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.size() > 0 && l.get(0).equals(RES_TYPE_STOP))
+                if (l != null && !l.isEmpty() && l.get(0).equals(RES_TYPE_STOP)) {
                     stops.add(new Stop(l));
+                }
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            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
-     * @return Input stream of the URL
+     * @param returnList Fields to fetch.
+     * @param query      The query.
+     * @return Response {@link InputStream}.
      * @throws IOException on errors
      */
-    private InputStream requestInstant(String[] returnList, String[] stopIDs, String[] stopNames, String[] lineIDs, String[] lineNames, Integer direction) throws IOException {
-        String urlStr = baseURL + instantURL + "?ReturnList=" + String.join(",", returnList);
-        if (stopIDs != null && stopIDs.length > 0)
-            urlStr += "&" + PAR_STOP_ID + "=" + String.join(",", stopIDs);
-        if (stopNames != null && stopNames.length > 0)
-            urlStr += "&" + PAR_STOP_NAME + "=" + String.join(",", stopNames);
-        if (lineIDs != null && lineIDs.length > 0)
-            urlStr += "&" + PAR_LINE_ID + "=" + String.join(",", lineIDs);
-        if (lineNames != null && lineNames.length > 0)
-            urlStr += "&" + PAR_LINE_NAME + "=" + String.join(",", lineNames);
-        if (direction != null)
-            urlStr += "&" + PAR_DIR_ID + "=" + direction;
-        URL url = new URL(urlStr);
-        return url.openStream();
+    private InputStream requestInstant(final String[] returnList, final Query query) throws IOException {
+        return request(requestURL(config.getBaseURL() + config.getInstantPath(), returnList, query));
+    }
+
+    /**
+     * 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.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.append("&").append(PAR_CIRCLE).append("=").append(URLEncoder.encode(query.circle, UTF_8));
+        }
+
+        return urlStr.toString();
+    }
+
+    /**
+     * 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));
+        }
     }
 
     /**
      * Request meta object.
      */
-    public class Query {
+    public final class Query {
         private String[] stopIDs;
         private String[] stopNames;
         private String[] lineIDs;
         private String[] lineNames;
         private Integer direction;
+        private String[] destinationNames;
+        private String[] towards;
+        private String circle;
 
         /**
          * Builder pattern to request given line IDs.
          *
-         * @param lineIDs line IDs
-         * @return the query
+         * @param lineIDs Line IDs.
+         * @return The query.
          */
-        public Query forLines(final String...lineIDs) {
+        public Query forLines(final String... lineIDs) {
             this.lineIDs = lineIDs;
             return this;
         }
@@ -271,10 +553,10 @@ public class UraClient {
         /**
          * Builder pattern to request given line names.
          *
-         * @param lineNames line names
-         * @return the query
+         * @param lineNames Line names.
+         * @return The query.
          */
-        public Query forLinesByName(final String...lineNames) {
+        public Query forLinesByName(final String... lineNames) {
             this.lineNames = lineNames;
             return this;
         }
@@ -282,10 +564,10 @@ public class UraClient {
         /**
          * Builder pattern to request given stop IDs.
          *
-         * @param stopIDs stop IDs
-         * @return the query
+         * @param stopIDs Stop IDs.
+         * @return The query.
          */
-        public Query forStops(final String...stopIDs) {
+        public Query forStops(final String... stopIDs) {
             this.stopIDs = stopIDs;
             return this;
         }
@@ -293,10 +575,10 @@ public class UraClient {
         /**
          * Builder pattern to request given stop names.
          *
-         * @param stopNames line names
-         * @return the query
+         * @param stopNames Line names.
+         * @return The query.
          */
-        public Query forStopsByName(final String...stopNames) {
+        public Query forStopsByName(final String... stopNames) {
             this.stopNames = stopNames;
             return this;
         }
@@ -304,30 +586,135 @@ public class UraClient {
         /**
          * Builder pattern to request given direction.
          *
-         * @param direction the direction
-         * @return the query
+         * @param direction The direction.
+         * @return The query.
          */
         public Query forDirection(final Integer direction) {
             this.direction = direction;
             return this;
         }
 
+        /**
+         * Builder pattern to request given destination names.
+         *
+         * @param destinationNames Names of destinations.
+         * @return The query.
+         * @since 1.1.0
+         */
+        public Query forDestinationNames(final String... destinationNames) {
+            this.destinationNames = destinationNames;
+            return this;
+        }
+
+        /**
+         * Builder pattern to request given direction defined by stop point name.
+         *
+         * @param towards Towards stop point names.
+         * @return The request.
+         * @since 1.1.0
+         */
+        public Query towards(final String... towards) {
+            this.towards = towards;
+            return this;
+        }
+
+        /**
+         * Builder pattern to request given position and radius.
+         *
+         * @param latitude  Latitude (WGS84).
+         * @param longitude Longitude (WGS84).
+         * @param radius    Search radius (meters).
+         * @return The query.
+         * @since 1.1.0
+         */
+        public Query forPosition(final Double latitude, final Double longitude, final Integer radius) {
+            this.circle = latitude.toString() + "," + longitude.toString() + "," + radius.toString();
+            return this;
+        }
+
         /**
          * Get stops for set filters.
          *
-         * @return List of matching trips
+         * @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);
         }
 
         /**
          * Get trips for set filters.
          *
-         * @return List of matching trips
+         * @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);
+        }
     }
 }

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

@@ -0,0 +1,205 @@
+/*
+ * Copyright 2016-2024 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;
+
+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 getStreamPath() {
+        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);
+        }
+    }
+}

src/main/java/de/stklcode/pubtrans/ura/exception/UraClientConfigurationException.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016-2024 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);
+    }
+}

src/main/java/de/stklcode/pubtrans/ura/exception/UraClientException.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016-2024 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);
+    }
+}

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2024 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;

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

@@ -0,0 +1,222 @@
+/*
+ * Copyright 2016-2024 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 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;
+    }
+}

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016-2024 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 java.io.IOException;
+import java.io.Serializable;
+
+/**
+ * Interface for model classes to bundle common methods.
+ *
+ * @author Stefan Kalscheuer
+ * @since 1.1.1
+ */
+interface Model extends Serializable {
+    /**
+     * Generate exception for unmatched type when String is expected.
+     *
+     * @param field  Field number.
+     * @param actual Actual class.
+     * @return The Exception.
+     */
+    static IOException typeErrorString(int field, Class<?> actual) {
+        return typeError(field, actual, "String");
+    }
+
+    /**
+     * Generate exception for unmatched type.
+     *
+     * @param field    Field number.
+     * @param actual   Actual class.
+     * @param expected Expected type.
+     * @return The Exception.
+     */
+    static IOException typeError(int field, Class<?> actual, String expected) {
+        return new IOException(String.format("Field %d not of expected type %s, found %s",
+                field, expected, actual.getSimpleName()));
+    }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stefan Kalscheuer
+ * Copyright 2016-2024 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,22 +17,71 @@
 package de.stklcode.pubtrans.ura.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * Entity for a single stop.
  *
- * @author Stefan Kalscheuer <stefan@stklcode.de>
+ * @author Stefan Kalscheuer
  */
-public class Stop {
+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;
+    private static final int F_STATE = 4;
+    private static final int F_LATITUDE = 5;
+    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;
 
-    public Stop(String id, String name, String indicator, Integer state, Double latitude, Double longitude) {
+    /**
+     * Construct Stop object.
+     *
+     * @param id        Stop ID.
+     * @param name      Stop name.
+     * @param indicator Stop indicator.
+     * @param state     Stop state.
+     * @param latitude  Stop geolocation latitude.
+     * @param longitude Stop geolocation longitude.
+     */
+    public Stop(final String id,
+                final String name,
+                final String indicator,
+                final Integer state,
+                final Double latitude,
+                final Double longitude) {
         this.id = id;
         this.name = name;
         this.indicator = indicator;
@@ -41,56 +90,116 @@ public class Stop {
         this.longitude = longitude;
     }
 
-    public Stop(List raw) throws IOException {
-        if (raw == null || raw.size() < 7)
+    /**
+     * Construct Stop 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 Stop(final List<Serializable> raw) throws IOException {
+        if (raw == null || raw.size() < F_NUM_OF_FIELDS) {
             throw new IOException("Invalid number of fields");
+        }
 
-        if (raw.get(1) instanceof String)
-            name = (String)raw.get(1);
-        else
-            throw new IOException("Field 1 not of expected type String, found " + raw.get(1).getClass().getSimpleName());
-        if (raw.get(2) instanceof String)
-            id = (String)raw.get(2);
-        else
-            throw new IOException("Field 2 not of expected type String, found " + raw.get(2).getClass().getSimpleName());
-        if (raw.get(3) instanceof String)
-            indicator = (String)raw.get(3);
-        else
-            throw new IOException("Field 3 not of expected type String, found " + raw.get(3).getClass().getSimpleName());
-        if (raw.get(4) instanceof Integer)
-            state = (Integer)raw.get(4);
-        else
-            throw new IOException("Field 4 not of expected type Integer, found " + raw.get(4).getClass().getSimpleName());
-        if (raw.get(5) instanceof Double)
-            latitude = (Double)raw.get(5);
-        else
-            throw new IOException("Field 5 not of expected type Double, found " + raw.get(5).getClass().getSimpleName());
-        if (raw.get(6) instanceof Double)
-            longitude = (Double)raw.get(6);
-        else
-            throw new IOException("Field 6 not of expected type Double, found " + raw.get(6).getClass().getSimpleName());
+        if (raw.get(1) instanceof String) {
+            name = (String) raw.get(F_STOP_NAME);
+        } else {
+            throw Model.typeErrorString(F_STOP_NAME, raw.get(F_STOP_NAME).getClass());
+        }
+
+        if (raw.get(F_STOP_ID) instanceof String) {
+            id = (String) raw.get(F_STOP_ID);
+        } else {
+            throw Model.typeErrorString(F_STOP_ID, raw.get(F_STOP_ID).getClass());
+        }
+
+        if (raw.get(F_INDICATOR) instanceof String) {
+            indicator = (String) raw.get(F_INDICATOR);
+        } else if (raw.get(F_INDICATOR) == null) {
+            indicator = null;
+        } else {
+            throw Model.typeErrorString(F_INDICATOR, raw.get(F_INDICATOR).getClass());
+        }
+
+        if (raw.get(F_STATE) instanceof Integer) {
+            state = (Integer) raw.get(F_STATE);
+        } else {
+            throw Model.typeError(F_STATE, raw.get(F_STATE).getClass(), "Integer");
+        }
+
+        if (raw.get(F_LATITUDE) instanceof Double) {
+            latitude = (Double) raw.get(F_LATITUDE);
+        } else {
+            throw Model.typeError(F_LATITUDE, raw.get(F_LATITUDE).getClass(), "Double");
+        }
+
+        if (raw.get(F_LONGITUDE) instanceof Double) {
+            longitude = (Double) raw.get(F_LONGITUDE);
+        } else {
+            throw Model.typeError(F_LONGITUDE, raw.get(F_LONGITUDE).getClass(), "Double");
+        }
     }
 
+    /**
+     * Stop identifier.
+     *
+     * @return The stop ID.
+     */
     public String getId() {
         return id;
     }
 
+    /**
+     * The name of the bus stop.
+     *
+     * @return The stop name.
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * 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() {
         return 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;
     }
 
+    /**
+     * 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 is expressed using the WGS84 coordinate system.
+     *
+     * @return The stop geolocation longitude.
+     */
     public Double getLongitude() {
         return longitude;
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stefan Kalscheuer
+ * Copyright 2016-2024 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,32 +17,153 @@
 package de.stklcode.pubtrans.ura.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * Entity for a single trip.
  *
- * @author Stefan Kalscheuer <stefan@stklcode.de>
+ * @author Stefan Kalscheuer
  */
-public class Trip {
+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;
+    private static final int DIRECTION_ID = 10;
+    private static final int DESTINATION_NAME = 11;
+    private static final int DESTINATION_TEXT = 12;
+    private static final int VEHICLE_ID = 13;
+    private static final int TRIP_ID = 14;
+    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;
 
-    public Trip(String stopID, String stopName, String stopIndicator, Integer stopState, Double stopLatitude, Double stopLongitude,
-                Integer visitID, String lineID, String lineName, Integer directionID, String destinationName, String destinationText, String vehicleID, String tripID, Long estimatedTime) {
-        this(new Stop(stopID, stopName, stopIndicator, stopState, stopLatitude, stopLongitude),
-                visitID, lineID, lineName, directionID, destinationName, destinationText, vehicleID, tripID, estimatedTime);
+    /**
+     * Construct Trip 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 visitID         Visit ID.
+     * @param lineID          Line ID.
+     * @param lineName        Line name.
+     * @param directionID     Direction ID.
+     * @param destinationName Destination name.
+     * @param destinationText Destination text.
+     * @param vehicleID       Vehicle ID.
+     * @param tripID          Trip ID.
+     * @param estimatedTime   Estimated time.
+     */
+    public Trip(final String stopID,
+                final String stopName,
+                final String stopIndicator,
+                final Integer stopState,
+                final Double stopLatitude,
+                final Double stopLongitude,
+                final Integer visitID,
+                final String lineID,
+                final String lineName,
+                final Integer directionID,
+                final String destinationName,
+                final String destinationText,
+                final String vehicleID,
+                final String tripID,
+                final Long estimatedTime) {
+        this(new Stop(stopID,
+                        stopName,
+                        stopIndicator,
+                        stopState,
+                        stopLatitude,
+                        stopLongitude),
+                visitID,
+                lineID,
+                lineName,
+                directionID,
+                destinationName,
+                destinationText,
+                vehicleID,
+                tripID,
+                estimatedTime);
     }
 
-    public Trip(Stop stop, Integer visitID, String lineID, String lineName, Integer directionID, String destinationName, String destinationText, String vehicleID, String tripID, Long estimatedTime) {
+    /**
+     * Construct Trip object from Stop model and set of additional data.
+     *
+     * @param stop            Stop model
+     * @param visitID         Visit ID
+     * @param lineID          Line ID
+     * @param lineName        Line name
+     * @param directionID     Direction ID
+     * @param destinationName Destination name
+     * @param destinationText Destination text
+     * @param vehicleID       Vehicle ID
+     * @param tripID          Trip ID
+     * @param estimatedTime   Estimated time
+     */
+    public Trip(final Stop stop,
+                final Integer visitID,
+                final String lineID,
+                final String lineName,
+                final Integer directionID,
+                final String destinationName,
+                final String destinationText,
+                final String vehicleID,
+                final String tripID,
+                final Long estimatedTime) {
         this.stop = stop;
         this.visitID = visitID;
         this.lineID = lineID;
@@ -55,86 +176,186 @@ public class Trip {
         this.estimatedTime = estimatedTime;
     }
 
-    public Trip(List raw) throws IOException {
-        if (raw == null || raw.size() < 16)
+    /**
+     * Construct Trip 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 Trip(final List<Serializable> raw) throws IOException {
+        this(raw, null);
+    }
+
+    /**
+     * 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<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(7) instanceof Integer)
-            visitID = (Integer) raw.get(7);
-        else
-            throw new IOException("Field 7 not of expected type Integer, found " + raw.get(7).getClass().getSimpleName());
-        if (raw.get(8) instanceof String)
-            lineID = (String)raw.get(8);
-        else
-            throw new IOException("Field 8 not of expected type String, found " + raw.get(8).getClass().getSimpleName());
-        if (raw.get(9) instanceof String)
-            lineName = (String)raw.get(9);
-        else
-            throw new IOException("Field 9 not of expected type String, found " + raw.get(9).getClass().getSimpleName());
-        if (raw.get(10) instanceof Integer)
-            directionID = (Integer)raw.get(10);
-        else
-            throw new IOException("Field 10 not of expected type Integer, found " + raw.get(10).getClass().getSimpleName());
-        if (raw.get(11) instanceof String)
-            destinationName = (String)raw.get(11);
-        else
-            throw new IOException("Field 11 not of expected type String, found " + raw.get(11).getClass().getSimpleName());
-        if (raw.get(12) instanceof String)
-            destinationText = (String)raw.get(12);
-        else
-            throw new IOException("Field 12 not of expected type String, found " + raw.get(12).getClass().getSimpleName());
-        if (raw.get(13) instanceof String)
-            vehicleID = (String)raw.get(13);
-        else
-            throw new IOException("Field 13 not of expected type String, found " + raw.get(13).getClass().getSimpleName());
-        if (raw.get(14) instanceof String)
-            id = (String)raw.get(14);
-        else
-            throw new IOException("Field 14 not of expected type String, found " + raw.get(14).getClass().getSimpleName());
-        if (raw.get(15) instanceof Long)
-            estimatedTime = (Long)raw.get(15);
-        else
-            throw new IOException("Field 15 not of expected type Long, found " + raw.get(15).getClass().getSimpleName());
+        if (raw.get(VISIT_ID) instanceof Integer) {
+            visitID = (Integer) raw.get(VISIT_ID);
+        } else {
+            throw Model.typeError(VISIT_ID, raw.get(VISIT_ID).getClass(), "Integer");
+        }
+
+        if (raw.get(LINE_ID) instanceof String) {
+            lineID = (String) raw.get(LINE_ID);
+        } else {
+            throw Model.typeErrorString(LINE_ID, raw.get(LINE_ID).getClass());
+        }
+
+        if (raw.get(LINE_NAME) instanceof String) {
+            lineName = (String) raw.get(LINE_NAME);
+        } else {
+            throw Model.typeErrorString(LINE_NAME, raw.get(LINE_NAME).getClass());
+        }
+
+        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(), "String/Long/Integer");
+        }
+
+        if (raw.get(DESTINATION_NAME) instanceof String) {
+            destinationName = (String) raw.get(DESTINATION_NAME);
+        } else {
+            throw Model.typeErrorString(DESTINATION_NAME, raw.get(DESTINATION_NAME).getClass());
+        }
+
+        if (raw.get(DESTINATION_TEXT) instanceof String) {
+            destinationText = (String) raw.get(DESTINATION_TEXT);
+        } else {
+            throw Model.typeErrorString(DESTINATION_TEXT, raw.get(DESTINATION_TEXT).getClass());
+        }
+
+        /* TFL and ASEAG deliver different types with the same API version, so this field is a little more tolerant */
+        if (raw.get(VEHICLE_ID) instanceof String
+                || 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");
+        }
+
+        if (raw.get(TRIP_ID) instanceof String
+                || raw.get(TRIP_ID) instanceof Integer
+                || raw.get(TRIP_ID) instanceof Long) {
+            id = raw.get(TRIP_ID).toString();
+        } else {
+            throw Model.typeError(TRIP_ID, raw.get(TRIP_ID).getClass(), "String/Integer/Long");
+        }
+
+        if (raw.get(ESTIMATED_TIME) instanceof Long) {
+            estimatedTime = (Long) raw.get(ESTIMATED_TIME);
+        } else {
+            throw Model.typeError(ESTIMATED_TIME, raw.get(ESTIMATED_TIME).getClass(), "Long");
+        }
     }
 
+    /**
+     * The starting stop.
+     *
+     * @return The (starting) stop.
+     */
     public Stop getStop() {
         return stop;
     }
 
+    /**
+     * @return The trip ID.
+     */
     public String getId() {
         return id;
     }
 
+    /**
+     * Visit identifier.
+     *
+     * @return The visit ID.
+     */
     public Integer getVisitID() {
         return visitID;
     }
 
+    /**
+     * 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() {
         return lineID;
     }
 
+    /**
+     * 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() {
         return lineName;
     }
 
+    /**
+     * 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() {
         return directionID;
     }
 
+    /**
+     * 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() {
         return destinationName;
     }
 
+    /**
+     * 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() {
         return destinationText;
     }
 
+    /**
+     * 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() {
         return estimatedTime;
     }
 
+    /**
+     * 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;
     }

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2024 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;

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2024 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;

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

@@ -0,0 +1,225 @@
+/*
+ * Copyright 2016-2024 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();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2024 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;

src/main/java/module-info.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2016-2024 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;
+}

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>

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016-2024 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;
+
+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
+ */
+class UraClientConfigurationTest {
+    @Test
+    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.getStreamPath(), "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.getStreamPath(), "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");
+    }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stefan Kalscheuer
+ * Copyright 2016-2024 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,91 +16,165 @@
 
 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.core.Is.is;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit test for the URA Client.
- * Tests run against mocked data collected from hte ASEAG API (http://ivu.aseag.de/)
+ * Tests run against mocked data collected from ASEAG API (no longer available) and
+ * TFL API (<a href="https://countdown.api.tfl.gov.uk">https://countdown.api.tfl.gov.uk</a>)
  *
+ * @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_stops.txt"));
+class UraClientTest {
 
-        /* List stops and verify some values */
-        List<Stop> stops = new UraClient("mocked").getStops();
+    @RegisterExtension
+    static WireMockExtension wireMock = WireMockExtension.newInstance()
+            .options(wireMockConfig().dynamicPort())
+            .build();
+
+    @Test
+    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.");
-            }
-        });
-        assertThat(new UraClient("mocked").getStops(), hasSize(0));
-        PowerMockito.when(mockURL.openStream()).thenThrow(new IOException("Provoked exception 2."));
-        assertThat(new UraClient("mocked").getStops(), hasSize(0));
+        // Test Exception handling.
+        mockHttpToError(500);
+
+        try {
+            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(), 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_stops_line.txt"));
+    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 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_trips_all.txt"));
+    void getStopsForPositionTest() throws UraClientException {
+        // Mock the HTTP call.
+        mockHttpToFile(1, "instant_V1_stops_circle.txt");
 
-        /* Get trips without filters and verify some values */
-        List<Trip> trips = new UraClient("mocked").getTrips();
+        // 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(3).getLatitude(), is(51.509154));
+        assertThat(stops.get(4).getLongitude(), is(-0.134172));
+        assertThat(stops.get(5).getIndicator(), is(nullValue()));
+
+        mockHttpToFile(1, "instant_V1_stops_circle_name.txt");
+        stops = new UraClient(wireMock.baseUrl())
+                .forStopsByName("Piccadilly Circus")
+                .forPosition(51.51009, -0.1345734, 200)
+                .getStops();
+        assertThat(stops, hasSize(7));
+        assertThat(stops.stream().filter(t -> !t.getName().equals("Piccadilly Circus")).findAny(), is(Optional.empty()));
+    }
+
+    @Test
+    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(wireMock.baseUrl()).forDestinationNames("Piccadilly Circus").getTrips();
+        assertThat(trips, hasSize(9));
+        assertThat(trips.stream().filter(t -> !t.getDestinationName().equals("Piccadilly Cir")).findAny(),
+                is(Optional.empty()));
+
+        mockHttpToFile(1, "instant_V1_trips_stop_destination.txt");
+        trips = new UraClient(wireMock.baseUrl())
+                .forStops("156")
+                .forDestinationNames("Marble Arch")
+                .getTrips();
+        assertThat(trips, hasSize(5));
+        assertThat(trips.stream().filter(t -> !t.getStop().getId().equals("156")).findAny(),
+                is(Optional.empty()));
+        assertThat(trips.stream().filter(t -> !t.getDestinationName().equals("Marble Arch")).findAny(),
+                is(Optional.empty()));
+    }
+
+    @Test
+    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(wireMock.baseUrl()).towards("Marble Arch").getTrips();
+        assertThat(trips, hasSize(10));
+
+        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
+    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(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"));
@@ -109,123 +183,300 @@ 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_trips_all.txt"));
-        trips = new UraClient("mocked").getTrips(5);
+        // 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(3).getDirectionID(), is(1));
+        assertThat(trips.get(4).getDestinationName(), is("Verlautenheide Endstr."));
+        assertThat(trips.get(5).getDestinationText(), is("Aachen Bushof"));
+        assertThat(trips.get(6).getVehicleID(), is("247"));
+        assertThat(trips.get(7).getEstimatedTime(), is(1482854580000L));
+        assertThat(trips.get(8).getVisitID(), is(30));
+        assertThat(trips.get(9).getStop().getId(), is("100002"));
+
+        // 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.");
-            }
-        });
-        assertThat(new UraClient("mocked").getTrips(), hasSize(0));
-        PowerMockito.when(mockURL.openStream()).thenThrow(new IOException("Provoked exception 2."));
-        assertThat(new UraClient("mocked").getTrips(), hasSize(0));
+        // Test mockException handling.
+        mockHttpToError(502);
+        try {
+            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(), 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");
+        assertInstanceOf(IOException.class, exception.getCause(), "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_trips_stop.txt"));
+    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_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));
-        assertThat(trips.stream().filter(t -> !t.getStop().getName().equals("Uniklinik")).findAny(), is(Optional.empty()));
+        assertThat(trips.stream().filter(t -> !t.getStop().getName().equals("Uniklinik")).findAny(),
+                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");
+        assertInstanceOf(IOException.class, exception.getCause(), "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_trips_line.txt"));
+    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_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_trips_line_direction.txt"));
-        trips = new UraClient("mocked")
-                .forLines("3")
-                .forDirection(1)
+        // 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();
         assertThat(trips, hasSize(10));
-        assertThat(trips.stream().filter(t -> !t.getLineID().equals("3")).findAny(), is(Optional.empty()));
-        assertThat(trips.stream().filter(t -> !t.getDirectionID().equals(1)).findAny(), is(Optional.empty()));
+        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_trips_line_direction.txt"));
-        trips = new UraClient("mocked")
-                .forDirection(1)
-                .forLines("3")
+        // 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();
         assertThat(trips, hasSize(10));
-        assertThat(trips.stream().filter(t -> !t.getLineID().equals("3")).findAny(), is(Optional.empty()));
-        assertThat(trips.stream().filter(t -> !t.getDirectionID().equals(1)).findAny(), is(Optional.empty()));
+        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
-    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_trips_stop_line.txt"));
+    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();
         assertThat(trips, hasSize(10));
-        assertThat(trips.stream().filter(t -> !t.getLineID().equals("25") && !t.getLineID().equals("35")).findAny(), is(Optional.empty()));
+        assertThat(trips.stream().filter(t -> !t.getLineID().equals("25") && !t.getLineID().equals("35")).findAny(),
+                is(Optional.empty()));
         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
+    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");
+        assertInstanceOf(IOException.class, exception.getCause(), "Unexpected error cause");
+    }
+
+    @Test
+    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
+    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"
+        );
+        assertInstanceOf(HttpConnectTimeoutException.class, exception.getCause(), "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"
+        );
+        assertInstanceOf(HttpTimeoutException.class, exception.getCause(), "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)
+                )
+        );
+    }
 }

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

@@ -0,0 +1,154 @@
+/*
+ * Copyright 2016-2024 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} model.
+ *
+ * @author Stefan Kalscheuer
+ */
+class MessageTest {
+    @Test
+    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
+    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)));
+        }
+    }
+}

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

@@ -1,8 +1,25 @@
+/*
+ * Copyright 2016-2024 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.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,16 +27,16 @@ 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} model.
  *
- * @author Stefan Kalscheuer <stefan@stklcode.de>
+ * @author Stefan Kalscheuer
  */
-public class StopTest {
+class StopTest {
     @Test
-    public void basicConstructorTest() {
+    void basicConstructorTest() {
         Stop stop = new Stop("id", "name", "indicator", 1, 2.345, 6.789);
         assertThat(stop.getId(), is("id"));
         assertThat(stop.getName(), is("name"));
@@ -30,9 +47,9 @@ public class StopTest {
     }
 
     @Test
-    public void listConstructorTest() {
+    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");
@@ -64,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)));
         }
@@ -79,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)));
         }
@@ -89,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)));
         }
@@ -99,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)));
         }
@@ -109,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)));
         }
@@ -119,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)));
         }
@@ -128,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)));
         }

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

@@ -1,8 +1,25 @@
+/*
+ * Copyright 2016-2024 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.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,18 +27,31 @@ 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} model.
  *
- * @author Stefan Kalscheuer <stefan@stklcode.de>
+ * @author Stefan Kalscheuer
  */
-public class TripTest {
+class TripTest {
     @Test
-    public void basicConstructorTest() {
-        Trip trip = new Trip("sid", "name", "indicator", 1, 2.345, 6.789,
-                123, "lineid", "linename", 0, "destination name", "destination text", "vehicle", "id", 123456789123456789L);
+    void basicConstructorTest() {
+        Trip trip = new Trip("sid",
+                "name",
+                "indicator",
+                1,
+                2.345,
+                6.789,
+                123,
+                "lineid",
+                "linename",
+                0,
+                "destination name",
+                "destination text",
+                "vehicle",
+                "id",
+                123456789123456789L);
         assertThat(trip.getStop().getId(), is("sid"));
         assertThat(trip.getStop().getName(), is("name"));
         assertThat(trip.getStop().getIndicator(), is("indicator"));
@@ -40,9 +70,9 @@ public class TripTest {
     }
 
     @Test
-    public void listConstructorTest() {
+    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");
@@ -57,7 +87,7 @@ public class TripTest {
         raw.add("destination name");
         raw.add("destination text");
         raw.add("vehicle");
-        raw.add("id");
+        raw.add(9876543210L);
         raw.add(123456789123456789L);
 
         try {
@@ -75,12 +105,22 @@ public class TripTest {
             assertThat(trip.getDestinationName(), is("destination name"));
             assertThat(trip.getDestinationText(), is("destination text"));
             assertThat(trip.getVehicleID(), is("vehicle"));
-            assertThat(trip.getId(), is("id"));
+            assertThat(trip.getId(), is("9876543210"));
             assertThat(trip.getEstimatedTime(), is(123456789123456789L));
         } catch (IOException e) {
             fail("Creation of Trip from valid list failed: " + e.getMessage());
         }
 
+        /* Test with V2 style list */
+        raw.set(14, "id");
+        try {
+            Trip trip = new Trip(raw, "2.0");
+            assertThat(trip.getId(), is("id"));
+        } catch (IOException e) {
+            fail("Creation of Trip from valid list failed: " + e.getMessage());
+        }
+        raw.set(14, 9876543210L);
+
         /* Excess elements should be ignored */
         raw.add("foo");
         try {
@@ -91,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)));
         }
@@ -107,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)));
         }
@@ -117,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)));
         }
@@ -137,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)));
         }
@@ -147,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)));
         }
@@ -157,17 +217,17 @@ 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)));
         }
 
         invalid = new ArrayList<>(raw);
         invalid.remove(14);
-        invalid.add(14, 123);
+        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)));
         }
@@ -177,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)));
         }
@@ -186,7 +246,16 @@ 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)));
+        }
+
+        invalid = new ArrayList<>(raw);
+        invalid.set(10, 3);
+        try {
+            new Trip(invalid);
+            fail("Creation of Trip with direction ID 3 successful");
         } catch (Exception e) {
             assertThat(e, is(instanceOf(IOException.class)));
         }

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

@@ -0,0 +1,309 @@
+/*
+ * Copyright 2016-2024 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.core.WireMockConfiguration;
+import com.github.tomakehurst.wiremock.extension.Parameters;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformerV2;
+import com.github.tomakehurst.wiremock.http.ChunkedDribbleDelay;
+import com.github.tomakehurst.wiremock.http.Response;
+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
+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
+ */
+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
+    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
+    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
+    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 implements ResponseTransformerV2 {
+        @Override
+        public Response transform(Response response, ServeEvent serveEvent) {
+            Parameters parameters = serveEvent.getTransformerParameters();
+            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";
+        }
+    }
+}

src/test/resources/__files/instant_V1_messages.txt

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

src/test/resources/__files/instant_V1_stops_circle.txt

@@ -0,0 +1,14 @@
+[4,"1.0",1483808583971]
+[0,"Piccadilly Circus","156","D",0,51.509822,-0.136967]
+[0,"Piccadilly Circus","149","G",0,51.51006,-0.135545]
+[0,"Piccadilly Circus","155","C",0,51.50986,-0.135971]
+[0,"Piccadilly Circus","34716","S",0,51.509154,-0.136245]
+[0,"Trocadero / Haymarket","161","H",0,51.510515,-0.134172]
+[0,"Piccadilly Circus, Haymarket","PCIRHM S",null,0,51.509709,-0.13272]
+[0,"Regent Street / St James's","17683","Z",0,51.508732,-0.134043]
+[0,"Regent Street / St James's","154","Y",0,51.508942,-0.134207]
+[0,"Piccadilly Circus","BP5840","E",0,51.509882,-0.137325]
+[0,"Piccadilly Circus","150","F",0,51.509894,-0.136402]
+[0,"Trocadero / Haymarket","37229","K",0,51.511194,-0.133366]
+[0,"Piccadilly Circus","37122","B",0,51.509306,-0.13621]
+[0,"Haymarket / Jermyn Street","29867","R",0,51.509691,-0.132706]

src/test/resources/__files/instant_V1_stops_circle_name.txt

@@ -0,0 +1,8 @@
+[4,"1.0",1483808692732]
+[0,"Piccadilly Circus","156","D",0,51.509822,-0.136967]
+[0,"Piccadilly Circus","149","G",0,51.51006,-0.135545]
+[0,"Piccadilly Circus","155","C",0,51.50986,-0.135971]
+[0,"Piccadilly Circus","34716","S",0,51.509154,-0.136245]
+[0,"Piccadilly Circus","BP5840","E",0,51.509882,-0.137325]
+[0,"Piccadilly Circus","150","F",0,51.509894,-0.136402]
+[0,"Piccadilly Circus","37122","B",0,51.509306,-0.13621]

src/test/resources/__files/instant_V1_trips_destination.txt

@@ -0,0 +1,10 @@
+[4,"1.0",1483809193233]
+[1,"New Bond Street","829","OE",0,51.514814,-0.146117,1,"94","94",1,"Piccadilly Cir","Piccadilly Circus",15925,443778,1483810113000]
+[1,"New Bond Street","829","OE",0,51.514814,-0.146117,1,"94","94",1,"Piccadilly Cir","Piccadilly Circus",15209,443756,1483810614000]
+[1,"Hobury Street / Worlds End","11296","QH",0,51.482463,-0.179129,1,"22","22",1,"Piccadilly Cir","Piccadilly Circus",8923,390782,1483810037000]
+[1,"Abinger Road","11333",null,0,51.496971,-0.24965,1,"94","94",1,"Piccadilly Cir","Piccadilly Circus",15554,444015,1483809664000]
+[1,"Knightsbridge Station","210","KJ",0,51.500899,-0.160183,1,"22","22",1,"Piccadilly Cir","Piccadilly Circus",7988,392720,1483810456000]
+[1,"Piccadilly Circus","37122","B",0,51.509306,-0.13621,1,"22","22",1,"Piccadilly Cir","Piccadilly Circus",8027,502319,1483809941000]
+[1,"Edith Grove / Worlds End","37444",null,0,51.481603,-0.182217,1,"22","22",1,"Piccadilly Cir","Piccadilly Circus",8015,392809,1483810291000]
+[1,"Selfridges","153","BB",0,51.514067,-0.152921,1,"94","94",1,"Piccadilly Cir","Piccadilly Circus",15105,444021,1483809200000]
+[1,"Edith Grove / Worlds End","37444",null,0,51.481603,-0.182217,1,"22","22",1,"Piccadilly Cir","Piccadilly Circus",7988,392720,1483809409000]

src/test/resources/__files/instant_V1_trips_line.txt

@@ -1,11 +1,11 @@
 [4,"2.0",1482854839773]
-[1,"Seffenter Weg","100643","",0,50.7820069,6.0644119,19,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","317","27000154004001",1482855824000]
-[1,"Normaluhr","100009","H.5 (Wilhelmstr.)",0,50.7680616,6.094883,9,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","226","27000134003001",1482855960000]
-[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,5,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","226","27000134002001",1482854820000]
-[1,"Ponttor","100005","H.4 (Pontwall)",0,50.7808611,6.0779722,15,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","226","27000134003001",1482856500000]
-[1,"Stiewistraße","100630","",0,50.78029,6.05058,25,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","226","27000134004001",1482859800000]
-[1,"Misereor","100010","",0,50.7685583,6.0833027,7,"3","3.A",1,"Hbf.-Ponttor-Uniklinik","Hbf.-Ponttor-Uniklinik","0","27000134005001",1482861060000]
-[1,"Wendlingweg","100646","",0,50.7773216,6.0504405,26,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","338","27000128004001",1482858060000]
-[1,"Hörn Brücke","100627","",0,50.7871194,6.051875,22,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0","27000141015001",1482861420000]
-[1,"Forckenbeckstraße","100628","",0,50.78534,6.05054,23,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","338","27000128003001",1482855127000]
-[1,"Hörn Brücke","100627","",0,50.7871194,6.051875,22,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","338","27000128003001",1482855067000]
+[1,"Seffenter Weg","100643","",0,50.7820069,6.0644119,19,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","317",27000154004001,1482855824000]
+[1,"Normaluhr","100009","H.5 (Wilhelmstr.)",0,50.7680616,6.094883,9,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","226",27000134003001,1482855960000]
+[1,"Uniklinik","100600","H.1",0,50.7756388,6.04425,5,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","226",27000134002001,1482854820000]
+[1,"Ponttor","100005","H.4 (Pontwall)",0,50.7808611,6.0779722,15,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","226",27000134003001,1482856500000]
+[1,"Stiewistraße","100630","",0,50.78029,6.05058,25,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","226",27000134004001,1482859800000]
+[1,"Misereor","100010","",0,50.7685583,6.0833027,7,"3","3.A",1,"Hbf.-Ponttor-Uniklinik","Hbf.-Ponttor-Uniklinik","0",27000134005001,1482861060000]
+[1,"Wendlingweg","100646","",0,50.7773216,6.0504405,26,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","338",27000128004001,1482858060000]
+[1,"Hörn Brücke","100627","",0,50.7871194,6.051875,22,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0",27000141015001,1482861420000]
+[1,"Forckenbeckstraße","100628","",0,50.78534,6.05054,23,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","338",27000128003001,1482855127000]
+[1,"Hörn Brücke","100627","",0,50.7871194,6.051875,22,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","338",27000128003001,1482855067000]

src/test/resources/__files/instant_V1_trips_line_direction.txt

@@ -0,0 +1,11 @@
+[4,"1.0",1483806258560]
+[1,"Lower Barn Road","16637",null,0,51.330106,-0.093099,1,"412","412",2,"Purley","Purley",3469,653171,1483807114000]
+[1,"Sanderstead Plantation","23493",null,0,51.339851,-0.069809,1,"412","412",2,"Purley","Purley",2161,653155,1483807649000]
+[1,"Christchurch Road / Purley Hospital","10825","E",0,51.340668,-0.113337,1,"412","412",2,"Purley","Purley",3146,653175,1483806540000]
+[1,"Ridge Langley","20396",null,0,51.346848,-0.072013,1,"412","412",2,"Purley","Purley",2161,653155,1483807260000]
+[1,"Purley / Downlands Precinct","4396","D",0,51.339165,-0.116083,1,"412","412",2,"Purley","Purley",3469,653171,1483807453000]
+[1,"Coombe Road","10829","W",0,51.368209,-0.099175,1,"412","412",2,"Purley","Purley",2161,653155,1483806733000]
+[1,"Ruskin Parade / South Croydon Station","4415","F",0,51.363068,-0.097132,1,"412","412",2,"Purley","Purley",1554,653151,1483807590000]
+[1,"Sussex Road","18810","GP",0,51.359344,-0.093811,1,"412","412",2,"Purley","Purley",1554,653151,1483807686000]
+[1,"Farley Road","26185","Z",0,51.342569,-0.063937,1,"412","412",2,"Purley","Purley",1554,653151,1483808161000]
+[1,"Sanderstead Plantation","23493",null,0,51.339851,-0.069809,1,"412","412",2,"Purley","Purley",3469,653171,1483806820000]

src/test/resources/__files/instant_V1_trips_line_name.txt

@@ -0,0 +1,11 @@
+[4,"2.0",1483362794677]
+[1,"Westbahnhof","100641","H.2",0,50.7805372,6.0719672,17,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0",92000288014001,1483367880000]
+[1,"Aachen Gartenstraße","100601","",0,50.7704169,6.0695841,4,"3","3.A",1,"Schanz-Hbf.-Ponttor","Schanz-Hbf.-Ponttor","0",92000058014001,1483368360000]
+[1,"Schanz","100012","H.2 (Boxgraben)",0,50.76891,6.074498,5,"3","3.A",1,"Hbf.-Ponttor-Uniklinik","Hbf.-Ponttor-Uniklinik","0",92000288015001,1483369380000]
+[1,"Aachen Gartenstraße","100601","",0,50.7704169,6.0695841,4,"3","3.A",1,"Schanz-Hbf.-Ponttor","Schanz-Hbf.-Ponttor","327",92000289012001,1483363045000]
+[1,"Kastanienweg","100631","",0,50.7854908,6.0547602,21,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0",92000058014001,1483369860000]
+[1,"Eurogress","100007","",0,50.7807852,6.0900738,13,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","327",92000289012001,1483363994000]
+[1,"Augustastraße","100008","",0,50.7731333,6.0959027,10,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","0",92000288014001,1483367280000]
+[1,"Hörn Brücke","100627","",0,50.7871194,6.051875,22,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0",92000279013001,1483369020000]
+[1,"Audimax","100029","",0,50.7802655,6.0752138,16,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0",92000058014001,1483369560000]
+[1,"Aachen Hauptbahnhof","100004","H.1",0,50.7687027,6.0906277,8,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","0",92000288014001,1483367040000]

src/test/resources/__files/instant_V1_trips_stop.txt

@@ -0,0 +1,11 @@
+[4,"2.0",1482854457011]
+[1,"Aachen Bushof","100000","H.13",0,50.7775936,6.0908191,20,"1","1",1,"Schevenhütte","Schevenhütte","565",27000158010001,1482854446000]
+[1,"Aachen Bushof","100000","H.2",0,50.7775936,6.0908191,8,"7","7",1,"Aachen Bushof","Aachen Bushof","514",27000210017001,1482854400000]
+[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","0",27000171010001,1482854460000]
+[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,17,"47","47",1,"Aachen Bushof","Aachen Bushof","258",27000139003001,1482854460000]
+[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,1,"7","7",1,"Aachen Diepenbenden","Aachen Diepenbenden","257",27000089026001,1482854454000]
+[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,17,"2","2",1,"Eilendorf Schubertstr.","Eilendorf Schubertstr.","221",27000039021001,1482854445000]
+[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,28,"12","12",1,"Campus Melaten","Campus Melaten","298",27000062010001,1482854451000]
+[1,"Aachen Bushof","100000","H.1",0,50.7775936,6.0908191,27,"51","51",1,"Aachen Bushof","Aachen Bushof","603",27000230015001,1482854801000]
+[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,1,"43","43",1,"Hüls Schulz+Elleter F.","Hüls Schulz+Elleter F.","258",27000139004001,1482854520000]
+[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,25,"33","33",1,"Aachen Fuchserde","Aachen Fuchserde","286",27000033017001,1482854459000]

src/test/resources/__files/instant_V1_trips_stop_destination.txt

@@ -0,0 +1,6 @@
+[4,"1.0",1483809267076]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16588,309783,1483809502000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16589,239190,1483809796000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16211,310616,1483810325000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16549,238574,1483810733000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16213,216852,1483810840000]

src/test/resources/__files/instant_V1_trips_stop_line.txt

@@ -1,11 +1,11 @@
 [4,"2.0",1482855134910]
-[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,32,"35","35",1,"Vaals Grenze","Vaals Grenze","346","27000078014001",1482855350000]
-[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,15,"25","25",1,"Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","334","27000268014001",1482856194000]
-[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","242","27000270010001",1482856248000]
-[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,14,"35","35",1,"Breinig Entengasse","Breinig Entengasse","248","27000074012001",1482856740000]
-[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,32,"35","35",1,"Vaals Grenze","Vaals Grenze","294","27000076010001",1482857507000]
-[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,15,"25","25",1,"Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","0","27000171011001",1482857640000]
-[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","191","27000032012001",1482858057000]
-[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,14,"35","35",1,"Breinig Entengasse","Breinig Entengasse","346","27000078015001",1482858540000]
-[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,15,"25","25",1,"Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","242","27000270011001",1482859440000]
-[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","187","27000060013001",1482859860000]
+[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,32,"35","35",1,"Vaals Grenze","Vaals Grenze","346",27000078014001,1482855350000]
+[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,15,"25","25",1,"Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","334",27000268014001,1482856194000]
+[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","242",27000270010001,1482856248000]
+[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,14,"35","35",1,"Breinig Entengasse","Breinig Entengasse","248",27000074012001,1482856740000]
+[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,32,"35","35",1,"Vaals Grenze","Vaals Grenze","294",27000076010001,1482857507000]
+[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,15,"25","25",1,"Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","0",27000171011001,1482857640000]
+[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","191",27000032012001,1482858057000]
+[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,14,"35","35",1,"Breinig Entengasse","Breinig Entengasse","346",27000078015001,1482858540000]
+[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,15,"25","25",1,"Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","242",27000270011001,1482859440000]
+[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","187",27000060013001,1482859860000]

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]

src/test/resources/__files/instant_V1_trips_stop_towards.txt

@@ -0,0 +1,18 @@
+[4,"1.0",1483809773487]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"94","94",2,"Acton Green","Acton Green",15294,445809,1483809898000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16589,239190,1483809806000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"6","6",2,"Willesden Gar","Willesden, Bus Garage",10600,216033,1483810030000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"23","23",2,"Westbourne Park","Westbourne Park",20276,685207,1483810231000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"94","94",2,"Acton Green","Acton Green",15296,445944,1483810322000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"6","6",2,"Willesden Gar","Willesden, Bus Garage",10603,216027,1483810421000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16211,310616,1483810135000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"94","94",2,"Acton Green","Acton Green",15105,445989,1483810449000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"23","23",2,"Westbourne Park","Westbourne Park",20322,690792,1483810642000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"94","94",2,"Acton Green","Acton Green",15575,445855,1483810750000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16213,216852,1483810840000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"6","6",2,"Willesden Gar","Willesden, Bus Garage",10602,216822,1483810854000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"23","23",2,"Westbourne Park","Westbourne Park",20337,689508,1483811038000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16549,238574,1483810791000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"94","94",2,"Acton Green","Acton Green",15925,445840,1483811317000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"6","6",2,"Willesden Gar","Willesden, Bus Garage",10596,216025,1483811331000]
+[1,"Piccadilly Circus","156","D",0,51.509822,-0.136967,1,"159","159",1,"Marble Arch","Marble Arch",16713,310640,1483811409000]

src/test/resources/__files/instant_V1_trips_towards.txt

@@ -0,0 +1,11 @@
+[4,"1.0",1483810124081]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"36","36",1,"New Cross Gate","New Cross Gate",8864,595212,1483810191000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"7","7",1,"Oxford Circus","Oxford Circus",9932,109224,1483810173000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"36","36",1,"New Cross Gate","New Cross Gate",8862,597163,1483810551000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"23","23",1,"Liverpool St","Liverpool Street",20333,690728,1483810367000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"7","7",1,"Oxford Circus","Oxford Circus",9861,106419,1483810702000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"36","36",1,"New Cross Gate","New Cross Gate",9407,599527,1483810830000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"23","23",1,"Liverpool St","Liverpool Street",20335,683419,1483810677000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"36","36",1,"New Cross Gate","New Cross Gate",9379,599540,1483811196000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"7","7",1,"Oxford Circus","Oxford Circus",10262,109245,1483811093000]
+[1,"Porchester Terrace North","16972","L",0,51.516451,-0.186379,1,"23","23",1,"Liverpool St","Liverpool Street",20099,684947,1483811250000]

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."]

src/test/resources/__files/instant_V2_trips_all.txt

@@ -0,0 +1,11 @@
+[4,"2.0",1482850556146]
+[1,"Fischbachstraße","215812","",0,50.73893,6.2666311,6,"8","8",1,"Eschweiler Bushof","Eschweiler Bushof","0",27000165015001,1482856620000]
+[1,"Wolferskaul","100322","",0,50.7439086,6.1594241,19,"55","55",1,"Aachen Elisenbrunnen","Aachen Elisenbrunnen","619",27000229015001,1482852180000]
+[1,"Lindenallee","213227","",0,50.8271524,6.3194636,8,"28","28",1,"Alsdorf Annapark","Alsdorf Annapark","519",27000190012001,1482853140000]
+[1,"Karlsgraben","100024","",0,50.7728605,6.0766513,6,"5","5",1,"Driescher Hof-Brand","Driescher Hof-Brand","0",27000283012001,1482855960000]
+[1,"Eilendorf Bahnhof","100246","",0,50.7855477,6.1521783,61,"57","57",1,"Verlautenheide Endstr.","Verlautenheide Endstr.","528",27000200015001,1482855908000]
+[1,"Elisenbrunnen","100001","H.1",0,50.7747372,6.0879925,24,"34","34",1,"Aachen Bushof","Aachen Bushof","670",27000237013001,1482854520000]
+[1,"Schneidmühle","215602","",0,50.7847038,6.2190627,42,"22","22",1,"Stolberg Mühlener Bf.","Stolberg Mühlener Bf.","247",27000118005001,1482855180000]
+[1,"Dechant-Brock-Str.","215824","",0,50.7592927,6.2735355,22,"1","1",1,"Lintert Friedhof","Lintert Friedhof","268",27000102007001,1482854580000]
+[1,"Am Tiergarten","100382","",0,50.755833,6.1689597,30,"34","34",1,"Brand","Brand","0",27000224012001,1482854040000]
+[1,"Hansemannplatz","100002","H.1",0,50.7784794,6.0959816,26,"51","51",1,"Aachen Bushof","Aachen Bushof","603",27000230015001,1482854400000]

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]

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]

src/test/resources/de/stklcode/pubtrans/ura/instant_trips_line_direction.txt

@@ -1,11 +0,0 @@
-[4,"2.0",1483363349461]
-[1,"Westbahnhof","100641","H.2",0,50.7805372,6.0719672,17,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","325","92000288014001",1483367880000]
-[1,"Aachen Gartenstraße","100601","",0,50.7704169,6.0695841,4,"3","3.A",1,"Schanz-Hbf.-Ponttor","Schanz-Hbf.-Ponttor","229","92000058014001",1483368360000]
-[1,"Schanz","100012","H.2 (Boxgraben)",0,50.76891,6.074498,5,"3","3.A",1,"Hbf.-Ponttor-Uniklinik","Hbf.-Ponttor-Uniklinik","0","92000288015001",1483369380000]
-[1,"Kastanienweg","100631","",0,50.7854908,6.0547602,21,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","229","92000058014001",1483369860000]
-[1,"Eurogress","100007","",0,50.7807852,6.0900738,13,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","327","92000289012001",1483363996000]
-[1,"Augustastraße","100008","",0,50.7731333,6.0959027,10,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","325","92000288014001",1483367280000]
-[1,"Hörn Brücke","100627","",0,50.7871194,6.051875,22,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0","92000279013001",1483369020000]
-[1,"Audimax","100029","",0,50.7802655,6.0752138,16,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0","92000288015001",1483370460000]
-[1,"Misereor","100010","",0,50.7685583,6.0833027,7,"3","3.A",1,"Hbf.-Ponttor-Uniklinik","Hbf.-Ponttor-Uniklinik","0","92000154003001",1483370460000]
-[1,"Audimax","100029","",0,50.7802655,6.0752138,16,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","229","92000058014001",1483369560000]

src/test/resources/de/stklcode/pubtrans/ura/instant_trips_line_name.txt

@@ -1,11 +0,0 @@
-[4,"2.0",1483362794677]
-[1,"Westbahnhof","100641","H.2",0,50.7805372,6.0719672,17,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0","92000288014001",1483367880000]
-[1,"Aachen Gartenstraße","100601","",0,50.7704169,6.0695841,4,"3","3.A",1,"Schanz-Hbf.-Ponttor","Schanz-Hbf.-Ponttor","0","92000058014001",1483368360000]
-[1,"Schanz","100012","H.2 (Boxgraben)",0,50.76891,6.074498,5,"3","3.A",1,"Hbf.-Ponttor-Uniklinik","Hbf.-Ponttor-Uniklinik","0","92000288015001",1483369380000]
-[1,"Aachen Gartenstraße","100601","",0,50.7704169,6.0695841,4,"3","3.A",1,"Schanz-Hbf.-Ponttor","Schanz-Hbf.-Ponttor","327","92000289012001",1483363045000]
-[1,"Kastanienweg","100631","",0,50.7854908,6.0547602,21,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0","92000058014001",1483369860000]
-[1,"Eurogress","100007","",0,50.7807852,6.0900738,13,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","327","92000289012001",1483363994000]
-[1,"Augustastraße","100008","",0,50.7731333,6.0959027,10,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","0","92000288014001",1483367280000]
-[1,"Hörn Brücke","100627","",0,50.7871194,6.051875,22,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0","92000279013001",1483369020000]
-[1,"Audimax","100029","",0,50.7802655,6.0752138,16,"3","3.A",1,"Uniklinik-Schanz-Hbf.","Uniklinik-Schanz-Hbf.","0","92000058014001",1483369560000]
-[1,"Aachen Hauptbahnhof","100004","H.1",0,50.7687027,6.0906277,8,"3","3.A",1,"Ponttor-Unikl.-Schanz","Ponttor-Unikl.-Schanz","0","92000288014001",1483367040000]

src/test/resources/de/stklcode/pubtrans/ura/instant_trips_stop.txt

@@ -1,11 +0,0 @@
-[4,"2.0",1482854457011]
-[1,"Aachen Bushof","100000","H.13",0,50.7775936,6.0908191,20,"1","1",1,"Schevenhütte","Schevenhütte","565","27000158010001",1482854446000]
-[1,"Aachen Bushof","100000","H.2",0,50.7775936,6.0908191,8,"7","7",1,"Aachen Bushof","Aachen Bushof","514","27000210017001",1482854400000]
-[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,30,"25","25",1,"Vaals Busstation","Vaals Busstation","0","27000171010001",1482854460000]
-[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,17,"47","47",1,"Aachen Bushof","Aachen Bushof","258","27000139003001",1482854460000]
-[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,1,"7","7",1,"Aachen Diepenbenden","Aachen Diepenbenden","257","27000089026001",1482854454000]
-[1,"Aachen Bushof","100000","H.12",0,50.7775936,6.0908191,17,"2","2",1,"Eilendorf Schubertstr.","Eilendorf Schubertstr.","221","27000039021001",1482854445000]
-[1,"Aachen Bushof","100000","H.11",0,50.7775936,6.0908191,28,"12","12",1,"Campus Melaten","Campus Melaten","298","27000062010001",1482854451000]
-[1,"Aachen Bushof","100000","H.1",0,50.7775936,6.0908191,27,"51","51",1,"Aachen Bushof","Aachen Bushof","603","27000230015001",1482854801000]
-[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,1,"43","43",1,"Hüls Schulz+Elleter F.","Hüls Schulz+Elleter F.","258","27000139004001",1482854520000]
-[1,"Aachen Bushof","100000","H.15",0,50.7775936,6.0908191,25,"33","33",1,"Aachen Fuchserde","Aachen Fuchserde","286","27000033017001",1482854459000]

src/test/resources/de/stklcode/pubtrans/ura/instant_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]