diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 79311d52c0b..32a997477d0 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -211,6 +211,13 @@ org.apache.maven.plugins maven-jar-plugin 2.4 + + + + test-jar + + + org.apache.maven.plugins diff --git a/warehouse/core/src/main/java/datawave/mr/bulk/BulkIteratorEnvironment.java b/warehouse/core/src/main/java/datawave/mr/bulk/BulkIteratorEnvironment.java index f83524201e3..e053efc798a 100644 --- a/warehouse/core/src/main/java/datawave/mr/bulk/BulkIteratorEnvironment.java +++ b/warehouse/core/src/main/java/datawave/mr/bulk/BulkIteratorEnvironment.java @@ -40,6 +40,11 @@ public boolean isFullMajorCompaction() { throw new UnsupportedOperationException(); } + @Override + public boolean isUserCompaction() { + throw new UnsupportedOperationException(); + } + @Override public void registerSideChannel(SortedKeyValueIterator iter) { throw new UnsupportedOperationException(); diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reduce/AggregatingReducer.java b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reduce/AggregatingReducer.java index 9ef2b01e37a..68cf0bbf935 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reduce/AggregatingReducer.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reduce/AggregatingReducer.java @@ -500,6 +500,11 @@ public IteratorUtil.IteratorScope getIteratorScope() { return null; } + @Override + public boolean isUserCompaction() { + return false; + } + @Override public boolean isFullMajorCompaction() { return false; diff --git a/warehouse/ingest-core/src/test/java/datawave/iterators/PropogatingIteratorTest.java b/warehouse/ingest-core/src/test/java/datawave/iterators/PropogatingIteratorTest.java index 5bd17044791..f4ca220a6dd 100644 --- a/warehouse/ingest-core/src/test/java/datawave/iterators/PropogatingIteratorTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/iterators/PropogatingIteratorTest.java @@ -82,10 +82,22 @@ private Uid.List.Builder createValueWithRemoveUid(String uid) { public static class MockIteratorEnvironment implements IteratorEnvironment { AccumuloConfiguration conf; private final boolean major; + private final boolean isUser; + + public MockIteratorEnvironment(AccumuloConfiguration conf) { + this.conf = conf; + this.isUser = false; + this.major = false; + } public MockIteratorEnvironment(boolean major) { + this(major, false); + } + + public MockIteratorEnvironment(boolean major, boolean isUser) { this.conf = DefaultConfiguration.getInstance(); this.major = major; + this.isUser = isUser; } @Override @@ -106,6 +118,11 @@ public boolean isFullMajorCompaction() { return major; } + @Override + public boolean isUserCompaction() { + return isUser; + } + @Override public void registerSideChannel(SortedKeyValueIterator iter) { throw new UnsupportedOperationException(); diff --git a/warehouse/query-core/src/main/java/datawave/mr/bulk/RecordIterator.java b/warehouse/query-core/src/main/java/datawave/mr/bulk/RecordIterator.java index c15fdb62da6..11315035581 100644 --- a/warehouse/query-core/src/main/java/datawave/mr/bulk/RecordIterator.java +++ b/warehouse/query-core/src/main/java/datawave/mr/bulk/RecordIterator.java @@ -185,6 +185,21 @@ public IteratorScope getIteratorScope() { return IteratorScope.scan; } + @Override + public boolean isFullMajorCompaction() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isUserCompaction() { + return false; + } + + @Override + public Authorizations getAuthorizations() { + throw new UnsupportedOperationException(); + } + @Override public IteratorEnvironment cloneWithSamplingEnabled() { throw new SampleNotPresentException(); diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/SourceManagerTest.java b/warehouse/query-core/src/test/java/datawave/query/iterator/SourceManagerTest.java index b7d7f488be7..3a1eaee6241 100644 --- a/warehouse/query-core/src/test/java/datawave/query/iterator/SourceManagerTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/iterator/SourceManagerTest.java @@ -393,6 +393,11 @@ public boolean isFullMajorCompaction() { throw new UnsupportedOperationException(); } + @Override + public boolean isUserCompaction() { + return false; + } + @Override public Authorizations getAuthorizations() { throw new UnsupportedOperationException(); diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index 6bd11ca1617..fab0105071a 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -153,6 +153,14 @@ 2.3.3 test + + gov.nsa.datawave + datawave-core + ${project.version} + tests + test-jar + test + gov.nsa.datawave.microservice base-rest-responses diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 68f3baa14c1..2340575ba0b 100644 --- a/web-services/query/pom.xml +++ b/web-services/query/pom.xml @@ -215,6 +215,20 @@ jboss-transaction-api_1.2_spec provided + + gov.nsa.datawave + datawave-core + ${project.version} + tests + test-jar + test + + + org.apache.logging.log4j + log4j-slf4j-impl + + + gov.nsa.datawave datawave-in-memory-accumulo