Merge pull request #188 from 3dcitydb/hotfix-feature-version-filter-cli

Fix inconsistent behaviour of feature version filter when using the CLI
3dcitydb · May 12, 2021 · 81b97ab · 81b97ab
2 parents 2a3335f + 7f72fb9
commit 81b97ab
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/impexp-client-cli/src/main/java/org/citydb/cli/options/deleter/QueryOption.java b/impexp-client-cli/src/main/java/org/citydb/cli/options/deleter/QueryOption.java
@@ -48,7 +48,6 @@
 import org.citydb.registry.ObjectRegistry;
 import picocli.CommandLine;
 
-import javax.xml.datatype.DatatypeFactory;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -92,14 +91,14 @@ public QueryConfig toQueryConfig() {
                 queryConfig.setFeatureTypeFilter(typeNamesOption.toFeatureTypeFilter());
             }
 
-            if (featureVersionOption != null) {
-                DatatypeFactory datatypeFactory = ObjectRegistry.getInstance().getDatatypeFactory();
-                SimpleFeatureVersionFilter versionFilter = featureVersionOption.toFeatureVersionFilter(datatypeFactory);
-                if (versionFilter != null) {
-                    AbstractPredicate predicate = versionFilter.toPredicate();
-                    if (predicate != null) {
-                        predicates.add(predicate);
-                    }
+            SimpleFeatureVersionFilter versionFilter = featureVersionOption != null ?
+                    featureVersionOption.toFeatureVersionFilter(ObjectRegistry.getInstance().getDatatypeFactory()) :
+                    FeatureVersionOption.defaultFeatureVersionFilter();
+
+            if (versionFilter != null) {
+                AbstractPredicate predicate = versionFilter.toPredicate();
+                if (predicate != null) {
+                    predicates.add(predicate);
                 }
             }
 

diff --git a/impexp-client-cli/src/main/java/org/citydb/cli/options/exporter/QueryOption.java b/impexp-client-cli/src/main/java/org/citydb/cli/options/exporter/QueryOption.java
@@ -48,7 +48,6 @@
 import org.citydb.registry.ObjectRegistry;
 import picocli.CommandLine;
 
-import javax.xml.datatype.DatatypeFactory;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -104,14 +103,14 @@ public QueryConfig toQueryConfig() {
                 queryConfig.setFeatureTypeFilter(typeNamesOption.toFeatureTypeFilter());
             }
 
-            if (featureVersionOption != null) {
-                DatatypeFactory datatypeFactory = ObjectRegistry.getInstance().getDatatypeFactory();
-                SimpleFeatureVersionFilter versionFilter = featureVersionOption.toFeatureVersionFilter(datatypeFactory);
-                if (versionFilter != null) {
-                    AbstractPredicate predicate = versionFilter.toPredicate();
-                    if (predicate != null) {
-                        predicates.add(predicate);
-                    }
+            SimpleFeatureVersionFilter versionFilter = featureVersionOption != null ?
+                    featureVersionOption.toFeatureVersionFilter(ObjectRegistry.getInstance().getDatatypeFactory()) :
+                    FeatureVersionOption.defaultFeatureVersionFilter();
+
+            if (versionFilter != null) {
+                AbstractPredicate predicate = versionFilter.toPredicate();
+                if (predicate != null) {
+                    predicates.add(predicate);
                 }
             }
 

diff --git a/...nfig/src/main/java/org/citydb/config/project/query/simple/SimpleFeatureVersionFilter.java b/...nfig/src/main/java/org/citydb/config/project/query/simple/SimpleFeatureVersionFilter.java
@@ -53,7 +53,7 @@ public class SimpleFeatureVersionFilter {
     private XMLGregorianCalendar endDate;
 
     public SimpleFeatureVersionFilterMode getMode() {
-        return mode;
+        return mode != null ? mode : SimpleFeatureVersionFilterMode.LATEST;
     }
 
     public void setMode(SimpleFeatureVersionFilterMode mode) {

diff --git a/impexp-plugin-api/src/main/java/org/citydb/plugin/cli/FeatureVersionOption.java b/impexp-plugin-api/src/main/java/org/citydb/plugin/cli/FeatureVersionOption.java
@@ -46,8 +46,8 @@
 import java.time.temporal.ChronoField;
 
 public class FeatureVersionOption implements CliOption {
-    @CommandLine.Option(names = {"-r", "--feature-version"}, required = true,
-            description = "Feature version: ${COMPLETION-CANDIDATES}.")
+    @CommandLine.Option(names = {"-r", "--feature-version"}, required = true, defaultValue = "latest",
+            description = "Feature version: ${COMPLETION-CANDIDATES} (default: ${DEFAULT-VALUE}).")
     private Version version;
 
     @CommandLine.Option(names = {"-R", "--feature-version-timestamp"}, paramLabel = "<timestamp[,timestamp]>",
@@ -60,6 +60,10 @@ public class FeatureVersionOption implements CliOption {
     private OffsetDateTime endDateTime;
     private SimpleFeatureVersionFilter featureVersionFilter;
 
+    public static SimpleFeatureVersionFilter defaultFeatureVersionFilter() {
+        return new SimpleFeatureVersionFilter();
+    }
+
     public SimpleFeatureVersionFilter toFeatureVersionFilter(DatatypeFactory datatypeFactory) {
         if (featureVersionFilter != null) {
             if (startDateTime != null) {