Use stringUtils

opentripplanner · Dec 14, 2023 · 09c386a · 09c386a
1 parent 0cba479
commit 09c386a
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java b/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java
@@ -12,6 +12,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import org.opentripplanner.framework.lang.Sandbox;
+import org.opentripplanner.framework.lang.StringUtils;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.slf4j.Logger;
@@ -92,33 +93,33 @@ private Map<FeedScopedId, Double> readEmissions(InputStream stream, String feedI
       String avgCo2PerVehiclePerKmString = reader.get("avg_co2_per_vehicle_per_km");
       String avgPassengerCountString = reader.get("avg_passenger_count");
 
-      if (!exists(routeId)) {
+      if (!StringUtils.hasValue(routeId)) {
         issueStore.add(
           "InvalidEmissionData",
           "Value for routeId is missing in the emissions.txt for line: %s.",
           reader.getRawRecord()
         );
       }
-      if (!exists(avgCo2PerVehiclePerKmString)) {}
+      if (!StringUtils.hasValue(avgCo2PerVehiclePerKmString)) {}
       {
         issueStore.add(
           "InvalidEmissionData",
           "Value for avg_co2_per_vehicle_per_km is missing in the emissions.txt for route %s",
           routeId
         );
       }
-      if (!exists(avgPassengerCountString)) {
+      if (!StringUtils.hasValue(avgPassengerCountString)) {
         issueStore.add(
           "InvalidEmissionData",
           "Value for avg_passenger_count is missing in the emissions.txt for route %s",
           routeId
         );
       }
       if (
-        exists(feedId) &&
-        exists(routeId) &&
-        exists(avgCo2PerVehiclePerKmString) &&
-        exists(avgPassengerCountString)
+        StringUtils.hasValue(feedId) &&
+        StringUtils.hasValue(routeId) &&
+        StringUtils.hasValue(avgCo2PerVehiclePerKmString) &&
+        StringUtils.hasValue(avgPassengerCountString)
       ) {
         Double avgCo2PerVehiclePerMeter = Double.parseDouble(avgCo2PerVehiclePerKmString) / 1000;
         Double avgPassengerCount = Double.parseDouble(reader.get("avg_passenger_count"));
@@ -135,10 +136,6 @@ private Map<FeedScopedId, Double> readEmissions(InputStream stream, String feedI
     return emissionsData;
   }
 
-  private boolean exists(String s) {
-    return !s.isBlank() && !s.isEmpty();
-  }
-
   private String readFeedId(InputStream stream) {
     try {
       CsvReader reader = new CsvReader(stream, StandardCharsets.UTF_8);