Build test jars and cleanup some missing method overrides (#2280)

Co-authored-by: MiguelRicardos <[email protected]>
NationalSecurityAgency · Mar 19, 2024 · 94afef9 · 94afef9
1 parent cdfbcc2
commit 94afef9
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 0 deletions.
diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml
@@ -211,6 +211,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git 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<Key,Value> iter) {
         throw new UnsupportedOperationException();

diff --git a/...se/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reduce/AggregatingReducer.java b/...se/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
@@ -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<Key,Value> 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
@@ -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
@@ -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
@@ -153,6 +153,14 @@
             <version>2.3.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave</groupId>
+            <artifactId>datawave-core</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>base-rest-responses</artifactId>

diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml
@@ -215,6 +215,20 @@
             <artifactId>jboss-transaction-api_1.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave</groupId>
+            <artifactId>datawave-core</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <type>test-jar</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave</groupId>
             <artifactId>datawave-in-memory-accumulo</artifactId>