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>dictionary-api</artifactId>
-    <version>2.1.2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
     <url>https://code.nsa.gov/datawave-dictionary-service</url>
     <scm>
         <connection>scm:git:https://github.com/NationalSecurityAgency/datawave-dictionary-service.git</connection>
@@ -17,7 +17,8 @@
         <url>https://github.com/NationalSecurityAgency/datawave-dictionary-service</url>
     </scm>
     <properties>
-        <version.base-responses>2.1.0</version.base-responses>
+        <datawave.webservice.namespace>http://webservice.datawave/v1</datawave.webservice.namespace>
+        <version.base-responses>3.0-SNAPSHOT</version.base-responses>
         <version.guava>31.1-jre</version.guava>
     </properties>
     <dependencyManagement>
@@ -53,9 +54,14 @@
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>base-rest-responses</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -75,4 +81,57 @@
             <url>https://raw.githubusercontent.com/NationalSecurityAgency/datawave/mvn-repo</url>
         </repository>
     </repositories>
+    <build>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>source-templates/**</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-templated-sources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/generated-sources/templated-sources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources/source-templates</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/generated-sources/templated-sources</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

api/src/main/java/datawave/webservice/results/datadictionary/DataDictionaryBase.java → api/src/main/java/datawave/webservice/dictionary/data/DataDictionaryBase.java

@@ -1,10 +1,10 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
-import io.protostuff.Message;
 import datawave.webservice.HtmlProvider;
-import datawave.webservice.query.result.metadata.MetadataFieldBase;
+import datawave.webservice.metadata.MetadataFieldBase;
 import datawave.webservice.result.BaseResponse;
 import datawave.webservice.result.TotalResultsAware;
+import io.protostuff.Message;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

api/src/main/java/datawave/webservice/results/datadictionary/DefaultDataDictionary.java → api/src/main/java/datawave/webservice/dictionary/data/DefaultDataDictionary.java

@@ -1,12 +1,13 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Consumer;
+import com.google.common.collect.Lists;
+import datawave.webservice.HtmlProvider;
+import datawave.webservice.metadata.DefaultMetadataField;
+import datawave.webservice.result.TotalResultsAware;
+import io.protostuff.Input;
+import io.protostuff.Message;
+import io.protostuff.Output;
+import io.protostuff.Schema;
 
 import javax.xml.bind.annotation.XmlAccessOrder;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,16 +17,13 @@
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
-
-import com.google.common.collect.Lists;
-import datawave.webservice.HtmlProvider;
-import datawave.webservice.query.result.metadata.DefaultMetadataField;
-import datawave.webservice.result.TotalResultsAware;
-
-import io.protostuff.Input;
-import io.protostuff.Message;
-import io.protostuff.Output;
-import io.protostuff.Schema;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Consumer;
 
 @XmlRootElement(name = "DefaultDataDictionary")
 @XmlAccessorType(XmlAccessType.NONE)

api/src/main/java/datawave/webservice/results/datadictionary/DefaultDescription.java → api/src/main/java/datawave/webservice/dictionary/data/DefaultDescription.java

@@ -1,4 +1,4 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
 import datawave.webservice.query.result.event.MapSchema;
 import io.protostuff.Input;

api/src/main/java/datawave/webservice/results/datadictionary/DefaultDictionaryField.java → api/src/main/java/datawave/webservice/dictionary/data/DefaultDictionaryField.java

@@ -1,22 +1,21 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
+import com.google.common.collect.Sets;
+import io.protostuff.Input;
+import io.protostuff.Message;
+import io.protostuff.Output;
+import io.protostuff.Schema;
 
 import javax.xml.bind.annotation.XmlAccessOrder;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorOrder;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
-
-import io.protostuff.Input;
-import io.protostuff.Message;
-import io.protostuff.Output;
-import io.protostuff.Schema;
-import com.google.common.collect.Sets;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
 
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)

api/src/main/java/datawave/webservice/results/datadictionary/DefaultFields.java → api/src/main/java/datawave/webservice/dictionary/data/DefaultFields.java

@@ -1,13 +1,13 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
+import datawave.webservice.HtmlProvider;
+import datawave.webservice.result.TotalResultsAware;
 import io.protostuff.Input;
 import io.protostuff.Message;
 import io.protostuff.Output;
 import io.protostuff.Schema;
-import datawave.webservice.HtmlProvider;
-import datawave.webservice.result.TotalResultsAware;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

api/src/main/java/datawave/webservice/results/datadictionary/DescriptionBase.java → api/src/main/java/datawave/webservice/dictionary/data/DescriptionBase.java

@@ -1,8 +1,8 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
-import io.protostuff.Message;
 import datawave.webservice.query.result.event.HasMarkings;
-import datawave.webservice.query.util.StringMapAdapter;
+import datawave.webservice.xml.util.StringMapAdapter;
+import io.protostuff.Message;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

api/src/main/java/datawave/webservice/results/datadictionary/DictionaryFieldBase.java → api/src/main/java/datawave/webservice/dictionary/data/DictionaryFieldBase.java

@@ -1,4 +1,4 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
 import io.protostuff.Message;
 

api/src/main/java/datawave/webservice/results/datadictionary/FieldsBase.java → api/src/main/java/datawave/webservice/dictionary/data/FieldsBase.java

@@ -1,8 +1,8 @@
-package datawave.webservice.results.datadictionary;
+package datawave.webservice.dictionary.data;
 
 import com.google.common.collect.Multimap;
-import io.protostuff.Message;
 import datawave.webservice.result.BaseResponse;
+import io.protostuff.Message;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

api/src/main/java/datawave/webservice/results/edgedictionary/DefaultEdgeDictionary.java → api/src/main/java/datawave/webservice/dictionary/edge/DefaultEdgeDictionary.java

@@ -1,11 +1,13 @@
-package datawave.webservice.results.edgedictionary;
+package datawave.webservice.dictionary.edge;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
+import datawave.webservice.HtmlProvider;
+import datawave.webservice.query.result.util.protostuff.FieldAccessor;
+import datawave.webservice.query.result.util.protostuff.ProtostuffField;
+import datawave.webservice.result.TotalResultsAware;
+import io.protostuff.Input;
+import io.protostuff.Message;
+import io.protostuff.Output;
+import io.protostuff.Schema;
 
 import javax.xml.bind.annotation.XmlAccessOrder;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,15 +17,12 @@
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
-
-import io.protostuff.Input;
-import io.protostuff.Message;
-import io.protostuff.Output;
-import io.protostuff.Schema;
-import datawave.webservice.HtmlProvider;
-import datawave.webservice.query.result.util.protostuff.FieldAccessor;
-import datawave.webservice.query.result.util.protostuff.ProtostuffField;
-import datawave.webservice.result.TotalResultsAware;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 
 @XmlRootElement(name = "EdgeDictionary")
 @XmlAccessorType(XmlAccessType.NONE)

api/src/main/java/datawave/webservice/results/edgedictionary/DefaultMetadata.java → api/src/main/java/datawave/webservice/dictionary/edge/DefaultMetadata.java

@@ -1,9 +1,13 @@
-package datawave.webservice.results.edgedictionary;
+package datawave.webservice.dictionary.edge;
 
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import com.google.common.base.Objects;
+import datawave.webservice.query.result.util.protostuff.FieldAccessor;
+import datawave.webservice.query.result.util.protostuff.ProtostuffField;
+import io.protostuff.Input;
+import io.protostuff.Message;
+import io.protostuff.Output;
+import io.protostuff.Schema;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -12,15 +16,10 @@
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import io.protostuff.Input;
-import io.protostuff.Message;
-import io.protostuff.Output;
-import io.protostuff.Schema;
-import datawave.webservice.query.result.util.protostuff.FieldAccessor;
-import datawave.webservice.query.result.util.protostuff.ProtostuffField;
-import org.apache.commons.lang3.StringUtils;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlType(propOrder = {"edgeType", "edgeRelationship", "edgeAttribute1Source", "eventFields"})

api/src/main/java/datawave/webservice/results/edgedictionary/EdgeDictionaryBase.java → api/src/main/java/datawave/webservice/dictionary/edge/EdgeDictionaryBase.java

@@ -1,13 +1,12 @@
-package datawave.webservice.results.edgedictionary;
+package datawave.webservice.dictionary.edge;
 
-import java.util.List;
+import datawave.webservice.result.BaseResponse;
+import io.protostuff.Message;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlSeeAlso;
-
-import io.protostuff.Message;
-import datawave.webservice.result.BaseResponse;
+import java.util.List;
 
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlSeeAlso(DefaultEdgeDictionary.class)

api/src/main/java/datawave/webservice/results/edgedictionary/EventField.java → api/src/main/java/datawave/webservice/dictionary/edge/EventField.java

@@ -1,22 +1,22 @@
-package datawave.webservice.results.edgedictionary;
-
-import java.io.IOException;
-import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+package datawave.webservice.dictionary.edge;
 
 import com.google.common.base.Objects;
+import datawave.webservice.query.result.util.protostuff.FieldAccessor;
+import datawave.webservice.query.result.util.protostuff.ProtostuffField;
 import io.protostuff.Input;
 import io.protostuff.Message;
 import io.protostuff.Output;
 import io.protostuff.Schema;
-import datawave.webservice.query.result.util.protostuff.FieldAccessor;
-import datawave.webservice.query.result.util.protostuff.ProtostuffField;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import java.io.IOException;
+import java.io.Serializable;
+
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlType(propOrder = {"sourceField", "sinkField", "enrichmentField", "enrichmentIndex", "jexlPrecondition"})
 public class EventField implements Serializable, Message<EventField> {

api/src/main/java/datawave/webservice/results/edgedictionary/MetadataBase.java → api/src/main/java/datawave/webservice/dictionary/edge/MetadataBase.java

@@ -1,15 +1,14 @@
-package datawave.webservice.results.edgedictionary;
+package datawave.webservice.dictionary.edge;
 
-import java.util.List;
-import java.util.Map;
+import com.google.common.collect.Maps;
+import datawave.webservice.query.result.event.HasMarkings;
+import io.protostuff.Message;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlSeeAlso;
-
-import com.google.common.collect.Maps;
-import io.protostuff.Message;
-import datawave.webservice.query.result.event.HasMarkings;
+import java.util.List;
+import java.util.Map;
 
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlSeeAlso(DefaultMetadata.class)