Fix default data source type to "unspecified" to distinguish when dat…

…abase subsetting is requested
VEuPathDB · Jan 23, 2023 · afc3013 · afc3013
1 parent 8c951cd
commit afc3013
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@
 
 // Project settings
 group   = "org.veupathdb.eda"
-version = "3.8.0"
+version = "3.8.1"
 
 plugins {
   `java-library`

diff --git a/src/main/java/org/veupathdb/service/eda/ss/model/tabular/DataSourceType.java b/src/main/java/org/veupathdb/service/eda/ss/model/tabular/DataSourceType.java
@@ -4,7 +4,8 @@
 
 public enum DataSourceType {
   FILES("file"),
-  DATABASE("database");
+  DATABASE("database"),
+  UNSPECIFIED(null);
 
   private String value;
 
@@ -13,6 +14,9 @@ public enum DataSourceType {
   }
 
   public static DataSourceType fromValue(String s) {
+    if (s == null) {
+      return UNSPECIFIED;
+    }
     return Arrays.stream(values())
         .filter(enumInstance -> enumInstance.value.equals(s))
         .findFirst()

diff --git a/src/main/java/org/veupathdb/service/eda/ss/model/tabular/TabularReportConfig.java b/src/main/java/org/veupathdb/service/eda/ss/model/tabular/TabularReportConfig.java
@@ -14,7 +14,7 @@ public class TabularReportConfig {
   private Long _offset = 0L;
   private TabularHeaderFormat _headerFormat = TabularHeaderFormat.STANDARD;
   private boolean _trimTimeFromDateVars = false;
-  private DataSourceType _dataSourceType = DataSourceType.DATABASE;
+  private DataSourceType _dataSourceType = DataSourceType.UNSPECIFIED;
 
   /**
    * Whether this configuration contains paging or sorting (paging always requires sorting)