Skip to content

Commit 0263967

Browse files
committed
minor change
1 parent 6fa9c76 commit 0263967

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

citydb-cli/src/main/java/org/citydb/cli/importer/ImportController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ protected Filter getFilter(DatabaseAdapter adapter) throws ExecutionException {
212212
FilterOptions filterOptions = getFilterOptions().orElse(null);
213213
return filterOptions != null && !filterOptions.isEmpty() ?
214214
Filter.of(filterOptions, adapter) :
215-
null;
215+
Filter.acceptAll();
216216
} catch (FilterException e) {
217217
throw new ExecutionException("Failed to build import filter.", e);
218218
}

citydb-cli/src/main/java/org/citydb/cli/importer/filter/Filter.java

+13
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public class Filter implements org.citydb.io.reader.filter.Filter {
4141
private long currentIndex;
4242
private long count;
4343

44+
private Filter() {
45+
this(null, 0, Long.MAX_VALUE);
46+
}
47+
4448
private Filter(List<FilterPredicate> predicates, long startIndex, long limit) {
4549
this.predicates = predicates;
4650
this.startIndex = startIndex;
@@ -73,6 +77,15 @@ public static Filter of(FilterOptions options, DatabaseAdapter adapter) throws F
7377
return new Filter(predicates, startIndex, limit);
7478
}
7579

80+
public static Filter acceptAll() {
81+
return new Filter() {
82+
@Override
83+
public Result test(Feature feature) {
84+
return Result.ACCEPT;
85+
}
86+
};
87+
}
88+
7689
@Override
7790
public boolean needsSequentialProcessing() {
7891
return useCountLimit;

citydb-io-citygml/src/main/java/org/citydb/io/citygml/reader/CityGMLReader.java

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public CityGMLReader(InputFile file, ReadOptions options, CityGMLAdapterContext
9797

9898
@Override
9999
public void read(Consumer<Feature> consumer) throws ReadException {
100+
shouldRun = true;
100101
if (!isPreprocessed) {
101102
preprocess();
102103
}

citydb-io-citygml/src/main/java/org/citydb/io/citygml/reader/CityJSONReader.java

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public CityJSONReader(InputFile file, ReadOptions options, CityGMLAdapterContext
8686

8787
@Override
8888
public void read(Consumer<Feature> consumer) throws ReadException {
89+
shouldRun = true;
8990
int threads = filter.needsSequentialProcessing() ? 1 :
9091
options.getNumberOfThreads() > 0 ?
9192
options.getNumberOfThreads() :

0 commit comments

Comments
 (0)