Skip to content

Commit

Permalink
Merge branch 'integration' into feature/passCombinerOptions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mineralntl
mineralntl authored Jan 10, 2025
2 parents b60c330 + 99ae8d6 commit 752e046
Show file tree
Hide file tree
Showing 84 changed files with 189 additions and 216 deletions.
2 changes: 1 addition & 1 deletion common-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-common-test</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion contrib/datawave-quickstart/docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>quickstart</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/cached-results/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-cached-results</artifactId>
<name>${project.artifactId}</name>
Expand Down
1 change: 0 additions & 1 deletion ...cached-results/src/main/java/datawave/core/query/cachedresults/CacheableQueryRowImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import datawave.data.type.Type;
import datawave.marking.MarkingFunctions;
import datawave.marking.MarkingFunctionsFactory;
import datawave.webservice.query.cachedresults.CacheableQueryRow;
import datawave.webservice.query.data.ObjectSizeOf;
import datawave.webservice.query.util.TypedValue;
Expand Down
2 changes: 1 addition & 1 deletion core/common-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-common-util</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-common</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/connection-pool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-connection-pool</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/map-reduce/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-map-reduce</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/modification/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-modification</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/query/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-query</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-core-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<groupId>gov.nsa.datawave.core</groupId>
<artifactId>datawave-utils-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.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. -->
Expand Down
2 changes: 1 addition & 1 deletion microservices/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>datawave-microservice-build-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion microservices/services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>datawave-microservice-build-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-microservice-service-build-parent</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion microservices/starters/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>datawave-microservice-build-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-microservice-starter-build-parent</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.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, secure access to your data.</description>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/accumulo-extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-accumulo-extensions</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/age-off-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-age-off-utils</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/age-off/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-age-off</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/assemble/datawave/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>assemble-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>assemble-datawave</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/assemble/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>assemble-parent</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/assemble/webservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>assemble-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>assemble-webservice</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-common</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/data-dictionary-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-data-dictionary-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/edge-dictionary-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-edge-dictionary-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/edge-model-configuration-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-edge-model-configuration-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/index-stats/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-index-stats</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-configuration</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-core</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 1 addition & 3 deletions ...e/src/main/java/datawave/ingest/mapreduce/handler/dateindex/DateIndexDataTypeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ public class DateIndexDataTypeHandler<KEYIN> implements DataTypeHandler<KEYIN>,
public static final String DATEINDEX_TNAME = "date.index.table.name";
public static final String DATEINDEX_LPRIORITY = "date.index.table.loader.priority";

private static final MarkingFunctions markingFunctions = MarkingFunctions.Factory.createMarkingFunctions();

// comma delimited <date type>=<field name> values
public static final String DATEINDEX_TYPE_TO_FIELDS = ".date.index.type.to.field.map";

Expand Down Expand Up @@ -367,7 +365,7 @@ private Value createDateIndexValue(int shard) {
* @return the flattened visibility
*/
protected byte[] flatten(ColumnVisibility vis) {
return markingFunctions.flatten(vis);
return MarkingFunctions.Factory.createMarkingFunctions().flatten(vis);
}

public Text getDateIndexTableName() {
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-csv/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-csv</artifactId>
<packaging>jar</packaging>
Expand Down
3 changes: 1 addition & 2 deletions warehouse/ingest-csv/src/main/java/datawave/ingest/csv/mr/input/CSVRecordReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public class CSVRecordReader extends CSVReaderBase implements EventFixer {
private static final Logger log = Logger.getLogger(CSVRecordReader.class);

private static final IngestConfiguration ingestConfig = IngestConfigurationFactory.getIngestConfiguration();
private static final MarkingFunctions markingFunctions = MarkingFunctionsFactory.createMarkingFunctions();

protected String csvEventId;
private final Multimap<String,Object> metadataForValidation = ArrayListMultimap.create(100, 1);
Expand Down Expand Up @@ -128,7 +127,7 @@ protected void decorateEvent() {
if (null != this.securityMarkings && !this.securityMarkings.isEmpty()) {
event.setSecurityMarkings(securityMarkings);
try {
event.setVisibility(markingFunctions.translateToColumnVisibility(securityMarkings));
event.setVisibility(MarkingFunctionsFactory.createMarkingFunctions().translateToColumnVisibility(securityMarkings));
} catch (MarkingFunctions.Exception e) {
log.error("Could not set default ColumnVisibility for the event", e);
throw new RuntimeException(e);
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-json</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-nyctlc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-nyctlc</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-scripts/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-scripts</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-ssdeep/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-ssdeep</artifactId>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ingest-wikipedia/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-wikipedia</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/metrics-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-warehouse-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-metrics-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ops-tools/config-compare/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-ops-tools-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ops-tools-config-compare</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/ops-tools/index-validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-ops-tools-parent</artifactId>
<version>7.13.0-SNAPSHOT</version>
<version>7.14.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ops-tools-index-validation</artifactId>
<packaging>jar</packaging>
Expand Down
Loading

0 comments on commit 752e046

Please sign in to comment.