nullcheck for startsWith method

opentripplanner · Aug 26, 2022 · b7d3fdb · b7d3fdb
1 parent 27bc21d
commit b7d3fdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/ext/java/org/opentripplanner/ext/legacygraphqlapi/LegacyGraphQLUtils.java b/src/ext/java/org/opentripplanner/ext/legacygraphqlapi/LegacyGraphQLUtils.java
@@ -104,10 +104,10 @@ public static Instant getTimeOrNow(long epochSeconds) {
   }
 
   public static boolean startsWith(String str, String name, Locale locale) {
-    return str.toLowerCase(locale).startsWith(name);
+    return str != null && str.toLowerCase(locale).startsWith(name);
   }
 
   public static boolean startsWith(I18NString str, String name, Locale locale) {
-    return str.toString(locale).toLowerCase(locale).startsWith(name);
+    return str != null && str.toString(locale).toLowerCase(locale).startsWith(name);
   }
 }
diff --git a/...ava/org/opentripplanner/ext/legacygraphqlapi/datafetchers/LegacyGraphQLQueryTypeImpl.java b/...ava/org/opentripplanner/ext/legacygraphqlapi/datafetchers/LegacyGraphQLQueryTypeImpl.java
@@ -909,18 +909,10 @@ public DataFetcher<Iterable<Route>> routes() {
       if (args.getLegacyGraphQLName() != null) {
         String name = args.getLegacyGraphQLName().toLowerCase(environment.getLocale());
         routeStream =
-          routeStream.filter(route -> {
-            if (
-              route.getShortName() != null &&
-              LegacyGraphQLUtils.startsWith(route.getShortName(), name, environment.getLocale())
-            ) {
-              return true;
-            }
-            return (
-              route.getLongName() != null &&
-              LegacyGraphQLUtils.startsWith(route.getLongName(), name, environment.getLocale())
-            );
-          });
+          routeStream.filter(route ->
+            LegacyGraphQLUtils.startsWith(route.getShortName(), name, environment.getLocale()) ||
+            LegacyGraphQLUtils.startsWith(route.getLongName(), name, environment.getLocale())
+          );
       }
       return routeStream.collect(Collectors.toList());
     };