Use CompareType.AbstractCompareClause to accommodate InClause

Author: bbimber

SivStudies/src/org/labkey/sivstudies/etl/SubjectScopedSelect.java

@@ -150,7 +150,7 @@ private void processBatch(List<String> subjects, Logger log, PipelineJob job)
                 final SimpleFilter subjectFilter = new SimpleFilter(FieldKey.fromString(_settings.get(Settings.targetSubjectColumn.name())), subjects, CompareType.IN);
                 if (_settings.get(Settings.targetAdditionalFilters.name()) != null)
                 {
-                    List<CompareType.CompareClause> additionalFilters = parseAdditionalFilters(_settings.get(Settings.targetAdditionalFilters.name()));
+                    List<CompareType.AbstractCompareClause> additionalFilters = parseAdditionalFilters(_settings.get(Settings.targetAdditionalFilters.name()));
                     additionalFilters.forEach(subjectFilter::addCondition);
                 }
 
@@ -260,7 +260,7 @@ else if (getMode() == MODE.UPDATE_ONLY)
         }
     }
 
-    private List<CompareType.CompareClause> parseAdditionalFilters(String rawVal)
+    private List<CompareType.AbstractCompareClause> parseAdditionalFilters(String rawVal)
     {
         rawVal = StringUtils.trimToNull(rawVal);
         if (rawVal == null)
@@ -276,12 +276,12 @@ private List<CompareType.CompareClause> parseAdditionalFilters(String rawVal)
         }
 
         return filter.getClauses().stream().map(fc -> {
-            if (fc instanceof CompareType.CompareClause cc)
+            if (fc instanceof CompareType.AbstractCompareClause cc)
             {
                 return cc;
             }
 
-            throw new IllegalStateException("Expected all filters to be instance CompareType.CompareClause, found: " + fc.getClass());
+            throw new IllegalStateException("Expected all filters to be instance CompareType.AbstractCompareClause, found: " + fc.getClass());
         }).toList();
     }
 
@@ -378,8 +378,8 @@ private List<Map<String, Object>> getRowsToImport(List<String> subjects, Logger
             sr.addFilter(_settings.get(Settings.dataSourceSubjectColumn.name()), StringUtils.join(subjects, ";"), Filter.Operator.IN);
             if (_settings.get(Settings.dataSourceAdditionalFilters.name()) != null)
             {
-                List<CompareType.CompareClause> additionalFilters = parseAdditionalFilters(_settings.get(Settings.dataSourceAdditionalFilters.name()));
-                for (CompareType.CompareClause f : additionalFilters)
+                List<CompareType.AbstractCompareClause> additionalFilters = parseAdditionalFilters(_settings.get(Settings.dataSourceAdditionalFilters.name()));
+                for (CompareType.AbstractCompareClause f : additionalFilters)
                 {
                     Object value;
                     if (f.getParamVals() == null)
@@ -471,7 +471,7 @@ else if (f.getParamVals().length == 1)
             final SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_settings.get(Settings.dataSourceSubjectColumn.name())), subjects, CompareType.IN);
             if (_settings.get(Settings.dataSourceAdditionalFilters.name()) != null)
             {
-                List<CompareType.CompareClause> additionalFilters = parseAdditionalFilters(_settings.get(Settings.dataSourceAdditionalFilters.name()));
+                List<CompareType.AbstractCompareClause> additionalFilters = parseAdditionalFilters(_settings.get(Settings.dataSourceAdditionalFilters.name()));
                 additionalFilters.forEach(filter::addCondition);
             }