Merge branch 'integration' into version-property-names

common-test/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-common-test</artifactId>
     <name>${project.artifactId}</name>

contrib/datawave-quickstart/docker/Dockerfile

@@ -28,8 +28,8 @@ COPY . /opt/datawave
 
 # Install dependencies, configure password-less/zero-prompt SSH...
 
-RUN yum -y install gcc-c++ openssl openssh openssh-server openssh-clients openssl-libs which bc wget git java-11-openjdk-devel iproute  && \
-    yum clean all && \
+RUN dnf -y install gcc-c++ openssl openssh openssh-server openssh-clients openssl-libs which bc wget git java-11-openjdk-devel iproute  && \
+    dnf clean all && \
     ssh-keygen -q -N "" -t rsa -f ~/.ssh/id_rsa && \
     cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys && \
     chmod 0600 ~/.ssh/authorized_keys && \

contrib/datawave-quickstart/docker/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>quickstart</artifactId>

core/cached-results/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core-cached-results</artifactId>
     <name>${project.artifactId}</name>

core/common-util/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core-common-util</artifactId>
     <name>${project.artifactId}</name>

core/common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core-common</artifactId>
     <name>${project.artifactId}</name>

core/connection-pool/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core-connection-pool</artifactId>
     <name>${project.artifactId}</name>

core/map-reduce/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core-map-reduce</artifactId>
     <name>${project.artifactId}</name>

core/modification/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core-modification</artifactId>
     <name>${project.artifactId}</name>

core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <groupId>gov.nsa.datawave.core</groupId>
     <artifactId>datawave-core-parent</artifactId>

core/query/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-core-query</artifactId>
     <name>${project.artifactId}</name>

core/query/src/main/java/datawave/core/query/logic/composite/CompositeLogicException.java

@@ -7,38 +7,88 @@
 import datawave.webservice.query.exception.QueryException;
 
 public class CompositeLogicException extends RuntimeException {
+
     public CompositeLogicException(String message, String logicName, Exception exception) {
-        super(getMessage(message, Collections.singletonMap(logicName, exception)), exception);
+        super(getMessage(message, Collections.singletonMap(logicName, exception)), getRaisedQueryException(exception));
     }
 
     public CompositeLogicException(String message, Map<String,Exception> exceptions) {
-        super(getMessage(message, exceptions), getQueryException(exceptions.values()));
+        super(getMessage(message, exceptions), getCause(exceptions.values()));
         if (exceptions.size() > 1) {
             exceptions.values().forEach(this::addSuppressed);
         }
     }
 
-    // looking for an exception that has a nested QueryException such that we may return an error code
-    private static Exception getQueryException(Collection<Exception> exceptions) {
+    /**
+     * Return the cause to use, prioritizing the first {@link QueryException} instance that we see. In the case where the {@link QueryException} is found to be
+     * the cause or further nested in the stack of an {@link Exception}, a {@link CompositeRaisedQueryException} will be returned with the query exception's
+     * error code, and the original exception as the cause. This is necessary to ensure the error code is passed to query metrics.
+     */
+    private static Exception getCause(Collection<Exception> exceptions) {
         if (exceptions.size() == 1) {
             return exceptions.iterator().next();
         }
-        Exception e = null;
-        for (Exception test : exceptions) {
-            if (e == null) {
-                e = test;
-            } else if (isQueryException(test)) {
-                e = test;
+        Exception cause = null;
+        for (Exception exception : exceptions) {
+            // Establish the initial cause as the first seen exception.
+            if (cause == null) {
+                cause = getRaisedQueryException(exception);
+                // If the first cause we see is a QueryException, there's nothing further to do.
+                if (cause instanceof QueryException) {
+                    return cause;
+                }
+                // If a subsequent exception is a or contains a QueryException in its stack, return it with the query exception error code available at the root
+                // exception.
+            } else if (hasQueryExceptionInStack(exception)) {
+                return getRaisedQueryException(exception);
             }
-            if (isQueryException(e)) {
-                break;
+        }
+        return cause;
+    }
+
+    /**
+     * Return whether the given throwable contains at least one {@link QueryException} in its stack trace (including itself).
+     */
+    private static boolean hasQueryExceptionInStack(Throwable throwable) {
+        return getFirstQueryExceptionInStack(throwable) != null;
+    }
+
+    /**
+     * Return the given exception with query exception's error code (if present) available at the root exception. This means one of the following cases will
+     * occur:
+     * <ul>
+     * <li>The exception is not a {@link QueryException} and no {@link QueryException} exists in the exception's stack: The exception will be returned.</li>
+     * <li>The exception is a {@link QueryException}: The exception will be returned.</li>
+     * <li>The exception is not a {@link QueryException}, but a {@link QueryException} exists in the exception's stack. A {@link CompositeRaisedQueryException}
+     * will be returned with the error code of the first {@link QueryException} found in the stack, and the original exception as its cause.</li>
+     * </ul>
+     */
+    private static Exception getRaisedQueryException(Exception exception) {
+        if (exception instanceof QueryException) {
+            return exception;
+        } else {
+            // TODO - should we fetch the top-most or bottom-most query exception in the stack?
+            QueryException queryException = getFirstQueryExceptionInStack(exception);
+            if (queryException != null) {
+                return new CompositeRaisedQueryException(exception, queryException.getErrorCode());
+            } else {
+                return exception;
             }
         }
-        return e;
     }
 
-    private static boolean isQueryException(Exception e) {
-        return new QueryException(e).getQueryExceptionsInStack().size() > 1;
+    /**
+     * Return the first {@link QueryException} found in the stack, or null if none were found.
+     */
+    private static QueryException getFirstQueryExceptionInStack(Throwable throwable) {
+        if (throwable != null) {
+            if (throwable instanceof QueryException) {
+                return (QueryException) throwable;
+            } else {
+                return getFirstQueryExceptionInStack(throwable.getCause());
+            }
+        }
+        return null;
     }
 
     private static String getMessage(String message, Map<String,Exception> exceptions) {

core/query/src/main/java/datawave/core/query/logic/composite/CompositeRaisedQueryException.java

@@ -0,0 +1,16 @@
+package datawave.core.query.logic.composite;
+
+import datawave.webservice.query.exception.QueryException;
+
+/**
+ * This class exists to be used when a {@link CompositeLogicException} has a cause that is not a {@link QueryException}, but contains a {@link QueryException}
+ * in its stack trace. In order for the error code to be properly passed to query metrics, the error code must be present as part of the
+ * {@link CompositeLogicException}'s cause. This exception is intended to be a wrapper for the original cause, with the error code of the identified query
+ * exception.
+ */
+public class CompositeRaisedQueryException extends QueryException {
+
+    public CompositeRaisedQueryException(Throwable cause, String errorCode) {
+        super(cause, errorCode);
+    }
+}

core/query/src/test/java/datawave/core/query/logic/composite/CompositeLogicExceptionTest.java

@@ -0,0 +1,100 @@
+package datawave.core.query.logic.composite;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+import datawave.webservice.query.exception.DatawaveErrorCode;
+import datawave.webservice.query.exception.QueryException;
+
+public class CompositeLogicExceptionTest {
+
+    @Test
+    public void testSingleNonQueryExceptionCause() {
+        IllegalArgumentException cause = new IllegalArgumentException("illegal argument");
+        CompositeLogicException exception = new CompositeLogicException("composite error occurred", "LogicName", cause);
+        assertEquals("composite error occurred:\nLogicName: illegal argument", exception.getMessage());
+        assertEquals(cause, exception.getCause());
+    }
+
+    @Test
+    public void testSingleQueryExceptionCause() {
+        QueryException cause = new QueryException(DatawaveErrorCode.MODEL_FETCH_ERROR, "connection failed");
+        CompositeLogicException exception = new CompositeLogicException("composite error occurred", "LogicName", cause);
+
+        assertEquals("composite error occurred:\nLogicName: Could not get model. connection failed", exception.getMessage());
+        assertEquals(cause, exception.getCause());
+        assertEquals(DatawaveErrorCode.MODEL_FETCH_ERROR.getErrorCode(), ((QueryException) exception.getCause()).getErrorCode());
+    }
+
+    @Test
+    public void testNestedSingleQueryExceptionCause() {
+        QueryException nestedCause = new QueryException(DatawaveErrorCode.MODEL_FETCH_ERROR, "connection failed");
+        IllegalArgumentException cause = new IllegalArgumentException("illegal argument", nestedCause);
+        CompositeLogicException exception = new CompositeLogicException("composite error occurred", "LogicName", cause);
+        assertEquals("composite error occurred:\nLogicName: illegal argument", exception.getMessage());
+        assertEquals(CompositeRaisedQueryException.class, exception.getCause().getClass());
+        assertEquals(DatawaveErrorCode.MODEL_FETCH_ERROR.getErrorCode(), ((CompositeRaisedQueryException) exception.getCause()).getErrorCode());
+    }
+
+    @Test
+    public void testMultipleNonQueryExceptionCauses() {
+        IllegalArgumentException expectedCause = new IllegalArgumentException("illegal name");
+        Map<String,Exception> exceptions = new LinkedHashMap<>();
+        exceptions.put("logic1", expectedCause);
+        exceptions.put("logic2", new NullPointerException("null value"));
+        exceptions.put("logic3", new IllegalStateException("bad state"));
+
+        CompositeLogicException exception = new CompositeLogicException("failed to complete", exceptions);
+        assertEquals("failed to complete:\nlogic1: illegal name\nlogic2: null value\nlogic3: bad state", exception.getMessage());
+        assertEquals(expectedCause, exception.getCause());
+    }
+
+    @Test
+    public void testMultipleExceptionWithOneTopLevelQueryException() {
+        QueryException expectedCause = new QueryException(DatawaveErrorCode.MODEL_FETCH_ERROR, "connection failed");
+        Map<String,Exception> exceptions = new LinkedHashMap<>();
+        exceptions.put("logic1", new IllegalArgumentException("illegal name"));
+        exceptions.put("logic2", new NullPointerException("null value"));
+        exceptions.put("logic3", expectedCause);
+        exceptions.put("logic4", new IllegalStateException("bad state"));
+
+        CompositeLogicException exception = new CompositeLogicException("failed to complete", exceptions);
+        assertEquals("failed to complete:\nlogic1: illegal name\nlogic2: null value\nlogic3: Could not get model. connection failed\nlogic4: bad state",
+                        exception.getMessage());
+        assertEquals(expectedCause, exception.getCause());
+    }
+
+    @Test
+    public void testMultipleExceptionWithOneNestedQueryException() {
+        QueryException nestedCause = new QueryException(DatawaveErrorCode.MODEL_FETCH_ERROR, "connection failed");
+        IllegalStateException topCause = new IllegalStateException("bad state", nestedCause);
+        Map<String,Exception> exceptions = new LinkedHashMap<>();
+        exceptions.put("logic1", new IllegalArgumentException("illegal name"));
+        exceptions.put("logic2", topCause);
+        exceptions.put("logic3", new NullPointerException("null value"));
+
+        CompositeLogicException exception = new CompositeLogicException("failed to complete", exceptions);
+        assertEquals("failed to complete:\nlogic1: illegal name\nlogic2: bad state\nlogic3: null value", exception.getMessage());
+        assertEquals(CompositeRaisedQueryException.class, exception.getCause().getClass());
+        assertEquals(DatawaveErrorCode.MODEL_FETCH_ERROR.getErrorCode(), ((CompositeRaisedQueryException) exception.getCause()).getErrorCode());
+    }
+
+    @Test
+    public void testMultipleExceptionWithNestedQueryExceptionSeenFirst() {
+        QueryException nestedCause = new QueryException(DatawaveErrorCode.MODEL_FETCH_ERROR, "connection failed");
+        IllegalStateException topCause = new IllegalStateException("bad state", nestedCause);
+        Map<String,Exception> exceptions = new LinkedHashMap<>();
+        exceptions.put("logic1", topCause);
+        exceptions.put("logic2", new IllegalArgumentException("illegal name"));
+        exceptions.put("logic3", new NullPointerException("null value"));
+
+        CompositeLogicException exception = new CompositeLogicException("failed to complete", exceptions);
+        assertEquals("failed to complete:\nlogic1: bad state\nlogic2: illegal name\nlogic3: null value", exception.getMessage());
+        assertEquals(CompositeRaisedQueryException.class, exception.getCause().getClass());
+        assertEquals(DatawaveErrorCode.MODEL_FETCH_ERROR.getErrorCode(), ((CompositeRaisedQueryException) exception.getCause()).getErrorCode());
+    }
+}

core/utils/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.core</groupId>
         <artifactId>datawave-core-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <groupId>gov.nsa.datawave.core</groupId>
     <artifactId>datawave-utils-parent</artifactId>

docs/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.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. -->

microservices/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <groupId>gov.nsa.datawave.microservice</groupId>
     <artifactId>datawave-microservice-build-parent</artifactId>

microservices/services/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-build-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-microservice-service-build-parent</artifactId>
     <packaging>pom</packaging>

microservices/starters/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-build-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-microservice-starter-build-parent</artifactId>
     <packaging>pom</packaging>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>gov.nsa.datawave</groupId>
     <artifactId>datawave-parent</artifactId>
-    <version>7.1.0-SNAPSHOT</version>
+    <version>7.2.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>

warehouse/accumulo-extensions/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-accumulo-extensions</artifactId>
     <name>${project.artifactId}</name>

warehouse/age-off-utils/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave</groupId>
         <artifactId>datawave-warehouse-parent</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>datawave-age-off-utils</artifactId>
     <name>${project.artifactId}</name>