Util package refactor (#31)

* refactor util package structure

* revert pom dep scope

core/src/main/java/gov/hhs/aspr/ms/taskit/core/CoreTranslationError.java

@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.taskit.core;
 
-import util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractError;
 
 public enum CoreTranslationError implements ContractError {
 

core/src/main/java/gov/hhs/aspr/ms/taskit/core/TranslationController.java

@@ -13,7 +13,7 @@
 
 import org.apache.commons.math3.util.Pair;
 
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * The TranslatorController serves as the master of cerimonies for translating

core/src/main/java/gov/hhs/aspr/ms/taskit/core/TranslationEngine.java

@@ -12,11 +12,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import util.errors.ContractException;
-import util.graph.Graph;
-import util.graph.GraphDepthEvaluator;
-import util.graph.Graphs;
-import util.graph.MutableGraph;
+import gov.hhs.aspr.ms.util.errors.ContractException;
+import gov.hhs.aspr.ms.util.graph.Graph;
+import gov.hhs.aspr.ms.util.graph.GraphDepthEvaluator;
+import gov.hhs.aspr.ms.util.graph.Graphs;
+import gov.hhs.aspr.ms.util.graph.MutableGraph;
 
 /**
  * Main Translator Class Initializes all {@link TranslationSpec}s and maintains

core/src/main/java/gov/hhs/aspr/ms/taskit/core/TranslationSpec.java

@@ -2,7 +2,7 @@
 
 import java.util.Objects;
 
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * Core implementation of the {@link BaseTranslationSpec} that must be

core/src/main/java/gov/hhs/aspr/ms/taskit/core/Translator.java

@@ -5,7 +5,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * The Translator class serves as a wrapper around one or more

core/src/main/java/gov/hhs/aspr/ms/taskit/core/TranslatorContext.java

@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.taskit.core;
 
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * Context that is used by {@link Translator}s

core/src/test/java/gov/hhs/aspr/ms/taskit/core/AT_CoreTranslationError.java

@@ -8,7 +8,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_CoreTranslationError {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/AT_TranslationController.java

@@ -22,10 +22,10 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestAppObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestObjectTranslator;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
-import util.annotations.UnitTestForCoverage;
-import util.annotations.UnitTestMethod;
-import util.errors.ContractException;
-import util.resourcehelper.TestResourceHelper;
+import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.errors.ContractException;
+import gov.hhs.aspr.ms.util.resourcehelper.TestResourceHelper;
 
 public class AT_TranslationController {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/AT_TranslationEngine.java

@@ -30,10 +30,10 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputChildObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.translationSpecs.TestObjectTranslationSpec;
-import util.annotations.UnitTestForCoverage;
-import util.annotations.UnitTestMethod;
-import util.errors.ContractException;
-import util.graph.MutableGraph;
+import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.errors.ContractException;
+import gov.hhs.aspr.ms.util.graph.MutableGraph;
 
 public class AT_TranslationEngine {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/AT_TranslationSpec.java

@@ -18,9 +18,9 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputChildObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.translationSpecs.TestObjectTranslationSpec;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 public class AT_TranslationSpec {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/AT_Translator.java

@@ -13,8 +13,8 @@
 
 import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.TestComplexObjectTranslatorId;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestObjectTranslatorId;
-import util.annotations.UnitTestMethod;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 public class AT_Translator {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/AT_TranslatorContext.java

@@ -8,9 +8,9 @@
 import org.junit.jupiter.api.Test;
 
 import gov.hhs.aspr.ms.taskit.core.testsupport.TestTranslationEngine;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 public class AT_TranslatorContext {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/TranslationEngineTestHelper.java

@@ -8,7 +8,7 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestObjectTranslator;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestObjectWrapper;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.translationSpecs.TestObjectTranslationSpec;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 public final class TranslationEngineTestHelper {
     private TranslationEngineTestHelper() {

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/AT_TestTranslationEngine.java

@@ -17,8 +17,8 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestAppObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.translationSpecs.TestObjectTranslationSpec;
-import util.annotations.UnitTestMethod;
-import util.resourcehelper.TestResourceHelper;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.resourcehelper.TestResourceHelper;
 
 public class AT_TestTranslationEngine {
     Path basePath = TestResourceHelper.getResourceDir(this.getClass());

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/AT_TestTranslationSpec.java

@@ -10,8 +10,8 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestAppObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.translationSpecs.TestObjectTranslationSpec;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestTranslationSpec {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/TestObjectUtil.java

@@ -9,7 +9,7 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestAppObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputChildObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
-import util.random.RandomGeneratorProvider;
+import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider;
 
 public class TestObjectUtil {
     static org.apache.commons.math3.random.RandomGenerator randomGenerator = RandomGeneratorProvider

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testcomplexobject/AT_TestComplexAppObject.java

@@ -7,8 +7,8 @@
 import org.junit.jupiter.api.Test;
 
 import gov.hhs.aspr.ms.taskit.core.testsupport.TestObjectUtil;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestComplexAppObject {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testcomplexobject/AT_TestComplexTranslator.java

@@ -9,7 +9,7 @@
 
 import gov.hhs.aspr.ms.taskit.core.Translator;
 import gov.hhs.aspr.ms.taskit.core.TranslatorId;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestComplexTranslator {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testcomplexobject/AT_TestComplexTranslatorId.java

@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import util.annotations.UnitTestField;
+import gov.hhs.aspr.ms.util.annotations.UnitTestField;
 
 public class AT_TestComplexTranslatorId {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testcomplexobject/input/AT_TestComplexInputObject.java

@@ -7,8 +7,8 @@
 import org.junit.jupiter.api.Test;
 
 import gov.hhs.aspr.ms.taskit.core.testsupport.TestObjectUtil;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestComplexInputObject {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testcomplexobject/translationSpecs/AT_TestComplexObjectTranslationSpec.java

@@ -10,9 +10,9 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.TestComplexAppObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.input.TestComplexInputObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.translationSpecs.TestObjectTranslationSpec;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestForCoverage;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestComplexObjectTranslationSpec {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/AT_TestAppChildObject.java

@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
 
 public class AT_TestAppChildObject {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/AT_TestAppObject.java

@@ -8,8 +8,8 @@
 
 import gov.hhs.aspr.ms.taskit.core.testsupport.TestObjectUtil;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.TestComplexAppObject;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestAppObject {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/AT_TestObjectTranslator.java

@@ -10,7 +10,7 @@
 import gov.hhs.aspr.ms.taskit.core.Translator;
 import gov.hhs.aspr.ms.taskit.core.TranslatorId;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.TestComplexObjectTranslatorId;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestObjectTranslator {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/AT_TestObjectTranslatorId.java

@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import util.annotations.UnitTestField;
+import gov.hhs.aspr.ms.util.annotations.UnitTestField;
 
 public class AT_TestObjectTranslatorId {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/AT_TestObjectWrapper.java

@@ -9,8 +9,8 @@
 
 import gov.hhs.aspr.ms.taskit.core.testsupport.TestObjectUtil;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestObjectWrapper {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/input/AT_TestInputChildObject.java

@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
 
 public class AT_TestInputChildObject {
     @Test

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/input/AT_TestInputObject.java

@@ -8,8 +8,8 @@
 
 import gov.hhs.aspr.ms.taskit.core.testsupport.TestObjectUtil;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.input.TestComplexInputObject;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestInputObject {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/testsupport/testobject/translationSpecs/AT_TestObjectTranslationSpec.java

@@ -10,9 +10,9 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testcomplexobject.translationSpecs.TestComplexObjectTranslationSpec;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestAppObject;
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.input.TestInputObject;
-import util.annotations.UnitTestConstructor;
-import util.annotations.UnitTestForCoverage;
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor;
+import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_TestObjectTranslationSpec {
 

core/src/test/java/gov/hhs/aspr/ms/taskit/core/unittestcoverage/UnitTestReport.java

@@ -5,19 +5,19 @@ public final class UnitTestReport {
     public static void main(final String[] args) {
 
         System.out.println("Missing Tests Report:");
-        util.meta.unittestcoverage.reports.MissingTestsReport.run(args);
+        gov.hhs.aspr.ms.util.meta.unittestcoverage.reports.MissingTestsReport.run(args);
         System.out.print("\n\n\n");
 
         System.out.println("MetaInfo Report:");
-        util.meta.unittestcoverage.reports.MetaInfoReport.run(args);
+        gov.hhs.aspr.ms.util.meta.unittestcoverage.reports.MetaInfoReport.run(args);
         System.out.print("\n\n\n");
 
         System.out.println("Incomplete Tests Report:");
-        util.meta.unittestcoverage.reports.IncompleteClassReport.run(args);
+        gov.hhs.aspr.ms.util.meta.unittestcoverage.reports.IncompleteClassReport.run(args);
         System.out.print("\n\n\n");
 
         System.out.println("Status Report:");
-        util.meta.unittestcoverage.reports.StatusReport.run(args);
+        gov.hhs.aspr.ms.util.meta.unittestcoverage.reports.StatusReport.run(args);
         System.out.print("\n\n\n");
     }
 

pom.xml

@@ -68,7 +68,6 @@
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
                 <version>${gson.version}</version>
-                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>gov.hhs.aspr.ms</groupId>

protobuf/src/main/java/gov/hhs/aspr/ms/taskit/protobuf/ProtobufCoreTranslationError.java

@@ -1,6 +1,6 @@
 package gov.hhs.aspr.ms.taskit.protobuf;
 
-import util.errors.ContractError;
+import gov.hhs.aspr.ms.util.errors.ContractError;
 
 public enum ProtobufCoreTranslationError implements ContractError {
     INVALID_INPUT_CLASS("The input class is neither a Protobuf Message, nor a Protobuf Enum"),

protobuf/src/main/java/gov/hhs/aspr/ms/taskit/protobuf/ProtobufTranslationEngine.java

@@ -33,7 +33,7 @@
 import gov.hhs.aspr.ms.taskit.core.TranslationSpec;
 import gov.hhs.aspr.ms.taskit.core.Translator;
 import gov.hhs.aspr.ms.taskit.protobuf.translationSpecs.AnyTranslationSpec;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 /**
  * Protobuf TranslationEngine that allows for conversion between POJOs and

protobuf/src/test/java/gov/hhs/aspr/ms/taskit/core/ProtobufTranslationEngineTestHelper.java

@@ -8,7 +8,7 @@
 import gov.hhs.aspr.ms.taskit.core.testsupport.testobject.TestObjectWrapper;
 import gov.hhs.aspr.ms.taskit.protobuf.testsupport.testcomplexobject.translationSpecs.TestProtobufComplexObjectTranslationSpec;
 import gov.hhs.aspr.ms.taskit.protobuf.testsupport.testobject.translationSpecs.TestProtobufObjectTranslationSpec;
-import util.errors.ContractException;
+import gov.hhs.aspr.ms.util.errors.ContractException;
 
 public final class ProtobufTranslationEngineTestHelper {
     private ProtobufTranslationEngineTestHelper() {

protobuf/src/test/java/gov/hhs/aspr/ms/taskit/protobuf/AT_ProtobufCoreTranslationError.java

@@ -8,7 +8,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
 
 public class AT_ProtobufCoreTranslationError {
 

protobuf/src/test/java/gov/hhs/aspr/ms/taskit/protobuf/AT_ProtobufTranslationEngine.java

@@ -40,10 +40,10 @@
 import gov.hhs.aspr.ms.taskit.protobuf.testsupport.testobject.input.TestInputEnum;
 import gov.hhs.aspr.ms.taskit.protobuf.testsupport.testobject.input.TestInputObject;
 import gov.hhs.aspr.ms.taskit.protobuf.testsupport.testobject.translationSpecs.TestProtobufObjectTranslationSpec;
-import util.annotations.UnitTestForCoverage;
-import util.annotations.UnitTestMethod;
-import util.errors.ContractException;
-import util.resourcehelper.TestResourceHelper;
+import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage;
+import gov.hhs.aspr.ms.util.annotations.UnitTestMethod;
+import gov.hhs.aspr.ms.util.errors.ContractException;
+import gov.hhs.aspr.ms.util.resourcehelper.TestResourceHelper;
 
 public class AT_ProtobufTranslationEngine {
     Path basePath = TestResourceHelper.getResourceDir(this.getClass());