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

Refactored empty-checks on result lists

Browse Source
This commit is contained in:
Stefan Kalscheuer
2017-08-29 18:26:51 +02:00
parent 6b0481a5e1
commit e12775b6ae
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,7 +223,7 @@ public class UraClient {
while (line != null && (limit == null || trips.size() < limit)) { while (line != null && (limit == null || trips.size() < limit)) {
List l = mapper.readValue(line, List.class); List l = mapper.readValue(line, List.class);
/* Check if result exists and has correct response type */ /* Check if result exists and has correct response type */
if (l != null && l.size() > 0) { if (l != null && !l.isEmpty()) {
if (l.get(0).equals(RES_TYPE_URA_VERSION)) { if (l.get(0).equals(RES_TYPE_URA_VERSION)) {
version = l.get(1).toString(); version = l.get(1).toString();
} else if (l.get(0).equals(RES_TYPE_PREDICTION)) { } else if (l.get(0).equals(RES_TYPE_PREDICTION)) {
@ -259,11 +259,10 @@ public class UraClient {
try (InputStream is = requestInstant(REQUEST_STOP, query); try (InputStream is = requestInstant(REQUEST_STOP, query);
BufferedReader br = new BufferedReader(new InputStreamReader(is))) { BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
String line; String line;
String version;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
List l = mapper.readValue(line, List.class); List l = mapper.readValue(line, List.class);
/* Check if result exists and has correct response type */ /* 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)); stops.add(new Stop(l));
} }
} }