stklcode/juraclient
0
0
Fork 0
Code Issues Actions Releases 21 Activity

Merge branch 'feature/1-streamAPI' into develop

Browse Source
This commit is contained in:
Stefan Kalscheuer
2019-02-06 14:07:45 +01:00
parent e9e80a4a08 7b212abdc3
commit 0ecceca35a
6 changed files with 446 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/java/de/stklcode/pubtrans/ura/UraClient.java
View File

@ -19,12 +19,15 @@ package de.stklcode.pubtrans.ura;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.stklcode.pubtrans.ura.model.Stop;
import de.stklcode.pubtrans.ura.model.Trip;
import de.stklcode.pubtrans.ura.reader.AsyncUraTripReader;
import java.io.*;
import java.net.URL;
import java.net.URLEncoder;
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;
@ -240,6 +243,38 @@ public class UraClient implements Serializable {
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.
* @see #getTripsStream(Query, List)
* @since 1.2.0
*/
public AsyncUraTripReader getTripsStream(final Query query, final Consumer<Trip> consumer) throws IOException {
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.
* @since 1.2.0
*/
public AsyncUraTripReader getTripsStream(final Query query, final List<Consumer<Trip>> consumers) throws IOException {
// Create the reader.
AsyncUraTripReader reader = new AsyncUraTripReader(
new URL(requestURL(baseURL + streamURL, REQUEST_TRIP, query)),
consumers
);
// Open the reader, i.e. start reading from API.
reader.open();
return reader;
}
/**
* Get list of stops without filters.
*
@ -283,7 +318,21 @@ public class UraClient implements Serializable {
* @throws IOException on errors
*/
private InputStream requestInstant(final String[] returnList, final Query query) throws IOException {
String urlStr = baseURL + instantURL + "?ReturnList=" + String.join(",", returnList);
return request(requestURL(baseURL + instantURL, returnList, query));
}
/**
* Build request URL from given parameters.
*
* @param endpointURL Endpoint URL.
* @param returnList Fields to fetch.
* @param query The query.
* @return The URL
* @throws IOException on errors
* @since 1.2.0
*/
private String requestURL(final String endpointURL, final String[] returnList, final Query query) throws IOException {
String urlStr = endpointURL + "?ReturnList=" + String.join(",", returnList);
if (query.stopIDs != null && query.stopIDs.length > 0) {
urlStr += "&" + PAR_STOP_ID + "=" + URLEncoder.encode(String.join(",", query.stopIDs), UTF_8.name());
@ -310,7 +359,7 @@ public class UraClient implements Serializable {
urlStr += "&" + PAR_CIRCLE + "=" + URLEncoder.encode(query.circle, UTF_8.name());
}
return request(urlStr);
return urlStr;
}
/**
@ -447,5 +496,26 @@ public class UraClient implements Serializable {
public List<Trip> getTrips() {
return UraClient.this.getTrips(this);
}
/**
* Get trips for set filters.
*
* @param consumer Consumer for single trips.
* @see #getTripsStream(List)
* @since 1.2.0
*/
public AsyncUraTripReader getTripsStream(Consumer<Trip> consumer) throws IOException {
return UraClient.this.getTripsStream(this, consumer);
}
/**
* Get trips for set filters.
*
* @param consumers Consumers for single trips.
* @since 1.2.0
*/
public AsyncUraTripReader getTripsStream(List<Consumer<Trip>> consumers) throws IOException {
return UraClient.this.getTripsStream(this, consumers);
}
}
}

138
src/main/java/de/stklcode/pubtrans/ura/reader/AsyncUraTripReader.java Normal file
View File

@ -0,0 +1,138 @@
/*
* Copyright 2016-2018 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.model.Trip;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
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 URL url;
private CompletableFuture<Void> future;
private boolean cancelled;
/**
* Initialize trip reader.
*
* @param url URL to read trips from.
* @param consumers Initial list of consumers.
*/
public AsyncUraTripReader(URL url, List<Consumer<Trip>> consumers) {
this.url = url;
this.consumers = new ArrayList<>(consumers);
}
public void open() {
// Throw exeption, if future is already present.
if (future != null) {
throw new IllegalStateException("Reader already opened");
}
this.future = CompletableFuture.runAsync(() -> {
ObjectMapper mapper = new ObjectMapper();
try (InputStream is = getInputStream(url);
BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
String version = null;
String line = br.readLine();
while (line != null && !this.cancelled) {
List l = mapper.readValue(line, List.class);
// 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);
this.consumers.forEach(c -> c.accept(trip));
}
}
line = br.readLine();
}
} catch (IOException e) {
throw new IllegalStateException("Failed to read from API", e);
}
});
}
/**
* Register an additional consumer.
*
* @param consumer New consumer.
*/
public void addConsumer(Consumer<Trip> consumer) {
consumers.add(consumer);
}
/**
* Close the reader.
* This is done by signaliung cancel to the asyncronous task. If the task is not completed
* within 1 second however it is cancelled hard.
*/
@Override
public void close() {
// Nothing to do if future is not yet started.
if (future == null) {
return;
}
// Signal cancelling to gracefully stop future.
cancelled = true;
try {
future.get(1, TimeUnit.SECONDS);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
throw new IllegalStateException("Failed to read from API", e);
} catch (TimeoutException e) {
// Task failed to finish within 1 second.
future.cancel(true);
}
}
/**
* Get input stream from given URL.
*
* @param url URL to read from.
* @return Input Stream.
* @throws IOException On errors.
*/
private static InputStream getInputStream(URL url) throws IOException {
return url.openStream();
}
}