Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/integration' into update-pom-jac…
Browse files Browse the repository at this point in the history 
…kson
  • Loading branch information
@avgAGB
avgAGB committed Jan 6, 2025
2 parents 17bdaf5 + df77935 commit b07aa98
Show file tree
Hide file tree
Showing 97 changed files with 440 additions and 414 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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-cached-results</artifactId>
<name>${project.artifactId}</name>
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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-core-query</artifactId>
<name>${project.artifactId}</name>
Expand Down
3 changes: 2 additions & 1 deletion core/query/src/main/java/datawave/core/query/configuration/GenericQueryConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ public void copyFrom(GenericQueryConfiguration other) {
this.setEndDate(other.getEndDate());
this.setMaxWork(other.getMaxWork());
this.setQueries(other.getQueries());
this.setQueriesIter(other.getQueriesIter());
// copying the query iterators can cause issues if the query is running.
// this.setQueriesIter(other.getQueriesIter());
this.setQueryString(other.getQueryString());
this.setTableName(other.getTableName());
this.setReduceResults(other.isReduceResults());
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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-core</artifactId>
<packaging>jar</packaging>
Expand Down
40 changes: 16 additions & 24 deletions ...ngest-core/src/test/java/datawave/ingest/mapreduce/job/MultiRFileOutputFormatterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@
import org.apache.hadoop.util.StringUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.powermock.api.easymock.PowerMock;
import org.mockito.Mockito;

import datawave.ingest.data.config.ingest.AccumuloHelper;
import datawave.util.TableName;
Expand Down Expand Up @@ -75,54 +74,47 @@ protected Configuration createMockConfiguration() {

MultiRFileOutputFormatterTest.mockedConfiguration.clear();

Configuration mocked = PowerMock.createMock(Configuration.class);
Configuration mocked = Mockito.mock(Configuration.class);

MultiRFileOutputFormatterTest.logger.info(String.format("createMockConfiguration: %d", mocked.hashCode()));

mocked.set(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class));
EasyMock.expectLastCall().andAnswer(() -> {
Mockito.doAnswer(invocationOnMock -> {

String key = (String) EasyMock.getCurrentArguments()[0];
String value = (String) EasyMock.getCurrentArguments()[1];
String key = (String) invocationOnMock.getArguments()[0];
String value = (String) invocationOnMock.getArguments()[1];

MultiRFileOutputFormatterTest.mockedConfiguration.put(key, value);

return null;
}).anyTimes();
}).when(mocked).set(Mockito.any(String.class), Mockito.any(String.class));

mocked.setStrings(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class), EasyMock.anyObject(String.class));
EasyMock.expectLastCall().andAnswer(() -> {
Mockito.doAnswer(invocationOnMock -> {
if (2 <= invocationOnMock.getArguments().length) {

if (2 <= EasyMock.getCurrentArguments().length) {

String key = (String) EasyMock.getCurrentArguments()[0];
String[] values = new String[EasyMock.getCurrentArguments().length - 1];
String key = (String) invocationOnMock.getArguments()[0];
String[] values = new String[invocationOnMock.getArguments().length - 1];

for (int index = 1; index <= values.length; index++) {

values[index - 1] = (String) EasyMock.getCurrentArguments()[index];
values[index - 1] = (String) invocationOnMock.getArguments()[index];
}

MultiRFileOutputFormatterTest.mockedConfiguration.put(key, StringUtils.arrayToString(values));
}
return null;
}).anyTimes();

mocked.get(EasyMock.anyObject(String.class), EasyMock.anyObject(String.class));
EasyMock.expectLastCall().andAnswer(() -> {
}).when(mocked).setStrings(Mockito.any(String.class), Mockito.any(String.class), Mockito.any(String.class));

String key = (String) EasyMock.getCurrentArguments()[0];
String value = (String) EasyMock.getCurrentArguments()[1];
Mockito.doAnswer(invocationOnMock -> {
String key = (String) invocationOnMock.getArguments()[0];
String value = (String) invocationOnMock.getArguments()[1];

if (MultiRFileOutputFormatterTest.mockedConfiguration.containsKey(key)) {

value = MultiRFileOutputFormatterTest.mockedConfiguration.get(key);
}

return value;
}).anyTimes();

PowerMock.replay(mocked);
}).when(mocked).get(Mockito.any(String.class), Mockito.any(String.class));

return mocked;
}
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.12.0-SNAPSHOT</version>
<version>7.13.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-csv</artifactId>
<packaging>jar</packaging>
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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.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.12.0-SNAPSHOT</version>
<version>7.13.0-SNAPSHOT</version>
</parent>
<artifactId>datawave-ingest-scripts</artifactId>
<name>${project.artifactId}</name>
Expand Down
Loading

0 comments on commit b07aa98

Please sign in to comment.