Merge branch 'integration' into task/RemoveUniversalset-1699

NationalSecurityAgency · Oct 5, 2023 · aa34288 · aa34288
2 parents 50bf1d5 + 5d1edc1
commit aa34288
Show file tree

Hide file tree

Showing 59 changed files with 214 additions and 210 deletions.
diff --git a/common-test/pom.xml b/common-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-common-test</artifactId>
     <name>${project.artifactId}</name>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-docs</artifactId>
     <!-- Declare all datawave modules as dependencies in order to have the javadoc include all the datawave source. -->

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>gov.nsa.datawave</groupId>
     <artifactId>datawave-parent</artifactId>
-    <version>5.11.0-SNAPSHOT</version>
+    <version>5.12.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>DataWave</name>
     <description>DataWave is a Java-based ingest and query framework that leverages Apache Accumulo to provide fast,

diff --git a/warehouse/accumulo-extensions/pom.xml b/warehouse/accumulo-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-accumulo-extensions</artifactId>
     <name>${project.artifactId}</name>

diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>assemble-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>assemble-datawave</artifactId>
     <packaging>pom</packaging>

diff --git a/warehouse/assemble/pom.xml b/warehouse/assemble/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>assemble-parent</artifactId>
     <packaging>pom</packaging>

diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>assemble-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>assemble-webservice</artifactId>
     <name>${project.artifactId}</name>

diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-common</artifactId>
     <name>${project.artifactId}</name>

diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-data-dictionary-core</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-edge-dictionary-core</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/edge-model-configuration-core/pom.xml b/warehouse/edge-model-configuration-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-edge-model-configuration-core</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-index-stats</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ingest-configuration</artifactId>
     <dependencies>

diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ingest-core</artifactId>
     <packaging>jar</packaging>

diff --git a/...ingest-core/src/main/java/datawave/ingest/data/config/ingest/ContentBaseIngestHelper.java b/...ingest-core/src/main/java/datawave/ingest/data/config/ingest/ContentBaseIngestHelper.java
@@ -3,13 +3,11 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.log4j.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Sets;
 
 import datawave.ingest.data.config.FieldConfigHelper;
 
@@ -69,7 +67,7 @@ private static Collection<String> trimConfigStrings(Configuration config, String
             String[] names = datawave.util.StringUtils.split(c, ',');
             for (String n : names) {
                 n = n.trim();
-                if (n.equals(""))
+                if (n.isEmpty())
                     continue;
 
                 s.add(n);
@@ -179,25 +177,4 @@ public String getRawDocumentViewName() {
         return rawDocumentViewName;
     }
 
-    public static Set<String> parseMultiLineConfigValue(String s, Pattern splitter) {
-        return cleanSet(Sets.newHashSet(splitter.split(s)));
-    }
-
-    /**
-     * Utility method to take a {@code String[]} and return a {@code Set<String>} where the values are trimmed
-     *
-     * @param items
-     *            String[] of items to trim and turn into a set
-     * @return unique Set of strings where whitespace has been trimmed.
-     */
-    public static Set<String> cleanSet(Collection<String> items) {
-        Set<String> itemSet = new HashSet<>();
-        for (String item : items) {
-            item = item.trim();
-            if (!item.isEmpty()) {
-                itemSet.add(item);
-            }
-        }
-        return itemSet;
-    }
 }
diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ingest-csv</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ingest-json</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ingest-nyctlc</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/ingest-scripts/pom.xml b/warehouse/ingest-scripts/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ingest-scripts</artifactId>
     <name>${project.artifactId}</name>

diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ingest-wikipedia</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-metrics-core</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-ops-tools-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ops-tools-config-compare</artifactId>
     <dependencies>

diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-ops-tools-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ops-tools-index-validation</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/ops-tools/pom.xml b/warehouse/ops-tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-ops-tools-parent</artifactId>
     <packaging>pom</packaging>

diff --git a/warehouse/pom.xml b/warehouse/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-warehouse-parent</artifactId>
     <packaging>pom</packaging>

diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>5.11.0-SNAPSHOT</version>
+        <version>5.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-query-core</artifactId>
     <packaging>jar</packaging>

diff --git a/warehouse/query-core/src/test/java/datawave/mr/bulk/RecordIteratorTest.java b/warehouse/query-core/src/test/java/datawave/mr/bulk/RecordIteratorTest.java
@@ -89,34 +89,34 @@ public void testIteratorStackSetup() throws Exception {
 
         // Top of the stack is a ConfigurableVisibilityFilter (which creates a VisibilityFilter as its source) with auths C1,C2,C3
         assertEquals(ConfigurableVisibilityFilter.class, internalIter.getClass());
-        cvf = ConfigurableVisibilityFilter.class.cast(internalIter);
+        cvf = (ConfigurableVisibilityFilter) internalIter;
         source = Whitebox.getInternalState(cvf, "source");
         assertEquals(VisibilityFilter.class, source.getClass());
-        vf = VisibilityFilter.class.cast(source);
+        vf = (VisibilityFilter) source;
         actualAuths = new TreeSet<>(Arrays.asList(Whitebox.getInternalState(vf, Authorizations.class).toString().split(",")));
         assertEquals(new TreeSet<>(Arrays.asList("C1", "C2", "C3")), actualAuths);
         source = Whitebox.getInternalState(vf, "source");
 
         // Next on the stack is a ConfigurableVisibilityFilter (which creates a VisibilityFilter as its source) with auths B1,B2,B3
         assertEquals(ConfigurableVisibilityFilter.class, source.getClass());
-        cvf = ConfigurableVisibilityFilter.class.cast(source);
+        cvf = (ConfigurableVisibilityFilter) source;
         source = Whitebox.getInternalState(cvf, "source");
         assertEquals(VisibilityFilter.class, source.getClass());
-        vf = VisibilityFilter.class.cast(source);
+        vf = (VisibilityFilter) source;
         actualAuths = new TreeSet<>(Arrays.asList(Whitebox.getInternalState(vf, Authorizations.class).toString().split(",")));
         assertEquals(new TreeSet<>(Arrays.asList("B1", "B2", "B3")), actualAuths);
         source = Whitebox.getInternalState(vf, "source");
 
         // The next table iterator should be the standard VisibilityFilter which will have auths A1,A2,A3
         assertEquals(VisibilityFilter.class, source.getClass());
-        vf = VisibilityFilter.class.cast(source);
+        vf = (VisibilityFilter) source;
         actualAuths = new TreeSet<>(Arrays.asList(Whitebox.getInternalState(vf, Authorizations.class).toString().split(",")));
         assertEquals(new TreeSet<>(Arrays.asList("A1", "A2", "A3")), actualAuths);
         source = Whitebox.getInternalState(vf, "source");
 
         // The next table iterator should be a DeletingIterator
         assertEquals(DeletingIterator.class, source.getClass());
-        DeletingIterator di = DeletingIterator.class.cast(source);
+        DeletingIterator di = (DeletingIterator) source;
         source = Whitebox.getInternalState(di, "source");
 
         // And finally, at the bottom of the stack is a MultiIterator (which has no source field)