#102 improved error handling, ignore input files not found or empty

dukecon · Feb 22, 2020 · 3027c3d · 3027c3d
1 parent bb25eab
commit 3027c3d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/converters/src/main/java/org/dukecon/server/convert/GenerateDukecon.groovy b/converters/src/main/java/org/dukecon/server/convert/GenerateDukecon.groovy
@@ -44,6 +44,10 @@ class GenerateDukecon {
                     rawDataMapperClass.getConstructor(RawDataResources.class)
                             .newInstance(rawDataResources)
             rawDataMapper.initMapper()
+            if (rawDataMapper.isEmpty()) {
+                log.error("Could not read input data")
+                System.exit(-1)
+            }
             Class conferenceDataExtractorClass = conferenceConfig.extractorClass as Class
             ConferenceDataExtractor conferenceDataExtractor =
                     conferenceDataExtractorClass.getConstructor(ConferencesConfiguration.Conference.class,

diff --git a/repositories/src/main/java/org/dukecon/server/repositories/RawDataMapper.groovy b/repositories/src/main/java/org/dukecon/server/repositories/RawDataMapper.groovy
@@ -8,16 +8,20 @@ import org.dukecon.adapter.ResourceWrapper
  *
  * @author Falk Sippach, [email protected], @sippsack
  */
-interface RawDataMapper {
+trait RawDataMapper {
 
-    void initMapper()
+    abstract void initMapper()
 
-    void useBackup(ResourceWrapper resourceWrapper)
+    abstract void useBackup(ResourceWrapper resourceWrapper)
 
     /**
      * Concrete subclasses implements this method and return input data as map converted from input resources (JSON, CSV, ...)
      *
      * @return raw data from input resources as Map
      */
-    Map<String, Object> asMap()
+    abstract Map<String, Object> asMap()
+
+    boolean isEmpty() {
+        false
+    }
 }
diff --git a/repositories/src/main/java/org/dukecon/server/repositories/doag/DoagJsonMapper.groovy b/repositories/src/main/java/org/dukecon/server/repositories/doag/DoagJsonMapper.groovy
@@ -69,4 +69,12 @@ class DoagJsonMapper implements RawDataMapper {
     Map<String, Object> asMap() {
         return rawData
     }
+
+    @Override
+    @TypeChecked(TypeCheckingMode.SKIP)
+    boolean isEmpty() {
+        return asMap().values().any {
+            !it || it.isEmpty()
+        }
+    }
 }