Improve error handling (#323)

entur · Nov 8, 2024 · 1535a79 · 1535a79
1 parent ded31a3
commit 1535a79
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/...ception/MissingAuthorityUrlException.java → ...ception/InvalidAuthorityUrlException.java b/...ception/MissingAuthorityUrlException.java → ...ception/InvalidAuthorityUrlException.java
@@ -20,10 +20,11 @@
 
 /**
  * Exception thrown when an Authority does not have a valid URL.
+ * The URL is a mandatory field of a GTFS Agency.
  */
-public class MissingAuthorityUrlException extends GtfsExportException {
+public class InvalidAuthorityUrlException extends GtfsExportException {
 
-  public MissingAuthorityUrlException(String message) {
+  public InvalidAuthorityUrlException(String message) {
     super(message);
   }
 }
diff --git a/src/main/java/org/entur/netex/gtfs/export/producer/DefaultAgencyProducer.java b/src/main/java/org/entur/netex/gtfs/export/producer/DefaultAgencyProducer.java
@@ -18,6 +18,7 @@
 
 package org.entur.netex.gtfs.export.producer;
 
+import org.entur.netex.gtfs.export.exception.InvalidAuthorityUrlException;
 import org.entur.netex.gtfs.export.repository.NetexDatasetRepository;
 import org.onebusaway.gtfs.model.Agency;
 import org.rutebanken.netex.model.Authority;
@@ -55,20 +56,19 @@ public Agency produce(Authority authority) {
         if (isValidGtfsUrl(url)) {
           agency.setUrl(url);
         } else {
-          LOGGER.warn(
-            "Invalid URL format {} for authority {}",
-            url,
-            authority.getId()
+          throw new InvalidAuthorityUrlException(
+            "Invalid URL for authority " + authority.getId()
           );
         }
       } else {
-        LOGGER.warn("Missing URL for authority {}", authority.getId());
+        throw new InvalidAuthorityUrlException(
+          "Missing URL for authority " + authority.getId()
+        );
       }
       agency.setPhone(contactDetails.getPhone());
     } else {
-      LOGGER.warn(
-        "Missing Contact details for authority {}",
-        authority.getId()
+      throw new InvalidAuthorityUrlException(
+        "Missing Contact details for authority " + authority.getId()
       );
     }
 

diff --git a/src/main/java/org/entur/netex/gtfs/export/serializer/DefaultGtfsSerializer.java b/src/main/java/org/entur/netex/gtfs/export/serializer/DefaultGtfsSerializer.java
@@ -26,7 +26,9 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import org.entur.netex.gtfs.export.exception.GtfsExportException;
 import org.entur.netex.gtfs.export.exception.GtfsSerializationException;
+import org.onebusaway.csv_entities.exceptions.CsvException;
 import org.onebusaway.gtfs.model.Route;
 import org.onebusaway.gtfs.model.StopTime;
 import org.onebusaway.gtfs.model.Trip;
@@ -67,6 +69,11 @@ public InputStream writeGtfs(GtfsDao gtfsDao) {
       writer.setOutputLocation(outputFile);
       writer.run(gtfsDao);
       return createDeleteOnCloseInputStream(outputFile);
+    } catch (CsvException csve) {
+      throw new GtfsExportException(
+        "Cannot produce a valid GTFS dataset",
+        csve
+      );
     } catch (IOException e) {
       throw new GtfsSerializationException(
         "Error while saving the GTFS dataset",