Feature/spring boot 2.x accumulo 2.1

api/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-parent</artifactId>
-        <version>1.9</version>
-        <relativePath />
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../../../microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>audit-api</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <url>https://code.nsa.gov/datawave-audit-service</url>
     <scm>
         <connection>scm:git:https://github.com/NationalSecurityAgency/datawave-audit-service.git</connection>
@@ -57,6 +57,10 @@
                         <artifactId>*</artifactId>
                         <groupId>org.slf4j</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>*</artifactId>
+                        <groupId>log4j</groupId>
+                    </exclusion>
                     <exclusion>
                         <artifactId>commons-logging</artifactId>
                         <groupId>commons-logging</groupId>
@@ -94,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

api/src/main/java/datawave/webservice/common/audit/AuditParameters.java

@@ -1,5 +1,12 @@
 package datawave.webservice.common.audit;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import datawave.webservice.common.audit.Auditor.AuditType;
+import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -9,15 +16,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import com.google.common.base.Splitter;
-import datawave.webservice.common.audit.Auditor.AuditType;
-
-import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.google.common.base.Preconditions;
-
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class AuditParameters {

api/src/test/java/datawave/webservice/common/audit/AuditParametersTest.java

@@ -3,7 +3,14 @@
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.junit.jupiter.api.Test;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;

pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-parent</artifactId>
-        <version>1.9</version>
-        <relativePath />
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../../microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>audit-service-parent</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://code.nsa.gov/datawave-audit-service</url>
     <modules>

service/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>2.1</version>
-        <relativePath />
+        <version>3.1-SNAPSHOT</version>
+        <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>audit-service</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <description>DATAWAVE Auditing Microservice</description>
     <url>https://code.nsa.gov/datawave-audit-service</url>
     <scm>
@@ -20,9 +20,9 @@
     <properties>
         <version.commons>3.9</version.commons>
         <version.hadoop>3.3.4</version.hadoop>
-        <version.microservice.audit-api>2.1.2-SNAPSHOT</version.microservice.audit-api>
-        <version.microservice.hazelcast-client>2.1.1</version.microservice.hazelcast-client>
-        <version.microservice.starter>2.1.1</version.microservice.starter>
+        <version.microservice.audit-api>3.0-SNAPSHOT</version.microservice.audit-api>
+        <version.microservice.hazelcast-client>3.0-SNAPSHOT</version.microservice.hazelcast-client>
+        <version.microservice.starter>3.0-SNAPSHOT</version.microservice.starter>
         <version.zookeeper>3.8.0</version.zookeeper>
     </properties>
     <dependencyManagement>
@@ -76,6 +76,10 @@
                         <artifactId>*</artifactId>
                         <groupId>commons-logging</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>avro</artifactId>
+                        <groupId>org.apache.avro</groupId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -87,6 +91,10 @@
                         <artifactId>*</artifactId>
                         <groupId>org.mortbay.jetty</groupId>
                     </exclusion>
+                    <exclusion>
+                        <artifactId>*</artifactId>
+                        <groupId>org.eclipse.jetty</groupId>
+                    </exclusion>
                     <exclusion>
                         <artifactId>*</artifactId>
                         <groupId>io.netty</groupId>
@@ -106,6 +114,14 @@
                 <artifactId>zookeeper</artifactId>
                 <version>${version.zookeeper}</version>
                 <exclusions>
+                    <exclusion>
+                        <artifactId>slf4j-log4j12</artifactId>
+                        <groupId>org.slf4j</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>log4j</artifactId>
+                        <groupId>log4j</groupId>
+                    </exclusion>
                     <exclusion>
                         <artifactId>*</artifactId>
                         <groupId>ch.qos.logback</groupId>
@@ -151,13 +167,19 @@
             <artifactId>hadoop-hdfs</artifactId>
         </dependency>
         <dependency>
-            <groupId>gov.nsa.datawave.contrib</groupId>
+            <groupId>gov.nsa.datawave</groupId>
             <artifactId>datawave-in-memory-accumulo</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>*</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream-test-support</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -192,6 +214,11 @@
     <profiles>
         <profile>
             <id>docker</id>
+            <activation>
+                <property>
+                    <name>microservice-docker</name>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>

service/src/main/java/datawave/microservice/audit/AuditController.java

@@ -1,15 +1,21 @@
 package datawave.microservice.audit;
 
 import datawave.microservice.audit.common.AuditMessage;
+import datawave.microservice.audit.common.AuditMessageSupplier;
 import datawave.microservice.audit.config.AuditProperties;
 import datawave.microservice.audit.config.AuditProperties.Retry;
-import datawave.microservice.audit.config.AuditServiceConfig;
 import datawave.microservice.audit.health.HealthChecker;
 import datawave.webservice.common.audit.AuditParameters;
 import datawave.webservice.common.audit.Auditor;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.ExternalDocumentation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,21 +26,18 @@
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageChannel;
+import org.springframework.security.access.annotation.Secured;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.security.RolesAllowed;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static datawave.microservice.audit.config.AuditServiceConfig.CONFIRM_ACK_CHANNEL;
 import static datawave.webservice.common.audit.AuditParameters.AUDIT_ID;
 import static datawave.webservice.common.audit.AuditParameters.QUERY_AUDIT_TYPE;
 import static datawave.webservice.common.audit.AuditParameters.QUERY_AUTHORIZATIONS;
@@ -53,16 +56,22 @@
  * message passing infrastructure is unhealthy, or if we can't verify that the message was successfully passed to our messaging infrastructure, a 500 Internal
  * Server Error will be returned to the caller.
  */
+@Tag(name = "Audit Controller /v1", description = "DataWave Query Auditing",
+                externalDocs = @ExternalDocumentation(description = "Audit Service Documentation",
+                                url = "https://github.com/NationalSecurityAgency/datawave-audit-service"))
 @RestController
-@RequestMapping(path = "/v1", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(path = "/v1", produces = MediaType.TEXT_PLAIN_VALUE)
 public class AuditController {
+    // Note: This must match 'confirmAckChannel' in the service configuration. Default set in bootstrap.yml.
+    public static final String CONFIRM_ACK_CHANNEL = "confirmAckChannel";
+
     private final Logger log = LoggerFactory.getLogger(this.getClass());
 
     private final AuditProperties auditProperties;
 
     private final AuditParameters restAuditParams;
 
-    private final MessageChannel messageChannel;
+    private final AuditMessageSupplier auditSource;
 
     @Autowired(required = false)
     private HealthChecker healthChecker;
@@ -73,11 +82,10 @@ public class AuditController {
 
     private static final Map<String,CountDownLatch> correlationLatchMap = new ConcurrentHashMap<>();
 
-    public AuditController(AuditProperties auditProperties, @Qualifier("restAuditParams") AuditParameters restAuditParams,
-                    @Qualifier(AuditServiceConfig.AuditSourceBinding.NAME) MessageChannel messageChannel) {
+    public AuditController(AuditProperties auditProperties, @Qualifier("restAuditParams") AuditParameters restAuditParams, AuditMessageSupplier auditSource) {
         this.auditProperties = auditProperties;
         this.restAuditParams = restAuditParams;
-        this.messageChannel = messageChannel;
+        this.auditSource = auditSource;
     }
 
     /**
@@ -121,7 +129,7 @@ private boolean sendMessage(AuditParameters parameters) {
                 correlationLatchMap.put(auditId, latch);
             }
 
-            boolean success = messageChannel.send(MessageBuilder.withPayload(AuditMessage.fromParams(parameters)).setCorrelationId(auditId).build());
+            boolean success = auditSource.send(MessageBuilder.withPayload(AuditMessage.fromParams(parameters)).setCorrelationId(auditId).build());
 
             if (auditProperties.isConfirmAckEnabled()) {
                 try {
@@ -146,14 +154,79 @@ private boolean sendMessage(AuditParameters parameters) {
      *            the audit parameters
      * @return an audit ID, which can be used for tracking purposes
      */
-    @ApiOperation(value = "Performs auditing for the given parameters.")
-    @ApiImplicitParams({@ApiImplicitParam(name = USER_DN, required = true), @ApiImplicitParam(name = QUERY_STRING, required = true),
-            @ApiImplicitParam(name = QUERY_SELECTORS), @ApiImplicitParam(name = QUERY_AUTHORIZATIONS, required = true),
-            @ApiImplicitParam(name = QUERY_AUDIT_TYPE, required = true), @ApiImplicitParam(name = QUERY_SECURITY_MARKING_COLVIZ, required = true),
-            @ApiImplicitParam(name = QUERY_DATE), @ApiImplicitParam(name = QUERY_LOGIC_CLASS), @ApiImplicitParam(name = AUDIT_ID)})
-    @RolesAllowed({"AuthorizedUser", "AuthorizedServer", "InternalUser", "Administrator"})
+    // @formatter:off
+    @Operation(
+            summary = "Submit an audit message with the given parameters.",
+            description = "Audit messages will be forwarded to the configured auditors.")
+    @ApiResponse(
+            description = "if successful, returns the audit ID",
+            responseCode = "200",
+            content = @Content(schema = @Schema(implementation = String.class))
+    )
+    @Parameters({
+            @Parameter(
+                    name = USER_DN,
+                    in = ParameterIn.QUERY,
+                    description = "The user's DN",
+                    required = true,
+                    schema = @Schema(implementation = String.class),
+                    example = "cn=test a. user, ou=example developers, o=example corp, c=us<cn=example corp ca, o=example corp, c=us>"),
+            @Parameter(
+                    name = QUERY_STRING,
+                    in = ParameterIn.QUERY,
+                    description = "The user-specified query",
+                    required = true,
+                    schema = @Schema(implementation = String.class),
+                    example = "GENRES:[Action to Western]"),
+            @Parameter(
+                    name = QUERY_SELECTORS,
+                    in = ParameterIn.QUERY,
+                    description = "The selectors present in the query",
+                    schema = @Schema(implementation = String.class),
+                    example = "A,E,I,O,U"),
+            @Parameter(
+                    name = QUERY_AUTHORIZATIONS,
+                    in = ParameterIn.QUERY,
+                    description = "The user-selected authorizations",
+                    required = true,
+                    schema = @Schema(implementation = String.class),
+                    example = "PUBLIC,PRIVATE,BAR,FOO"),
+            @Parameter(
+                    name = QUERY_AUDIT_TYPE,
+                    in = ParameterIn.QUERY,
+                    description = "The audit type",
+                    required = true,
+                    schema = @Schema(implementation = String.class),
+                    example = "ACTIVE"),
+            @Parameter(
+                    name = QUERY_SECURITY_MARKING_COLVIZ,
+                    in = ParameterIn.QUERY,
+                    description = "The visibility to use when storing the audit record",
+                    required = true,
+                    schema = @Schema(implementation = String.class),
+                    example = "PUBLIC"),
+            @Parameter(
+                    name = QUERY_DATE,
+                    in = ParameterIn.QUERY,
+                    description = "The date the user ran the query",
+                    schema = @Schema(implementation = Long.class),
+                    example = "1655410818951"),
+            @Parameter(
+                    name = QUERY_LOGIC_CLASS,
+                    in = ParameterIn.QUERY,
+                    description = "The query logic used",
+                    schema = @Schema(implementation = String.class),
+                    example = "EventQuery"),
+            @Parameter(
+                    name = AUDIT_ID,
+                    in = ParameterIn.QUERY,
+                    description = "An optional audit ID to use for tracking purposes",
+                    schema = @Schema(implementation = String.class),
+                    example = "my-audit-id")})
+    // @formatter:on
+    @Secured({"AuthorizedUser", "AuthorizedServer", "InternalUser", "Administrator"})
     @RequestMapping(path = "/audit", method = RequestMethod.POST)
-    public String audit(@RequestParam MultiValueMap<String,String> parameters) {
+    public String audit(@Parameter(hidden = true) @RequestParam MultiValueMap<String,String> parameters) {
         restAuditParams.clear();
         restAuditParams.validate(parameters);
 

service/src/main/java/datawave/microservice/audit/AuditService.java

@@ -1,12 +1,10 @@
 package datawave.microservice.audit;
 
-import datawave.microservice.audit.config.AuditServiceConfig;
 import datawave.webservice.common.audit.AuditParameters;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.context.annotation.RequestScope;
 
@@ -15,7 +13,6 @@
  */
 @EnableDiscoveryClient
 @SpringBootApplication(scanBasePackages = "datawave.microservice", exclude = {ErrorMvcAutoConfiguration.class})
-@EnableBinding(AuditServiceConfig.AuditSourceBinding.class)
 public class AuditService {
 
     @Bean("restAuditParams")