diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 17cc8c9..9b18ee0 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -26,11 +26,10 @@ jobs: distribution: 'temurin' cache: maven - - name: Get GCM and Taskit Version + - name: Get GCM Version run: | echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - + - name: Checkout GCM if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} uses: actions/checkout@v4 @@ -39,6 +38,11 @@ jobs: path: gcm ref: dev + - name: Get Taskit Version + if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + run: | + echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV" + - name: Checkout Taskit if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} uses: actions/checkout@v4 @@ -48,9 +52,9 @@ jobs: ref: dev - name: Get Util Version - if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} run: | - echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV" + echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file taskit/pom.xml)" >> "$GITHUB_ENV" - name: Checkout Util if: ${{ endsWith(env.util_version, 'SNAPSHOT') }} @@ -64,14 +68,14 @@ jobs: if: ${{ endsWith(env.util_version, 'SNAPSHOT') }} run: mvn clean install -DskipTests --file util/pom.xml - - name: Build GCM - if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} - run: mvn clean install -DskipTests --file gcm/simulation/pom.xml - - name: Build Taskit if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} run: mvn clean install -DskipTests --file taskit/pom.xml + - name: Build GCM + if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + run: mvn clean install -DskipTests --file gcm/simulation/pom.xml + - name: Build GCM Taskit run: mvn clean install --file pom.xml diff --git a/.github/workflows/dev_pr_build.yml b/.github/workflows/dev_pr_build.yml index ab6b996..7ba298b 100644 --- a/.github/workflows/dev_pr_build.yml +++ b/.github/workflows/dev_pr_build.yml @@ -26,11 +26,10 @@ jobs: distribution: 'temurin' cache: maven - - name: Get GCM and Taskit Version + - name: Get GCM Version run: | echo "gcm_version=v$(mvn help:evaluate -Dexpression=gcm.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file pom.xml)" >> "$GITHUB_ENV" - + - name: Checkout GCM if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} uses: actions/checkout@v4 @@ -39,6 +38,11 @@ jobs: path: gcm ref: dev + - name: Get Taskit Version + if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + run: | + echo "taskit_version=v$(mvn help:evaluate -Dexpression=taskit.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV" + - name: Checkout Taskit if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} uses: actions/checkout@v4 @@ -48,9 +52,9 @@ jobs: ref: dev - name: Get Util Version - if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} run: | - echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file gcm/pom.xml)" >> "$GITHUB_ENV" + echo "util_version=v$(mvn help:evaluate -Dexpression=util.version -q -DforceStdout --file taskit/pom.xml)" >> "$GITHUB_ENV" - name: Checkout Util if: ${{ endsWith(env.util_version, 'SNAPSHOT') }} @@ -64,14 +68,14 @@ jobs: if: ${{ endsWith(env.util_version, 'SNAPSHOT') }} run: mvn clean install -DskipTests --file util/pom.xml - - name: Build GCM - if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} - run: mvn clean install -DskipTests --file gcm/simulation/pom.xml - - name: Build Taskit if: ${{ endsWith(env.taskit_version, 'SNAPSHOT') }} run: mvn clean install -DskipTests --file taskit/pom.xml + - name: Build GCM + if: ${{ endsWith(env.gcm_version, 'SNAPSHOT') }} + run: mvn clean install -DskipTests --file gcm/simulation/pom.xml + - name: Build GCM Taskit run: mvn clean install --file pom.xml diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index e1f4edf..3a20de8 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -60,6 +60,7 @@ jobs: skipIfReleaseExists: true update-gcm-pipeline: + if: ${{ !endsWith(needs.release.outputs.gcm_taskit_version, '0') }} needs: release runs-on: ubuntu-latest permissions: diff --git a/pom.xml b/pom.xml index 8aac035..38a2640 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ - 2.8.5 + 3.0.0 UTF-8 @@ -59,20 +59,19 @@ 1.6.0 - 3.2.5 - 3.2.5 + 3.4.0 + 3.4.0 3.3.1 3.1.2 3.1.2 - 3.6.3 - 3.2.4 - 0.4.0 + 3.8.0 + 3.2.5 + 0.5.0 - 4.1.0 - 4.2.3 + 4.3.0 0.8.12 - 5.10.2 + 5.11.0 diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 0f89edb..ec53204 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -26,8 +26,8 @@ 1.7.1 - 3.6.1 - 3.5.0 + 3.7.1 + 3.6.0 0.6.1 1.4.1 @@ -37,11 +37,6 @@ - - gov.hhs.aspr.ms.taskit - protobuf - ${taskit.version} - com.google.protobuf protoc @@ -94,20 +89,14 @@ unpack-protos generate-sources - unpack + unpack-dependencies - - - gov.hhs.aspr.ms.taskit - protobuf - ${taskit.version} - true - ${project.build.outputDirectory} - **/*.proto - **/testsupport/*.proto - - + **/*.proto + **/testsupport/*.proto + ${project.build.outputDirectory} + protobuf + jar diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslator.java deleted file mode 100644 index c6c0c35..0000000 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslator.java +++ /dev/null @@ -1,80 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus; - -import java.util.ArrayList; -import java.util.List; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.ExperimentParameterDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.translationSpecs.ExampleDimensionTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs.DimensionTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs.ExperimentParameterDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs.PlannerTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs.SimulationStateTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; - -/** - * Translator for Nucleus Using this Translator will add all the necessary - * TanslationSpecs needed to read and write the classes within Nucleus - */ -public class NucleusTranslator { - - private NucleusTranslator() { - } - - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); - - list.add(new SimulationStateTranslationSpec()); - list.add(new PlannerTranslationSpec()); - list.add(new DimensionTranslationSpec()); - list.add(new ExampleDimensionTranslationSpec()); - list.add(new ExperimentParameterDataTranslationSpec()); - - return list; - } - - /** - * Returns a Translator Builder that already includes the necessary - * TranslationSpecs needed to read and write the classes within Nucleus - */ - private static Translator.Builder builder() { - Translator.Builder builder = Translator.builder() - .setTranslatorId(NucleusTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); - - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); - } - - translationEngineBuilder.addFieldToIncludeDefaultValue( - SimulationStateInput.getDescriptor().findFieldByName("startTime")); - - translationEngineBuilder.addFieldToIncludeDefaultValue( - ExperimentParameterDataInput.getDescriptor().findFieldByName("threadCount")) - .addFieldToIncludeDefaultValue( - ExperimentParameterDataInput.getDescriptor().findFieldByName("startRecordingIsScheduled")) - .addFieldToIncludeDefaultValue( - ExperimentParameterDataInput.getDescriptor().findFieldByName("simulationHaltTime")) - .addFieldToIncludeDefaultValue( - ExperimentParameterDataInput.getDescriptor().findFieldByName("haltOnException")) - .addFieldToIncludeDefaultValue( - ExperimentParameterDataInput.getDescriptor().findFieldByName("experimentProgressLogPath")) - .addFieldToIncludeDefaultValue( - ExperimentParameterDataInput.getDescriptor().findFieldByName("continueFromProgressLog")); - }); - - return builder; - } - - /** - * Returns a Translator that includes TranslationSpecs for the - * classes within Nucleus - */ - public static Translator getTranslator() { - return builder().build(); - } -} diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translationSpecs/ExampleDimensionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translation/specs/ExampleDimensionTranslationSpec.java similarity index 75% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translationSpecs/ExampleDimensionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translation/specs/ExampleDimensionTranslationSpec.java index b46b021..62cd25a 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translationSpecs/ExampleDimensionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translation/specs/ExampleDimensionTranslationSpec.java @@ -1,18 +1,18 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.translation.specs; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.ExampleDimension; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.input.ExampleDimensionInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class ExampleDimensionTranslationSpec extends ProtobufTranslationSpec { @Override - protected ExampleDimension convertInputObject(ExampleDimensionInput inputObject) { + protected ExampleDimension translateInputObject(ExampleDimensionInput inputObject) { return new ExampleDimension(inputObject.getLevelName()); } @Override - protected ExampleDimensionInput convertAppObject(ExampleDimension appObject) { + protected ExampleDimensionInput translateAppObject(ExampleDimension appObject) { return ExampleDimensionInput.newBuilder().setLevelName(appObject.getLevelName()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/NucleusTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/NucleusTranslator.java new file mode 100644 index 0000000..a667f4b --- /dev/null +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/NucleusTranslator.java @@ -0,0 +1,85 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation; + +import java.util.ArrayList; +import java.util.List; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.ExperimentParameterDataInput; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.translation.specs.ExampleDimensionTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs.DimensionTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs.ExperimentParameterDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs.PlannerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs.SimulationStateTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; + +/** + * Translator for Nucleus Using this Translator will add all the necessary + * TranslationSpecs needed to read and write the classes within Nucleus + */ +public class NucleusTranslator { + + private NucleusTranslator() { + } + + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); + + list.add(new SimulationStateTranslationSpec()); + list.add(new PlannerTranslationSpec()); + list.add(new DimensionTranslationSpec()); + list.add(new ExampleDimensionTranslationSpec()); + list.add(new ExperimentParameterDataTranslationSpec()); + + return list; + } + + /** + * Returns a Translator Builder that already includes the necessary + * TranslationSpecs needed to read and write the classes within Nucleus + */ + private static Translator.Builder builder() { + Translator.Builder builder = Translator.builder() + .setTranslatorId(NucleusTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); + + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); + } + + if (taskitEngineBuilder instanceof ProtobufJsonTaskitEngine.Builder) { + ((ProtobufJsonTaskitEngine.Builder) taskitEngineBuilder).addFieldToIncludeDefaultValue( + SimulationStateInput.getDescriptor().findFieldByName("startTime")); + + ((ProtobufJsonTaskitEngine.Builder) taskitEngineBuilder) + .addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("threadCount")) + .addFieldToIncludeDefaultValue(ExperimentParameterDataInput.getDescriptor() + .findFieldByName("startRecordingIsScheduled")) + .addFieldToIncludeDefaultValue(ExperimentParameterDataInput.getDescriptor() + .findFieldByName("simulationHaltTime")) + .addFieldToIncludeDefaultValue( + ExperimentParameterDataInput.getDescriptor().findFieldByName("haltOnException")) + .addFieldToIncludeDefaultValue(ExperimentParameterDataInput.getDescriptor() + .findFieldByName("experimentProgressLogPath")) + .addFieldToIncludeDefaultValue(ExperimentParameterDataInput.getDescriptor() + .findFieldByName("continueFromProgressLog")); + } + + }); + + return builder; + } + + /** + * Returns a Translator that includes TranslationSpecs for the classes within + * Nucleus + */ + public static Translator getTranslator() { + return builder().build(); + } +} diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/NucleusTranslatorId.java similarity index 65% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/NucleusTranslatorId.java index 2ef77c8..ed22c4d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/NucleusTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/NucleusTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Nucleus Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/DimensionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/DimensionTranslationSpec.java similarity index 50% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/DimensionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/DimensionTranslationSpec.java index e50d6c9..780199e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/DimensionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/DimensionTranslationSpec.java @@ -1,19 +1,19 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.nucleus.Dimension; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.DimensionInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class DimensionTranslationSpec extends ProtobufTranslationSpec { @Override - protected Dimension convertInputObject(DimensionInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getDimension()); + protected Dimension translateInputObject(DimensionInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getDimension()); } @Override - protected DimensionInput convertAppObject(Dimension appObject) { - return DimensionInput.newBuilder().setDimension(this.translationEngine.getAnyFromObject(appObject)).build(); + protected DimensionInput translateAppObject(Dimension appObject) { + return DimensionInput.newBuilder().setDimension(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/ExperimentParameterDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/ExperimentParameterDataTranslationSpec.java similarity index 85% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/ExperimentParameterDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/ExperimentParameterDataTranslationSpec.java index 7a7bc5b..4a6ae70 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/ExperimentParameterDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/ExperimentParameterDataTranslationSpec.java @@ -1,11 +1,11 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import java.nio.file.Path; import gov.hhs.aspr.ms.gcm.simulation.nucleus.ExperimentParameterData; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.ExperimentParameterDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -17,9 +17,9 @@ public class ExperimentParameterDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected ExperimentParameterData convertInputObject(ExperimentParameterDataInput inputObject) { + protected ExperimentParameterData translateInputObject(ExperimentParameterDataInput inputObject) { if (!ExperimentParameterData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } ExperimentParameterData.Builder builder = ExperimentParameterData.builder() @@ -44,7 +44,7 @@ protected ExperimentParameterData convertInputObject(ExperimentParameterDataInpu } @Override - protected ExperimentParameterDataInput convertAppObject(ExperimentParameterData appObject) { + protected ExperimentParameterDataInput translateAppObject(ExperimentParameterData appObject) { ExperimentParameterDataInput.Builder builder = ExperimentParameterDataInput.newBuilder() .setThreadCount(appObject.getThreadCount()) .setStartRecordingIsScheduled(appObject.stateRecordingIsScheduled()) diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/PlannerTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/PlannerTranslationSpec.java similarity index 71% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/PlannerTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/PlannerTranslationSpec.java index ead3384..fa7d5cc 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/PlannerTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/PlannerTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.nucleus.Planner; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.PlannerInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between {@linkplain PlannerInput} @@ -11,12 +11,12 @@ public class PlannerTranslationSpec extends ProtobufTranslationSpec { @Override - protected Planner convertInputObject(PlannerInput inputObject) { + protected Planner translateInputObject(PlannerInput inputObject) { return Planner.valueOf(inputObject.name()); } @Override - protected PlannerInput convertAppObject(Planner appObject) { + protected PlannerInput translateAppObject(Planner appObject) { return PlannerInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/SimulationStateTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/SimulationStateTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/SimulationStateTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/SimulationStateTranslationSpec.java index 87cc1c2..16e61b2 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/SimulationStateTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/SimulationStateTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import java.time.LocalDate; @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.simulation.nucleus.SimulationState; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -17,9 +17,9 @@ public class SimulationStateTranslationSpec extends ProtobufTranslationSpec { @Override - protected SimulationState convertInputObject(SimulationStateInput inputObject) { + protected SimulationState translateInputObject(SimulationStateInput inputObject) { if (!SimulationState.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } SimulationState.Builder builder = SimulationState.builder(); @@ -27,7 +27,7 @@ protected SimulationState convertInputObject(SimulationStateInput inputObject) { builder.setStartTime(inputObject.getStartTime()); if (inputObject.hasBaseDate()) { - LocalDate LocalDate = this.translationEngine.convertObject(inputObject.getBaseDate()); + LocalDate LocalDate = this.taskitEngine.translateObject(inputObject.getBaseDate()); builder.setBaseDate(LocalDate); } @@ -35,12 +35,12 @@ protected SimulationState convertInputObject(SimulationStateInput inputObject) { } @Override - protected SimulationStateInput convertAppObject(SimulationState appObject) { + protected SimulationStateInput translateAppObject(SimulationState appObject) { SimulationStateInput.Builder builder = SimulationStateInput.newBuilder() .setStartTime(appObject.getStartTime()) .setVersion(appObject.getVersion()); - Date date = this.translationEngine.convertObject(appObject.getBaseDate()); + Date date = this.taskitEngine.translateObject(appObject.getBaseDate()); builder.setBaseDate(date); return builder.build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/GlobalPropertiesTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/GlobalPropertiesTranslator.java similarity index 56% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/GlobalPropertiesTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/GlobalPropertiesTranslator.java index 4fcbb88..107a692 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/GlobalPropertiesTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/GlobalPropertiesTranslator.java @@ -1,31 +1,31 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation; import java.util.ArrayList; import java.util.List; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs.GlobalPropertiesPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs.GlobalPropertyDimensionTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs.GlobalPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs.GlobalPropertyReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs.TestGlobalPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs.GlobalPropertiesPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs.GlobalPropertyDimensionTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs.GlobalPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs.GlobalPropertyReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs.TestGlobalPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the GlobalProperties Plugin. Using this Translator will add - * all the necessary TanslationSpecs needed to read and write - * the GlobalPropertiesPlugin + * all the necessary TranslationSpecs needed to read and write the + * GlobalPropertiesPlugin */ public class GlobalPropertiesTranslator { private GlobalPropertiesTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new GlobalPropertiesPluginDataTranslationSpec()); list.add(new GlobalPropertyIdTranslationSpec()); @@ -38,8 +38,8 @@ private GlobalPropertiesTranslator() { /** * Returns a Translator Builder that already includes the necessary - * TranslationSpecs needed to read and write the GlobalPropertiesPluginData and its - * respective reports + * TranslationSpecs needed to read and write the GlobalPropertiesPluginData and + * its respective reports */ private static Translator.Builder builder() { @@ -48,11 +48,11 @@ private static Translator.Builder builder() { .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) .addDependency(ReportsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } }); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/GlobalPropertiesTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/GlobalPropertiesTranslatorId.java similarity index 81% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/GlobalPropertiesTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/GlobalPropertiesTranslatorId.java index effe01f..6f95323 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/GlobalPropertiesTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/GlobalPropertiesTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the GlobalProperties Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertiesPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertiesPluginDataTranslationSpec.java similarity index 75% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertiesPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertiesPluginDataTranslationSpec.java index 70ecd6a..94b9118 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertiesPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertiesPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import com.google.protobuf.Any; @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionMapInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyValueMapInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -22,18 +22,18 @@ public class GlobalPropertiesPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected GlobalPropertiesPluginData convertInputObject(GlobalPropertiesPluginDataInput inputObject) { + protected GlobalPropertiesPluginData translateInputObject(GlobalPropertiesPluginDataInput inputObject) { if (!GlobalPropertiesPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } GlobalPropertiesPluginData.Builder builder = GlobalPropertiesPluginData.builder(); for (PropertyDefinitionMapInput propertyDefinitionMapInput : inputObject.getGlobalPropertyDefinitinionsList()) { - GlobalPropertyId propertyId = this.translationEngine + GlobalPropertyId propertyId = this.taskitEngine .getObjectFromAny(propertyDefinitionMapInput.getPropertyId()); - PropertyDefinition propertyDefinition = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyDefinition()); + PropertyDefinition propertyDefinition = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyDefinition()); builder.defineGlobalProperty(propertyId, propertyDefinition, propertyDefinitionMapInput.getPropertyDefinitionTime()); @@ -41,9 +41,8 @@ protected GlobalPropertiesPluginData convertInputObject(GlobalPropertiesPluginDa for (PropertyValueMapInput propertyValueMapInput : inputObject.getGlobalPropertyValuesList()) { - GlobalPropertyId propertyId = this.translationEngine - .getObjectFromAny(propertyValueMapInput.getPropertyId()); - Object value = this.translationEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); + GlobalPropertyId propertyId = this.taskitEngine.getObjectFromAny(propertyValueMapInput.getPropertyId()); + Object value = this.taskitEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); builder.setGlobalPropertyValue(propertyId, value, propertyValueMapInput.getPropertyValueTime()); } @@ -52,7 +51,7 @@ protected GlobalPropertiesPluginData convertInputObject(GlobalPropertiesPluginDa } @Override - protected GlobalPropertiesPluginDataInput convertAppObject(GlobalPropertiesPluginData appObject) { + protected GlobalPropertiesPluginDataInput translateAppObject(GlobalPropertiesPluginData appObject) { GlobalPropertiesPluginDataInput.Builder builder = GlobalPropertiesPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); @@ -60,11 +59,11 @@ protected GlobalPropertiesPluginDataInput convertAppObject(GlobalPropertiesPlugi for (GlobalPropertyId globalPropertyId : appObject.getGlobalPropertyDefinitions().keySet()) { PropertyDefinition propertyDefinition = appObject.getGlobalPropertyDefinition(globalPropertyId); - PropertyDefinitionInput propertyDefinitionInput = this.translationEngine.convertObject(propertyDefinition); + PropertyDefinitionInput propertyDefinitionInput = this.taskitEngine.translateObject(propertyDefinition); PropertyDefinitionMapInput propertyDefinitionMapInput = PropertyDefinitionMapInput.newBuilder() .setPropertyDefinition(propertyDefinitionInput) - .setPropertyId(this.translationEngine.getAnyFromObject(globalPropertyId)) + .setPropertyId(this.taskitEngine.getAnyFromObject(globalPropertyId)) .setPropertyDefinitionTime(appObject.getGlobalPropertyDefinitionTime(globalPropertyId)) .setPropertyTrackingPolicy(true) .build(); @@ -73,11 +72,11 @@ protected GlobalPropertiesPluginDataInput convertAppObject(GlobalPropertiesPlugi } for (GlobalPropertyId globalPropertyId : appObject.getGlobalPropertyValues().keySet()) { - Any propertyValueInput = this.translationEngine + Any propertyValueInput = this.taskitEngine .getAnyFromObject(appObject.getGlobalPropertyValue(globalPropertyId).get()); PropertyValueMapInput.Builder propertyValueMapInputBuilder = PropertyValueMapInput.newBuilder() - .setPropertyId(this.translationEngine.getAnyFromObject(globalPropertyId)) + .setPropertyId(this.taskitEngine.getAnyFromObject(globalPropertyId)) .setPropertyValue(propertyValueInput) .setPropertyValueTime(appObject.getGlobalPropertyTime(globalPropertyId).get()); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyDimensionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyDimensionTranslationSpec.java similarity index 68% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyDimensionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyDimensionTranslationSpec.java index 24d1514..176406a 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyDimensionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import com.google.protobuf.Any; @@ -6,21 +6,21 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyDimensionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class GlobalPropertyDimensionTranslationSpec extends ProtobufTranslationSpec { @Override - protected GlobalPropertyDimension convertInputObject(GlobalPropertyDimensionInput inputObject) { + protected GlobalPropertyDimension translateInputObject(GlobalPropertyDimensionInput inputObject) { GlobalPropertyDimension.Builder builder = GlobalPropertyDimension.builder(); - GlobalPropertyId globalPropertyId = this.translationEngine.convertObject(inputObject.getGlobalPropertyId()); + GlobalPropertyId globalPropertyId = this.taskitEngine.translateObject(inputObject.getGlobalPropertyId()); builder.setGlobalPropertyId(globalPropertyId).setAssignmentTime(inputObject.getAssignmentTime()); for (Any anyValue : inputObject.getValuesList()) { - Object value = this.translationEngine.getObjectFromAny(anyValue); + Object value = this.taskitEngine.getObjectFromAny(anyValue); builder.addValue(value); } @@ -28,16 +28,16 @@ protected GlobalPropertyDimension convertInputObject(GlobalPropertyDimensionInpu } @Override - protected GlobalPropertyDimensionInput convertAppObject(GlobalPropertyDimension appObject) { + protected GlobalPropertyDimensionInput translateAppObject(GlobalPropertyDimension appObject) { GlobalPropertyDimensionInput.Builder builder = GlobalPropertyDimensionInput.newBuilder(); - GlobalPropertyIdInput globalPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(appObject.getGlobalPropertyId(), GlobalPropertyId.class); + GlobalPropertyIdInput globalPropertyIdInput = this.taskitEngine + .translateObjectAsClassSafe(appObject.getGlobalPropertyId(), GlobalPropertyId.class); builder.setGlobalPropertyId(globalPropertyIdInput).setAssignmentTime(appObject.getAssignmentTime()); for (Object objValue : appObject.getValues()) { - builder.addValues(this.translationEngine.getAnyFromObject(objValue)); + builder.addValues(this.taskitEngine.getAnyFromObject(objValue)); } return builder.build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyIdTranslationSpec.java index ac0a2fb..17ffad8 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class GlobalPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected GlobalPropertyId convertInputObject(GlobalPropertyIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected GlobalPropertyId translateInputObject(GlobalPropertyIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected GlobalPropertyIdInput convertAppObject(GlobalPropertyId appObject) { - return GlobalPropertyIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected GlobalPropertyIdInput translateAppObject(GlobalPropertyId appObject) { + return GlobalPropertyIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyReportPluginDataTranslationSpec.java similarity index 72% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyReportPluginDataTranslationSpec.java index 0cd322f..385d92a 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/GlobalPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/GlobalPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.reports.GlobalPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId; @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.reports.input.GlobalPropertyReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -19,25 +19,25 @@ public class GlobalPropertyReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected GlobalPropertyReportPluginData convertInputObject(GlobalPropertyReportPluginDataInput inputObject) { + protected GlobalPropertyReportPluginData translateInputObject(GlobalPropertyReportPluginDataInput inputObject) { if (!GlobalPropertyReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } GlobalPropertyReportPluginData.Builder builder = GlobalPropertyReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); builder.setDefaultInclusion(inputObject.getDefaultInclusionPolicy()); for (GlobalPropertyIdInput globalPropertyIdInput : inputObject.getIncludedPropertiesList()) { - GlobalPropertyId globalPropertyId = this.translationEngine.convertObject(globalPropertyIdInput); + GlobalPropertyId globalPropertyId = this.taskitEngine.translateObject(globalPropertyIdInput); builder.includeGlobalProperty(globalPropertyId); } for (GlobalPropertyIdInput globalPropertyIdInput : inputObject.getExcludedPropertiesList()) { - GlobalPropertyId globalPropertyId = this.translationEngine.convertObject(globalPropertyIdInput); + GlobalPropertyId globalPropertyId = this.taskitEngine.translateObject(globalPropertyIdInput); builder.excludeGlobalProperty(globalPropertyId); } @@ -45,25 +45,25 @@ protected GlobalPropertyReportPluginData convertInputObject(GlobalPropertyReport } @Override - protected GlobalPropertyReportPluginDataInput convertAppObject(GlobalPropertyReportPluginData appObject) { + protected GlobalPropertyReportPluginDataInput translateAppObject(GlobalPropertyReportPluginData appObject) { GlobalPropertyReportPluginDataInput.Builder builder = GlobalPropertyReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setDefaultInclusionPolicy(appObject.getDefaultInclusionPolicy()).setReportLabel(reportLabelInput); for (GlobalPropertyId globalPropertyId : appObject.getIncludedProperties()) { - GlobalPropertyIdInput globalPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(globalPropertyId, GlobalPropertyId.class); + GlobalPropertyIdInput globalPropertyIdInput = this.taskitEngine.translateObjectAsClassSafe(globalPropertyId, + GlobalPropertyId.class); builder.addIncludedProperties(globalPropertyIdInput); } for (GlobalPropertyId globalPropertyId : appObject.getExcludedProperties()) { - GlobalPropertyIdInput globalPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(globalPropertyId, GlobalPropertyId.class); + GlobalPropertyIdInput globalPropertyIdInput = this.taskitEngine.translateObjectAsClassSafe(globalPropertyId, + GlobalPropertyId.class); builder.addExcludedProperties(globalPropertyIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/TestGlobalPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/TestGlobalPropertyIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/TestGlobalPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/TestGlobalPropertyIdTranslationSpec.java index e93d8d6..5ad1fa4 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/TestGlobalPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/TestGlobalPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.testsupport.TestGlobalPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.testsupport.input.TestGlobalPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,12 +12,12 @@ public class TestGlobalPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestGlobalPropertyId convertInputObject(TestGlobalPropertyIdInput inputObject) { + protected TestGlobalPropertyId translateInputObject(TestGlobalPropertyIdInput inputObject) { return TestGlobalPropertyId.valueOf(inputObject.name()); } @Override - protected TestGlobalPropertyIdInput convertAppObject(TestGlobalPropertyId appObject) { + protected TestGlobalPropertyIdInput translateAppObject(TestGlobalPropertyId appObject) { return TestGlobalPropertyIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/GroupsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/GroupsTranslator.java similarity index 56% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/GroupsTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/GroupsTranslator.java index 3f76cd2..7351c8e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/GroupsTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/GroupsTranslator.java @@ -1,40 +1,41 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation; import java.util.ArrayList; import java.util.List; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupMemberFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupPopulationReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupPropertyDimensionTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupPropertyReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupTypeIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupTypesForPersonFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupsForPersonAndGroupTypeFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupsForPersonFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.GroupsPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.TestGroupPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs.TestGroupTypeIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupMemberFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupPopulationReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupPropertyDimensionTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupPropertyReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupTypeIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupTypesForPersonFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupsForPersonAndGroupTypeFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupsForPersonFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.GroupsPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.TestGroupPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs.TestGroupTypeIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the Groups Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the GroupsPlugin. + * necessary TranslationSpecs needed to read and write the GroupsPlugin. */ public class GroupsTranslator { private GroupsTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new GroupsPluginDataTranslationSpec()); list.add(new GroupIdTranslationSpec()); @@ -64,23 +65,24 @@ private static Translator.Builder builder() { .addDependency(PeopleTranslatorId.TRANSLATOR_ID) .addDependency(ReportsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } - translationEngineBuilder - .addFieldToIncludeDefaultValue(GroupIdInput.getDescriptor().findFieldByName("id")); + if (taskitEngineBuilder instanceof ProtobufJsonTaskitEngine.Builder) { + ((ProtobufJsonTaskitEngine.Builder) taskitEngineBuilder) + .addFieldToIncludeDefaultValue(GroupIdInput.getDescriptor().findFieldByName("id")); + } }); return builder; } /** - * Returns a Translator that includes TranslationSpecs for the - * GroupsPlugin. + * Returns a Translator that includes TranslationSpecs for the GroupsPlugin. */ public static Translator getTranslator() { return builder().build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/GroupsTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/GroupsTranslatorId.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/GroupsTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/GroupsTranslatorId.java index 3791448..15d9a67 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/GroupsTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/GroupsTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Groups Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupIdTranslationSpec.java similarity index 78% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupIdTranslationSpec.java index 84940fb..1159978 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between {@linkplain GroupIdInput} @@ -11,12 +11,12 @@ public class GroupIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupId convertInputObject(GroupIdInput inputObject) { + protected GroupId translateInputObject(GroupIdInput inputObject) { return new GroupId(inputObject.getId()); } @Override - protected GroupIdInput convertAppObject(GroupId appObject) { + protected GroupIdInput translateAppObject(GroupId appObject) { return GroupIdInput.newBuilder().setId(appObject.getValue()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupMemberFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupMemberFilterTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupMemberFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupMemberFilterTranslationSpec.java index d60fb3a..5b930c6 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupMemberFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupMemberFilterTranslationSpec.java @@ -1,20 +1,20 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupMemberFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupMemberFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class GroupMemberFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupMemberFilter convertInputObject(GroupMemberFilterInput inputObject) { + protected GroupMemberFilter translateInputObject(GroupMemberFilterInput inputObject) { return new GroupMemberFilter(new GroupId(inputObject.getGId())); } @Override - protected GroupMemberFilterInput convertAppObject(GroupMemberFilter appObject) { + protected GroupMemberFilterInput translateAppObject(GroupMemberFilter appObject) { return GroupMemberFilterInput.newBuilder().setGId(appObject.getGroupId().getValue()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPopulationReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPopulationReportPluginDataTranslationSpec.java similarity index 59% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPopulationReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPopulationReportPluginDataTranslationSpec.java index 2d985e4..fa03f1e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPopulationReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPopulationReportPluginDataTranslationSpec.java @@ -1,34 +1,34 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.reports.GroupPopulationReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.reports.input.GroupPopulationReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; public class GroupPopulationReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupPopulationReportPluginData convertInputObject(GroupPopulationReportPluginDataInput inputObject) { + protected GroupPopulationReportPluginData translateInputObject(GroupPopulationReportPluginDataInput inputObject) { if (!GroupPopulationReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } return GroupPopulationReportPluginData.builder() - .setReportLabel(this.translationEngine.convertObject(inputObject.getReportLabel())) - .setReportPeriod(this.translationEngine.convertObject(inputObject.getReportPeriod())) + .setReportLabel(this.taskitEngine.translateObject(inputObject.getReportLabel())) + .setReportPeriod(this.taskitEngine.translateObject(inputObject.getReportPeriod())) .build(); } @Override - protected GroupPopulationReportPluginDataInput convertAppObject(GroupPopulationReportPluginData appObject) { + protected GroupPopulationReportPluginDataInput translateAppObject(GroupPopulationReportPluginData appObject) { return GroupPopulationReportPluginDataInput.newBuilder() - .setReportLabel((ReportLabelInput) this.translationEngine - .convertObjectAsSafeClass(appObject.getReportLabel(), ReportLabel.class)) - .setReportPeriod(this.translationEngine.convertObject(appObject.getReportPeriod())) + .setReportLabel((ReportLabelInput) this.taskitEngine + .translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class)) + .setReportPeriod(this.taskitEngine.translateObject(appObject.getReportPeriod())) .setVersion(appObject.getVersion()) .build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyDimensionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyDimensionTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyDimensionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyDimensionTranslationSpec.java index a1862b0..7bf3517 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyDimensionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import com.google.protobuf.Any; @@ -7,22 +7,22 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyDimensionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class GroupPropertyDimensionTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupPropertyDimension convertInputObject(GroupPropertyDimensionInput inputObject) { + protected GroupPropertyDimension translateInputObject(GroupPropertyDimensionInput inputObject) { GroupPropertyDimension.Builder builder = GroupPropertyDimension.builder(); - GroupPropertyId globalPropertyId = this.translationEngine.convertObject(inputObject.getGroupPropertyId()); + GroupPropertyId globalPropertyId = this.taskitEngine.translateObject(inputObject.getGroupPropertyId()); GroupId groupId = new GroupId(inputObject.getGId()); builder.setGroupPropertyId(globalPropertyId).setGroupId(groupId); for (Any anyValue : inputObject.getValuesList()) { - Object value = this.translationEngine.getObjectFromAny(anyValue); + Object value = this.taskitEngine.getObjectFromAny(anyValue); builder.addValue(value); } @@ -30,16 +30,16 @@ protected GroupPropertyDimension convertInputObject(GroupPropertyDimensionInput } @Override - protected GroupPropertyDimensionInput convertAppObject(GroupPropertyDimension appObject) { + protected GroupPropertyDimensionInput translateAppObject(GroupPropertyDimension appObject) { GroupPropertyDimensionInput.Builder builder = GroupPropertyDimensionInput.newBuilder(); - GroupPropertyIdInput globalPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(appObject.getGroupPropertyId(), GroupPropertyId.class); + GroupPropertyIdInput globalPropertyIdInput = this.taskitEngine + .translateObjectAsClassSafe(appObject.getGroupPropertyId(), GroupPropertyId.class); builder.setGroupPropertyId(globalPropertyIdInput).setGId(appObject.getGroupId().getValue()); for (Object objValue : appObject.getValues()) { - builder.addValues(this.translationEngine.getAnyFromObject(objValue)); + builder.addValues(this.taskitEngine.getAnyFromObject(objValue)); } return builder.build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyIdTranslationSpec.java index bd901fb..14c7119 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class GroupPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupPropertyId convertInputObject(GroupPropertyIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected GroupPropertyId translateInputObject(GroupPropertyIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected GroupPropertyIdInput convertAppObject(GroupPropertyId appObject) { - return GroupPropertyIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected GroupPropertyIdInput translateAppObject(GroupPropertyId appObject) { + return GroupPropertyIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyReportPluginDataTranslationSpec.java similarity index 71% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyReportPluginDataTranslationSpec.java index ac00209..66f1a9d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.reports.GroupPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId; @@ -9,8 +9,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypeIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -22,32 +22,32 @@ public class GroupPropertyReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupPropertyReportPluginData convertInputObject(GroupPropertyReportPluginDataInput inputObject) { + protected GroupPropertyReportPluginData translateInputObject(GroupPropertyReportPluginDataInput inputObject) { if (!GroupPropertyReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } GroupPropertyReportPluginData.Builder builder = GroupPropertyReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); builder.setDefaultInclusion(inputObject.getDefaultInclusionPolicy()); - builder.setReportPeriod(this.translationEngine.convertObject(inputObject.getReportPeriod())); + builder.setReportPeriod(this.taskitEngine.translateObject(inputObject.getReportPeriod())); for (GroupPropertyReportPropertyMap propertyMap : inputObject.getIncludedPropertiesList()) { - GroupTypeId groupTypeId = this.translationEngine.convertObject(propertyMap.getGroupTypeId()); + GroupTypeId groupTypeId = this.taskitEngine.translateObject(propertyMap.getGroupTypeId()); for (GroupPropertyIdInput groupPropertyIdInput : propertyMap.getGroupPropertiesList()) { - GroupPropertyId groupPropertyId = this.translationEngine.convertObject(groupPropertyIdInput); + GroupPropertyId groupPropertyId = this.taskitEngine.translateObject(groupPropertyIdInput); builder.includeGroupProperty(groupTypeId, groupPropertyId); } } for (GroupPropertyReportPropertyMap propertyMap : inputObject.getExcludedPropertiesList()) { - GroupTypeId groupTypeId = this.translationEngine.convertObject(propertyMap.getGroupTypeId()); + GroupTypeId groupTypeId = this.taskitEngine.translateObject(propertyMap.getGroupTypeId()); for (GroupPropertyIdInput groupPropertyIdInput : propertyMap.getGroupPropertiesList()) { - GroupPropertyId groupPropertyId = this.translationEngine.convertObject(groupPropertyIdInput); + GroupPropertyId groupPropertyId = this.taskitEngine.translateObject(groupPropertyIdInput); builder.excludeGroupProperty(groupTypeId, groupPropertyId); } @@ -57,36 +57,36 @@ protected GroupPropertyReportPluginData convertInputObject(GroupPropertyReportPl } @Override - protected GroupPropertyReportPluginDataInput convertAppObject(GroupPropertyReportPluginData appObject) { + protected GroupPropertyReportPluginDataInput translateAppObject(GroupPropertyReportPluginData appObject) { GroupPropertyReportPluginDataInput.Builder builder = GroupPropertyReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setDefaultInclusionPolicy(appObject.getDefaultInclusionPolicy()) .setReportLabel(reportLabelInput) - .setReportPeriod(this.translationEngine.convertObject(appObject.getReportPeriod())); + .setReportPeriod(this.taskitEngine.translateObject(appObject.getReportPeriod())); for (GroupTypeId groupTypeId : appObject.getGroupTypeIds()) { - GroupTypeIdInput groupTypeIdInput = this.translationEngine.convertObjectAsSafeClass(groupTypeId, + GroupTypeIdInput groupTypeIdInput = this.taskitEngine.translateObjectAsClassSafe(groupTypeId, GroupTypeId.class); GroupPropertyReportPropertyMap.Builder groupPropertyReportBuilder = GroupPropertyReportPropertyMap .newBuilder() .setGroupTypeId(groupTypeIdInput); for (GroupPropertyId groupPropertyId : appObject.getIncludedProperties(groupTypeId)) { - GroupPropertyIdInput groupPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(groupPropertyId, GroupPropertyId.class); + GroupPropertyIdInput groupPropertyIdInput = this.taskitEngine + .translateObjectAsClassSafe(groupPropertyId, GroupPropertyId.class); groupPropertyReportBuilder.addGroupProperties(groupPropertyIdInput); } builder.addIncludedProperties(groupPropertyReportBuilder.build()); groupPropertyReportBuilder = GroupPropertyReportPropertyMap.newBuilder().setGroupTypeId(groupTypeIdInput); for (GroupPropertyId groupPropertyId : appObject.getExcludedProperties(groupTypeId)) { - GroupPropertyIdInput groupPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(groupPropertyId, GroupPropertyId.class); + GroupPropertyIdInput groupPropertyIdInput = this.taskitEngine + .translateObjectAsClassSafe(groupPropertyId, GroupPropertyId.class); groupPropertyReportBuilder.addGroupProperties(groupPropertyIdInput); } builder.addExcludedProperties(groupPropertyReportBuilder.build()); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypeIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupTypeIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypeIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupTypeIdTranslationSpec.java index 6b7d247..6af6c9e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypeIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupTypeIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypeId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypeIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class GroupTypeIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupTypeId convertInputObject(GroupTypeIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected GroupTypeId translateInputObject(GroupTypeIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected GroupTypeIdInput convertAppObject(GroupTypeId appObject) { - return GroupTypeIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected GroupTypeIdInput translateAppObject(GroupTypeId appObject) { + return GroupTypeIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypesForPersonFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupTypesForPersonFilterTranslationSpec.java similarity index 71% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypesForPersonFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupTypesForPersonFilterTranslationSpec.java index 993bd83..bdffe54 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupTypesForPersonFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupTypesForPersonFilterTranslationSpec.java @@ -1,26 +1,25 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypesForPersonFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypesForPersonFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class GroupTypesForPersonFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupTypesForPersonFilter convertInputObject(GroupTypesForPersonFilterInput inputObject) { - Equality equality = this.translationEngine.convertObject(inputObject.getEquality()); + protected GroupTypesForPersonFilter translateInputObject(GroupTypesForPersonFilterInput inputObject) { + Equality equality = this.taskitEngine.translateObject(inputObject.getEquality()); int groupTypeCount = inputObject.getGroupTypeCount(); return new GroupTypesForPersonFilter(equality, groupTypeCount); } @Override - protected GroupTypesForPersonFilterInput convertAppObject(GroupTypesForPersonFilter appObject) { - EqualityInput equality = this.translationEngine.convertObjectAsSafeClass(appObject.getEquality(), - Equality.class); + protected GroupTypesForPersonFilterInput translateAppObject(GroupTypesForPersonFilter appObject) { + EqualityInput equality = this.taskitEngine.translateObjectAsClassSafe(appObject.getEquality(), Equality.class); int groupTypeCount = appObject.getGroupTypeCount(); return GroupTypesForPersonFilterInput.newBuilder() diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java similarity index 68% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java index 16033d9..d9230fb 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsForPersonAndGroupTypeFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypeId; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupsForPersonAndGroupTypeFilter; @@ -6,25 +6,26 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypeIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupsForPersonAndGroupTypeFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class GroupsForPersonAndGroupTypeFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupsForPersonAndGroupTypeFilter convertInputObject(GroupsForPersonAndGroupTypeFilterInput inputObject) { - GroupTypeId groupTypeId = this.translationEngine.convertObject(inputObject.getGroupTypeId()); - Equality equality = this.translationEngine.convertObject(inputObject.getEquality()); + protected GroupsForPersonAndGroupTypeFilter translateInputObject( + GroupsForPersonAndGroupTypeFilterInput inputObject) { + GroupTypeId groupTypeId = this.taskitEngine.translateObject(inputObject.getGroupTypeId()); + Equality equality = this.taskitEngine.translateObject(inputObject.getEquality()); int groupCount = inputObject.getGroupCount(); return new GroupsForPersonAndGroupTypeFilter(groupTypeId, equality, groupCount); } @Override - protected GroupsForPersonAndGroupTypeFilterInput convertAppObject(GroupsForPersonAndGroupTypeFilter appObject) { - GroupTypeIdInput groupTypeIdInput = this.translationEngine.convertObjectAsSafeClass(appObject.getGroupTypeId(), + protected GroupsForPersonAndGroupTypeFilterInput translateAppObject(GroupsForPersonAndGroupTypeFilter appObject) { + GroupTypeIdInput groupTypeIdInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getGroupTypeId(), GroupTypeId.class); - EqualityInput equalityInput = this.translationEngine.convertObjectAsSafeClass(appObject.getEquality(), + EqualityInput equalityInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getEquality(), Equality.class); int groupCount = appObject.getGroupCount(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsForPersonFilterTranslationSpec.java similarity index 71% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsForPersonFilterTranslationSpec.java index a21ebb0..03772a4 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsForPersonFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsForPersonFilterTranslationSpec.java @@ -1,25 +1,25 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupsForPersonFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupsForPersonFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class GroupsForPersonFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupsForPersonFilter convertInputObject(GroupsForPersonFilterInput inputObject) { - Equality equality = this.translationEngine.convertObject(inputObject.getEquality()); + protected GroupsForPersonFilter translateInputObject(GroupsForPersonFilterInput inputObject) { + Equality equality = this.taskitEngine.translateObject(inputObject.getEquality()); int groupCount = inputObject.getGroupCount(); return new GroupsForPersonFilter(equality, groupCount); } @Override - protected GroupsForPersonFilterInput convertAppObject(GroupsForPersonFilter appObject) { - EqualityInput equalityInput = this.translationEngine.convertObjectAsSafeClass(appObject.getEquality(), + protected GroupsForPersonFilterInput translateAppObject(GroupsForPersonFilter appObject) { + EqualityInput equalityInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getEquality(), Equality.class); int groupCount = appObject.getGroupCount(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsPluginDataTranslationSpec.java similarity index 75% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsPluginDataTranslationSpec.java index 1ff237b..54e52c0 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/GroupsPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/GroupsPluginDataTranslationSpec.java @@ -1,7 +1,9 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import java.util.*; +import com.google.protobuf.Any; + import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.datamanagers.GroupsPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId; @@ -19,8 +21,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionMapInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyValueMapInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -30,16 +32,16 @@ public class GroupsPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected GroupsPluginData convertInputObject(GroupsPluginDataInput inputObject) { + protected GroupsPluginData translateInputObject(GroupsPluginDataInput inputObject) { if (!GroupsPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } GroupsPluginData.Builder builder = GroupsPluginData.builder(); // Add groups for (GroupInput groupInput : inputObject.getGroupsList()) { - GroupTypeId groupTypeId = this.translationEngine.convertObject(groupInput.getGroupTypeId()); + GroupTypeId groupTypeId = this.taskitEngine.translateObject(groupInput.getGroupTypeId()); for (Integer gId : groupInput.getGIdList()) { builder.addGroup(new GroupId(gId), groupTypeId); } @@ -48,22 +50,22 @@ protected GroupsPluginData convertInputObject(GroupsPluginDataInput inputObject) // Add group type ids for (GroupTypeIdInput groupTypeIdInput : inputObject.getGroupTypeIdsList()) { - GroupTypeId groupTypeId = this.translationEngine.convertObject(groupTypeIdInput); + GroupTypeId groupTypeId = this.taskitEngine.translateObject(groupTypeIdInput); builder.addGroupTypeId(groupTypeId); } // Add group type property definitions for (GroupPropertyDefinitionMapInput groupPropertyDefinitionMapInput : inputObject .getGroupPropertyDefinitionsList()) { - GroupTypeId groupTypeId = this.translationEngine - .convertObject(groupPropertyDefinitionMapInput.getGroupTypeId()); + GroupTypeId groupTypeId = this.taskitEngine + .translateObject(groupPropertyDefinitionMapInput.getGroupTypeId()); for (PropertyDefinitionMapInput propertyDefinitionMapInput : groupPropertyDefinitionMapInput .getPropertyDefinitionsList()) { - GroupPropertyId groupPropertyId = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyId()); - PropertyDefinition propertyDefinition = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyDefinition()); + GroupPropertyId groupPropertyId = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyId()); + PropertyDefinition propertyDefinition = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyDefinition()); builder.defineGroupProperty(groupTypeId, groupPropertyId, propertyDefinition); } } @@ -74,10 +76,9 @@ protected GroupsPluginData convertInputObject(GroupsPluginDataInput inputObject) for (int groupId : groupPropertyValueMapInput.getGIdsList()) { - GroupPropertyId groupPropertyId = this.translationEngine + GroupPropertyId groupPropertyId = this.taskitEngine .getObjectFromAny(propertyValueMapInput.getPropertyId()); - Object propertyValue = this.translationEngine - .getObjectFromAny(propertyValueMapInput.getPropertyValue()); + Object propertyValue = this.taskitEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); builder.setGroupPropertyValue(new GroupId(groupId), groupPropertyId, propertyValue); } @@ -106,24 +107,26 @@ protected GroupsPluginData convertInputObject(GroupsPluginDataInput inputObject) } @Override - protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { + protected GroupsPluginDataInput translateAppObject(GroupsPluginData appObject) { GroupsPluginDataInput.Builder builder = GroupsPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); + Map groupTypeIdTranslatedCacheMap = new HashMap<>(); + // add group type ids for (GroupTypeId groupTypeId : appObject.getGroupTypeIds()) { - GroupTypeIdInput groupTypeIdInput = this.translationEngine.convertObjectAsSafeClass(groupTypeId, + GroupTypeIdInput groupTypeIdInput = this.taskitEngine.translateObjectAsClassSafe(groupTypeId, GroupTypeId.class); builder.addGroupTypeIds(groupTypeIdInput); + groupTypeIdTranslatedCacheMap.put(groupTypeId, groupTypeIdInput); } Map> groupMap = new LinkedHashMap<>(); // add groups for (GroupId groupId : appObject.getGroupIds()) { - GroupTypeIdInput groupTypeIdInput = this.translationEngine - .convertObjectAsSafeClass(appObject.getGroupTypeId(groupId), GroupTypeId.class); + GroupTypeIdInput groupTypeIdInput = groupTypeIdTranslatedCacheMap.get(appObject.getGroupTypeId(groupId)); List groups = groupMap.get(groupTypeIdInput); @@ -142,14 +145,15 @@ protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { builder.addGroups(groupInput); } - // add group type property definitions + groupMap.clear(); + Map groupPropertyIdTranslatedCacheMap = new HashMap<>(); + // add group type property definitions for (GroupTypeId groupTypeId : appObject.getGroupTypeIds()) { GroupPropertyDefinitionMapInput.Builder groupPropDefMapInputBuilder = GroupPropertyDefinitionMapInput .newBuilder(); - GroupTypeIdInput groupTypeIdInput = this.translationEngine.convertObjectAsSafeClass(groupTypeId, - GroupTypeId.class); + GroupTypeIdInput groupTypeIdInput = groupTypeIdTranslatedCacheMap.get(groupTypeId); groupPropDefMapInputBuilder.setGroupTypeId(groupTypeIdInput); Set groupPropertyIds = appObject.getGroupPropertyIds(groupTypeId); @@ -158,12 +162,18 @@ protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { PropertyDefinition propertyDefinition = appObject.getGroupPropertyDefinition(groupTypeId, groupPropertyId); - PropertyDefinitionInput propertyDefinitionInput = this.translationEngine - .convertObject(propertyDefinition); + PropertyDefinitionInput propertyDefinitionInput = this.taskitEngine.translateObject(propertyDefinition); + + Any groupPropertyIdInput = groupPropertyIdTranslatedCacheMap.get(groupPropertyId); + + if (groupPropertyIdInput == null) { + groupPropertyIdInput = this.taskitEngine.getAnyFromObject(groupPropertyId); + groupPropertyIdTranslatedCacheMap.put(groupPropertyId, groupPropertyIdInput); + } PropertyDefinitionMapInput propertyDefInput = PropertyDefinitionMapInput.newBuilder() .setPropertyDefinition(propertyDefinitionInput) - .setPropertyId(this.translationEngine.getAnyFromObject(groupPropertyId)) + .setPropertyId(groupPropertyIdInput) .build(); groupPropDefMapInputBuilder.addPropertyDefinitions(propertyDefInput); @@ -171,13 +181,14 @@ protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { builder.addGroupPropertyDefinitions(groupPropDefMapInputBuilder.build()); } + + groupTypeIdTranslatedCacheMap.clear(); + // add group property values Map> propValueToGroupIdsMap = new LinkedHashMap<>(); for (GroupId groupId : appObject.getGroupIds()) { - // groupPropValMapBuilder.setGId(groupId.getValue()); - List groupPropertyValues = appObject.getGroupPropertyValues(groupId); for (GroupPropertyValue groupPropertyValue : groupPropertyValues) { @@ -192,16 +203,25 @@ protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { } } + Map propertyValueTranslatedCacheMap = new HashMap<>(); + for (GroupPropertyValue groupPropertyValue : propValueToGroupIdsMap.keySet()) { GroupPropertyValueMapInput.Builder groupPropValMapBuilder = GroupPropertyValueMapInput.newBuilder(); Object propertyValue = groupPropertyValue.value(); + Any propertyValueInput = propertyValueTranslatedCacheMap.get(propertyValue); + + if (propertyValueInput == null) { + propertyValueInput = this.taskitEngine.getAnyFromObject(propertyValue); + propertyValueTranslatedCacheMap.put(propertyValue, propertyValueInput); + } + List groupIds = propValueToGroupIdsMap.get(groupPropertyValue); Collections.sort(groupIds); PropertyValueMapInput propertyValueMapInput = PropertyValueMapInput.newBuilder() - .setPropertyValue(this.translationEngine.getAnyFromObject(propertyValue)) - .setPropertyId(this.translationEngine.getAnyFromObject(groupPropertyValue.groupPropertyId())) + .setPropertyValue(propertyValueInput) + .setPropertyId(groupPropertyIdTranslatedCacheMap.get(groupPropertyValue.groupPropertyId())) .build(); groupPropValMapBuilder.setPropertyValueMap(propertyValueMapInput).addAllGIds(groupIds); @@ -209,6 +229,9 @@ protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { builder.addGroupPropertyValues(groupPropValMapBuilder.build()); } + propValueToGroupIdsMap.clear(); + groupPropertyIdTranslatedCacheMap.clear(); + // add people for (int i = 0; i < appObject.getPersonCount(); i++) { PersonId personId = new PersonId(i); @@ -227,6 +250,7 @@ protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { } + // add groups for (int i = 0; i < appObject.getGroupCount(); i++) { GroupId groupId = new GroupId(i); List peopleInGroup = appObject.getPeopleForGroup(groupId); @@ -239,6 +263,7 @@ protected GroupsPluginDataInput convertAppObject(GroupsPluginData appObject) { for (PersonId personId : peopleInGroup) { groupMembershipBuilder.addPIds(personId.getValue()); } + builder.addGroupToPersonMemberships(groupMembershipBuilder.build()); } } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/TestGroupPropertyIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/TestGroupPropertyIdTranslationSpec.java index 5eba882..85bac41 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/TestGroupPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.testsupport.input.TestGroupPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,12 +12,12 @@ public class TestGroupPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestGroupPropertyId convertInputObject(TestGroupPropertyIdInput inputObject) { + protected TestGroupPropertyId translateInputObject(TestGroupPropertyIdInput inputObject) { return TestGroupPropertyId.valueOf(inputObject.name()); } @Override - protected TestGroupPropertyIdInput convertAppObject(TestGroupPropertyId appObject) { + protected TestGroupPropertyIdInput translateAppObject(TestGroupPropertyId appObject) { return TestGroupPropertyIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupTypeIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/TestGroupTypeIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupTypeIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/TestGroupTypeIdTranslationSpec.java index f8ef247..90ab10d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/TestGroupTypeIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/TestGroupTypeIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupTypeId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.testsupport.input.TestGroupTypeIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TestGroupTypeIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestGroupTypeId convertInputObject(TestGroupTypeIdInput inputObject) { + protected TestGroupTypeId translateInputObject(TestGroupTypeIdInput inputObject) { return TestGroupTypeId.valueOf(inputObject.name()); } @Override - protected TestGroupTypeIdInput convertAppObject(TestGroupTypeId appObject) { + protected TestGroupTypeIdInput translateAppObject(TestGroupTypeId appObject) { return TestGroupTypeIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/MaterialsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/MaterialsTranslator.java similarity index 55% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/MaterialsTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/MaterialsTranslator.java index 7cbb984..a8fcda9 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/MaterialsTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/MaterialsTranslator.java @@ -1,44 +1,45 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation; import java.util.ArrayList; import java.util.List; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.StageIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.BatchIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.BatchPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.BatchStatusReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.MaterialIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.MaterialsPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.MaterialsProducerIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.MaterialsProducerPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.MaterialsProducerPropertyReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.MaterialsProducerResourceReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.StageIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.StageReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.TestBatchPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.TestMaterialIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.TestMaterialsProducerIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs.TestMaterialsProducerPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.BatchIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.BatchPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.BatchStatusReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.MaterialIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.MaterialsPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.MaterialsProducerIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.MaterialsProducerPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.MaterialsProducerPropertyReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.MaterialsProducerResourceReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.StageIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.StageReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.TestBatchPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.TestMaterialIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.TestMaterialsProducerIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs.TestMaterialsProducerPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the Materials Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the MaterialsPlugin + * necessary TranslationSpecs needed to read and write the MaterialsPlugin */ public class MaterialsTranslator { private MaterialsTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new MaterialsPluginDataTranslationSpec()); list.add(new MaterialIdTranslationSpec()); @@ -71,24 +72,26 @@ private static Translator.Builder builder() { .addDependency(RegionsTranslatorId.TRANSLATOR_ID) .addDependency(ReportsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); + } + + if (taskitEngineBuilder instanceof ProtobufJsonTaskitEngine.Builder) { + ((ProtobufJsonTaskitEngine.Builder) taskitEngineBuilder) + .addFieldToIncludeDefaultValue(BatchIdInput.getDescriptor().findFieldByName("id")) + .addFieldToIncludeDefaultValue(StageIdInput.getDescriptor().findFieldByName("id")); } - translationEngineBuilder - .addFieldToIncludeDefaultValue(BatchIdInput.getDescriptor().findFieldByName("id")) - .addFieldToIncludeDefaultValue(StageIdInput.getDescriptor().findFieldByName("id")); }); return builder; } /** - * Returns a Translator that includes TranslationSpecs for the - * MaterialsPlugin. + * Returns a Translator that includes TranslationSpecs for the MaterialsPlugin. */ public static Translator getTranslator() { return builder().build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/MaterialsTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/MaterialsTranslatorId.java similarity index 64% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/MaterialsTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/MaterialsTranslatorId.java index f2bc79e..a2ce192 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/MaterialsTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/MaterialsTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Materials Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchIdTranslationSpec.java similarity index 78% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchIdTranslationSpec.java index a3afbb4..7d608b0 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between {@linkplain BatchIdInput} @@ -11,12 +11,12 @@ public class BatchIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected BatchId convertInputObject(BatchIdInput inputObject) { + protected BatchId translateInputObject(BatchIdInput inputObject) { return new BatchId(inputObject.getId()); } @Override - protected BatchIdInput convertAppObject(BatchId appObject) { + protected BatchIdInput translateAppObject(BatchId appObject) { return BatchIdInput.newBuilder().setId(appObject.getValue()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchPropertyIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchPropertyIdTranslationSpec.java index 7b9f8d6..10fe832 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class BatchPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected BatchPropertyId convertInputObject(BatchPropertyIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected BatchPropertyId translateInputObject(BatchPropertyIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected BatchPropertyIdInput convertAppObject(BatchPropertyId appObject) { - return BatchPropertyIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected BatchPropertyIdInput translateAppObject(BatchPropertyId appObject) { + return BatchPropertyIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchStatusReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchStatusReportPluginDataTranslationSpec.java similarity index 72% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchStatusReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchStatusReportPluginDataTranslationSpec.java index 34c258c..717beb9 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/BatchStatusReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/BatchStatusReportPluginDataTranslationSpec.java @@ -1,11 +1,11 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.BatchStatusReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.BatchStatusReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -17,26 +17,26 @@ public class BatchStatusReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected BatchStatusReportPluginData convertInputObject(BatchStatusReportPluginDataInput inputObject) { + protected BatchStatusReportPluginData translateInputObject(BatchStatusReportPluginDataInput inputObject) { if (!BatchStatusReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } BatchStatusReportPluginData.Builder builder = BatchStatusReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); return builder.build(); } @Override - protected BatchStatusReportPluginDataInput convertAppObject(BatchStatusReportPluginData appObject) { + protected BatchStatusReportPluginDataInput translateAppObject(BatchStatusReportPluginData appObject) { BatchStatusReportPluginDataInput.Builder builder = BatchStatusReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setReportLabel(reportLabelInput); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialIdTranslationSpec.java index 320b8d8..ab070a1 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class MaterialIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected MaterialId convertInputObject(MaterialIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected MaterialId translateInputObject(MaterialIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected MaterialIdInput convertAppObject(MaterialId appObject) { - return MaterialIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected MaterialIdInput translateAppObject(MaterialId appObject) { + return MaterialIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsPluginDataTranslationSpec.java similarity index 76% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsPluginDataTranslationSpec.java index 61bc2fd..893c4fc 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import java.util.Map; import java.util.Set; @@ -30,8 +30,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionMapInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyValueMapInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceInitializationInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -42,9 +42,9 @@ public class MaterialsPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputObject) { + protected MaterialsPluginData translateInputObject(MaterialsPluginDataInput inputObject) { if (!MaterialsPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } MaterialsPluginData.Builder builder = MaterialsPluginData.builder(); @@ -54,27 +54,26 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // material ids for (MaterialIdInput materialIdInput : inputObject.getMaterialIdsList()) { - MaterialId materialId = this.translationEngine.convertObject(materialIdInput); + MaterialId materialId = this.taskitEngine.translateObject(materialIdInput); builder.addMaterial(materialId); } // material producer ids for (MaterialsProducerIdInput materialsProducerIdInput : inputObject.getMaterialsProducerIdsList()) { - MaterialsProducerId materialsProducerId = this.translationEngine.convertObject(materialsProducerIdInput); + MaterialsProducerId materialsProducerId = this.taskitEngine.translateObject(materialsProducerIdInput); builder.addMaterialsProducerId(materialsProducerId); } // batch property defintions for (BatchPropertyDefinitionMapInput batchPropertyDefinitionMapInput : inputObject .getBatchPropertyDefinitionsList()) { - MaterialId materialId = this.translationEngine - .convertObject(batchPropertyDefinitionMapInput.getMaterialId()); + MaterialId materialId = this.taskitEngine.translateObject(batchPropertyDefinitionMapInput.getMaterialId()); for (PropertyDefinitionMapInput propertyDefinitionMapInput : batchPropertyDefinitionMapInput .getPropertyDefinitionsList()) { - BatchPropertyId batchPropertyId = this.translationEngine + BatchPropertyId batchPropertyId = this.taskitEngine .getObjectFromAny(propertyDefinitionMapInput.getPropertyId()); - PropertyDefinition propertyDefinition = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyDefinition()); + PropertyDefinition propertyDefinition = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyDefinition()); builder.defineBatchProperty(materialId, batchPropertyId, propertyDefinition); } @@ -83,23 +82,23 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // material producer property definition for (PropertyDefinitionMapInput propertyDefinitionMapInput : inputObject .getMaterialsProducerPropertyDefinitionsList()) { - MaterialsProducerPropertyId materialsProducerPropertyId = this.translationEngine + MaterialsProducerPropertyId materialsProducerPropertyId = this.taskitEngine .getObjectFromAny(propertyDefinitionMapInput.getPropertyId()); - PropertyDefinition propertyDefinition = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyDefinition()); + PropertyDefinition propertyDefinition = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyDefinition()); builder.defineMaterialsProducerProperty(materialsProducerPropertyId, propertyDefinition); } // material producer property value for (MaterialsProducerPropertyValueMapInput materialsProducerPropertyValueMapInput : inputObject .getMaterialsProducerPropertyValuesList()) { - MaterialsProducerId materialsProducerId = this.translationEngine - .convertObject(materialsProducerPropertyValueMapInput.getMaterialsProducerId()); + MaterialsProducerId materialsProducerId = this.taskitEngine + .translateObject(materialsProducerPropertyValueMapInput.getMaterialsProducerId()); for (PropertyValueMapInput propertyValueMapInput : materialsProducerPropertyValueMapInput .getPropertyValuesList()) { - MaterialsProducerPropertyId materialsProducerPropertyId = this.translationEngine + MaterialsProducerPropertyId materialsProducerPropertyId = this.taskitEngine .getObjectFromAny(propertyValueMapInput.getPropertyId()); - Object value = this.translationEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); + Object value = this.taskitEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); builder.setMaterialsProducerPropertyValue(materialsProducerId, materialsProducerPropertyId, value); } @@ -108,12 +107,11 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // material producer resource level for (MaterialsProducerResourceLevelMapInput materialsProducerResourceLevelMapInput : inputObject .getMaterialsProducerResourceLevelsList()) { - MaterialsProducerId materialsProducerId = this.translationEngine - .convertObject(materialsProducerResourceLevelMapInput.getMaterialsProducerId()); + MaterialsProducerId materialsProducerId = this.taskitEngine + .translateObject(materialsProducerResourceLevelMapInput.getMaterialsProducerId()); for (ResourceInitializationInput resourceInitializationInput : materialsProducerResourceLevelMapInput .getResourceLevelsList()) { - ResourceId resourceId = this.translationEngine - .convertObject(resourceInitializationInput.getResourceId()); + ResourceId resourceId = this.taskitEngine.translateObject(resourceInitializationInput.getResourceId()); long amount = resourceInitializationInput.getAmount(); builder.setMaterialsProducerResourceLevel(materialsProducerId, resourceId, amount); @@ -122,8 +120,8 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // batch ids for (BatchInput batchMapInput : inputObject.getBatchIdsList()) { - BatchId batchId = this.translationEngine.convertObject(batchMapInput.getBatchId()); - MaterialId materialId = this.translationEngine.convertObject(batchMapInput.getMaterialId()); + BatchId batchId = this.taskitEngine.translateObject(batchMapInput.getBatchId()); + MaterialId materialId = this.taskitEngine.translateObject(batchMapInput.getMaterialId()); double amount = batchMapInput.getAmount(); builder.addBatch(batchId, materialId, amount); @@ -131,13 +129,12 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // batch property values for (BatchPropertyValueInput batchPropertyValueInput : inputObject.getBatchPropertyValuesList()) { - BatchId batchId = this.translationEngine.convertObject(batchPropertyValueInput.getBatchId()); + BatchId batchId = this.taskitEngine.translateObject(batchPropertyValueInput.getBatchId()); for (PropertyValueMapInput propertyValueMapInput : batchPropertyValueInput.getPropertyValuesList()) { - BatchPropertyId batchPropertyId = this.translationEngine + BatchPropertyId batchPropertyId = this.taskitEngine .getObjectFromAny(propertyValueMapInput.getPropertyId()); - Object propertyValue = this.translationEngine - .getObjectFromAny(propertyValueMapInput.getPropertyValue()); + Object propertyValue = this.taskitEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); builder.setBatchPropertyValue(batchId, batchPropertyId, propertyValue); } @@ -146,18 +143,18 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // material producer inventory batches for (MaterialsProducerInventoryBatchesInput inventoryBatchesInput : inputObject .getMaterialsProducerInverntoryBatchesList()) { - MaterialsProducerId materialsProducerId = this.translationEngine - .convertObject(inventoryBatchesInput.getMaterialsProducerId()); + MaterialsProducerId materialsProducerId = this.taskitEngine + .translateObject(inventoryBatchesInput.getMaterialsProducerId()); for (BatchIdInput batchIdInput : inventoryBatchesInput.getBatchesList()) { - builder.addBatchToMaterialsProducerInventory(this.translationEngine.convertObject(batchIdInput), + builder.addBatchToMaterialsProducerInventory(this.taskitEngine.translateObject(batchIdInput), materialsProducerId); } } // stage ids for (StageInput stageMapInput : inputObject.getStageIdsList()) { - StageId stageId = this.translationEngine.convertObject(stageMapInput.getStageId()); + StageId stageId = this.taskitEngine.translateObject(stageMapInput.getStageId()); boolean offered = stageMapInput.getOffered(); builder.addStage(stageId, offered); @@ -165,9 +162,9 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // stage batches for (StageBatchInput stageBatchInput : inputObject.getStageBatchesList()) { - StageId stageId = this.translationEngine.convertObject(stageBatchInput.getStageId()); + StageId stageId = this.taskitEngine.translateObject(stageBatchInput.getStageId()); for (BatchIdInput batchIdInput : stageBatchInput.getBatchesInStageList()) { - BatchId batchId = this.translationEngine.convertObject(batchIdInput); + BatchId batchId = this.taskitEngine.translateObject(batchIdInput); builder.addBatchToStage(stageId, batchId); } @@ -175,11 +172,11 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO // material producer stages for (MaterialsProducerStagesInput materialsStagesInput : inputObject.getMaterialsProducerStagesList()) { - MaterialsProducerId materialsProducerId = this.translationEngine - .convertObject(materialsStagesInput.getMaterialsProducerId()); + MaterialsProducerId materialsProducerId = this.taskitEngine + .translateObject(materialsStagesInput.getMaterialsProducerId()); for (StageIdInput stageIdInput : materialsStagesInput.getStagesList()) { - builder.addStageToMaterialProducer(this.translationEngine.convertObject(stageIdInput), + builder.addStageToMaterialProducer(this.taskitEngine.translateObject(stageIdInput), materialsProducerId); } } @@ -188,7 +185,7 @@ protected MaterialsPluginData convertInputObject(MaterialsPluginDataInput inputO } @Override - protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObject) { + protected MaterialsPluginDataInput translateAppObject(MaterialsPluginData appObject) { MaterialsPluginDataInput.Builder builder = MaterialsPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); @@ -219,7 +216,7 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // material ids for (MaterialId materialId : materialIds) { - MaterialIdInput materialIdInput = this.translationEngine.convertObjectAsSafeClass(materialId, + MaterialIdInput materialIdInput = this.taskitEngine.translateObjectAsClassSafe(materialId, MaterialId.class); // add materialIds builder.addMaterialIds(materialIdInput); @@ -227,15 +224,15 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // material producer ids for (MaterialsProducerId materialsProducerId : materialsProducerIds) { - MaterialsProducerIdInput materialsProducerIdInput = this.translationEngine - .convertObjectAsSafeClass(materialsProducerId, MaterialsProducerId.class); + MaterialsProducerIdInput materialsProducerIdInput = this.taskitEngine + .translateObjectAsClassSafe(materialsProducerId, MaterialsProducerId.class); builder.addMaterialsProducerIds(materialsProducerIdInput); } // batch property definitions for (MaterialId materialId : batchPropertyDefinitions.keySet()) { - MaterialIdInput materialIdInput = this.translationEngine.convertObjectAsSafeClass(materialId, + MaterialIdInput materialIdInput = this.taskitEngine.translateObjectAsClassSafe(materialId, MaterialId.class); BatchPropertyDefinitionMapInput.Builder batchPropertyDefinitionMapBuilder = BatchPropertyDefinitionMapInput @@ -246,12 +243,11 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec for (BatchPropertyId batchPropertyId : batchPropDefMap.keySet()) { PropertyDefinition propertyDefinition = batchPropDefMap.get(batchPropertyId); - PropertyDefinitionInput propertyDefinitionInput = this.translationEngine - .convertObject(propertyDefinition); + PropertyDefinitionInput propertyDefinitionInput = this.taskitEngine.translateObject(propertyDefinition); PropertyDefinitionMapInput propertyDefinitionMapInput = PropertyDefinitionMapInput.newBuilder() .setPropertyDefinition(propertyDefinitionInput) - .setPropertyId(this.translationEngine.getAnyFromObject(batchPropertyId)) + .setPropertyId(this.taskitEngine.getAnyFromObject(batchPropertyId)) .build(); batchPropertyDefinitionMapBuilder.addPropertyDefinitions(propertyDefinitionMapInput); @@ -262,12 +258,12 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // materials producer property definitions for (MaterialsProducerPropertyId materialsProducerPropertyId : materialsProducerPropertyDefinitions.keySet()) { - PropertyDefinitionInput propertyDefinitionInput = this.translationEngine - .convertObject(materialsProducerPropertyDefinitions.get(materialsProducerPropertyId)); + PropertyDefinitionInput propertyDefinitionInput = this.taskitEngine + .translateObject(materialsProducerPropertyDefinitions.get(materialsProducerPropertyId)); PropertyDefinitionMapInput propertyDefinitionMapInput = PropertyDefinitionMapInput.newBuilder() .setPropertyDefinition(propertyDefinitionInput) - .setPropertyId(this.translationEngine.getAnyFromObject(materialsProducerPropertyId)) + .setPropertyId(this.taskitEngine.getAnyFromObject(materialsProducerPropertyId)) .build(); // add materialsProducerPropertyDefinitions @@ -276,8 +272,8 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // materials producer property values for (MaterialsProducerId materialsProducerId : materialsProducerPropertyValues.keySet()) { - MaterialsProducerIdInput materialsProducerIdInput = this.translationEngine - .convertObjectAsSafeClass(materialsProducerId, MaterialsProducerId.class); + MaterialsProducerIdInput materialsProducerIdInput = this.taskitEngine + .translateObjectAsClassSafe(materialsProducerId, MaterialsProducerId.class); MaterialsProducerPropertyValueMapInput.Builder materialsProducerPropertyValueMapInput = MaterialsProducerPropertyValueMapInput .newBuilder() @@ -290,8 +286,8 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec Object value = materialsProducerPropVals.get(materialsProducerPropertyId); PropertyValueMapInput propertyValueMapInput = PropertyValueMapInput.newBuilder() - .setPropertyValue(this.translationEngine.getAnyFromObject(value)) - .setPropertyId(this.translationEngine.getAnyFromObject(materialsProducerPropertyId)) + .setPropertyValue(this.taskitEngine.getAnyFromObject(value)) + .setPropertyId(this.taskitEngine.getAnyFromObject(materialsProducerPropertyId)) .build(); materialsProducerPropertyValueMapInput.addPropertyValues(propertyValueMapInput); @@ -302,8 +298,8 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // materials producer resource levels for (MaterialsProducerId materialsProducerId : materialsProducerResourceLevels.keySet()) { - MaterialsProducerIdInput materialsProducerIdInput = this.translationEngine - .convertObjectAsSafeClass(materialsProducerId, MaterialsProducerId.class); + MaterialsProducerIdInput materialsProducerIdInput = this.taskitEngine + .translateObjectAsClassSafe(materialsProducerId, MaterialsProducerId.class); MaterialsProducerResourceLevelMapInput.Builder resourceLevelMapBuilder = MaterialsProducerResourceLevelMapInput .newBuilder() @@ -316,7 +312,7 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec ResourceInitializationInput resourceInitializationInput = ResourceInitializationInput.newBuilder() .setAmount(amount) - .setResourceId(this.translationEngine.getAnyFromObject(resourceId)) + .setResourceId(this.taskitEngine.getAnyFromObject(resourceId)) .build(); resourceLevelMapBuilder.addResourceLevels(resourceInitializationInput); @@ -328,10 +324,10 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // batch ids for (BatchId batchId : batchIds) { - BatchIdInput batchIdInput = this.translationEngine.convertObject(batchId); + BatchIdInput batchIdInput = this.taskitEngine.translateObject(batchId); double amount = batchAmounts.get(batchId); - MaterialIdInput materialIdInput = this.translationEngine - .convertObjectAsSafeClass(batchMaterials.get(batchId), MaterialId.class); + MaterialIdInput materialIdInput = this.taskitEngine.translateObjectAsClassSafe(batchMaterials.get(batchId), + MaterialId.class); BatchInput batchMap = BatchInput.newBuilder() .setAmount(amount) @@ -344,7 +340,7 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // batch property values for (BatchId batchId : batchPropertyValues.keySet()) { - BatchIdInput batchIdInput = this.translationEngine.convertObject(batchId); + BatchIdInput batchIdInput = this.taskitEngine.translateObject(batchId); Map batchPropVals = batchPropertyValues.get(batchId); @@ -354,8 +350,8 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec PropertyValueMapInput.Builder batchPropertyValueMap = PropertyValueMapInput.newBuilder(); Object value = appObject.getBatchPropertyValues(batchId).get(propertyId); - batchPropertyValueMap.setPropertyValue(this.translationEngine.getAnyFromObject(value)) - .setPropertyId(this.translationEngine.getAnyFromObject(propertyId)); + batchPropertyValueMap.setPropertyValue(this.taskitEngine.getAnyFromObject(value)) + .setPropertyId(this.taskitEngine.getAnyFromObject(propertyId)); batchPropertyBuilder.addPropertyValues(batchPropertyValueMap.build()); } @@ -365,8 +361,8 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // materials producer inventory batches for (MaterialsProducerId materialsProducerId : materialsProducerInventoryBatches.keySet()) { - MaterialsProducerIdInput materialsProducerIdInput = this.translationEngine - .convertObjectAsSafeClass(materialsProducerId, MaterialsProducerId.class); + MaterialsProducerIdInput materialsProducerIdInput = this.taskitEngine + .translateObjectAsClassSafe(materialsProducerId, MaterialsProducerId.class); MaterialsProducerInventoryBatchesInput.Builder inventoryBatchBuilder = MaterialsProducerInventoryBatchesInput .newBuilder() @@ -375,7 +371,7 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec Set batches = materialsProducerInventoryBatches.get(materialsProducerId); for (BatchId batchId : batches) { - BatchIdInput batchIdInput = this.translationEngine.convertObject(batchId); + BatchIdInput batchIdInput = this.taskitEngine.translateObject(batchId); inventoryBatchBuilder.addBatches(batchIdInput); } @@ -387,7 +383,7 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec StageInput.Builder stageMapBuilder = StageInput.newBuilder(); - StageIdInput stageIdInput = this.translationEngine.convertObject(stageId); + StageIdInput stageIdInput = this.taskitEngine.translateObject(stageId); boolean offered = stageOffers.get(stageId); stageMapBuilder.setOffered(offered).setStageId(stageIdInput); @@ -397,12 +393,12 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // stage batches for (StageId stageId : stageBatches.keySet()) { - StageIdInput stageIdInput = this.translationEngine.convertObject(stageId); + StageIdInput stageIdInput = this.taskitEngine.translateObject(stageId); StageBatchInput.Builder stageBatchBuilder = StageBatchInput.newBuilder().setStageId(stageIdInput); for (BatchId batchId : stageBatches.get(stageId)) { - BatchIdInput batchIdInput = this.translationEngine.convertObject(batchId); + BatchIdInput batchIdInput = this.taskitEngine.translateObject(batchId); stageBatchBuilder.addBatchesInStage(batchIdInput); } @@ -412,8 +408,8 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec // materials producer stages for (MaterialsProducerId materialsProducerId : materialsProducerStages.keySet()) { - MaterialsProducerIdInput materialsProducerIdInput = this.translationEngine - .convertObjectAsSafeClass(materialsProducerId, MaterialsProducerId.class); + MaterialsProducerIdInput materialsProducerIdInput = this.taskitEngine + .translateObjectAsClassSafe(materialsProducerId, MaterialsProducerId.class); MaterialsProducerStagesInput.Builder materialsStagesBuilder = MaterialsProducerStagesInput.newBuilder(); materialsStagesBuilder.setMaterialsProducerId(materialsProducerIdInput); @@ -421,7 +417,7 @@ protected MaterialsPluginDataInput convertAppObject(MaterialsPluginData appObjec Set stages = materialsProducerStages.get(materialsProducerId); for (StageId stageId : stages) { - StageIdInput stageIdInput = this.translationEngine.convertObject(stageId); + StageIdInput stageIdInput = this.taskitEngine.translateObject(stageId); materialsStagesBuilder.addStages(stageIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerIdTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerIdTranslationSpec.java index 9efee2f..21d4e8d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialsProducerIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,13 +12,13 @@ public class MaterialsProducerIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected MaterialsProducerId convertInputObject(MaterialsProducerIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected MaterialsProducerId translateInputObject(MaterialsProducerIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected MaterialsProducerIdInput convertAppObject(MaterialsProducerId appObject) { - return MaterialsProducerIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected MaterialsProducerIdInput translateAppObject(MaterialsProducerId appObject) { + return MaterialsProducerIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerPropertyIdTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerPropertyIdTranslationSpec.java index 96d3ec2..bd04767 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialsProducerPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,14 +13,14 @@ public class MaterialsProducerPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected MaterialsProducerPropertyId convertInputObject(MaterialsProducerPropertyIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected MaterialsProducerPropertyId translateInputObject(MaterialsProducerPropertyIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected MaterialsProducerPropertyIdInput convertAppObject(MaterialsProducerPropertyId appObject) { + protected MaterialsProducerPropertyIdInput translateAppObject(MaterialsProducerPropertyId appObject) { return MaterialsProducerPropertyIdInput.newBuilder() - .setId(this.translationEngine.getAnyFromObject(appObject)) + .setId(this.taskitEngine.getAnyFromObject(appObject)) .build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java index 2294b74..0a38750 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerPropertyReportPluginDataTranslationSpec.java @@ -1,11 +1,11 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.MaterialsProducerPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerPropertyReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -17,29 +17,29 @@ public class MaterialsProducerPropertyReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected MaterialsProducerPropertyReportPluginData convertInputObject( + protected MaterialsProducerPropertyReportPluginData translateInputObject( MaterialsProducerPropertyReportPluginDataInput inputObject) { if (!MaterialsProducerPropertyReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } MaterialsProducerPropertyReportPluginData.Builder builder = MaterialsProducerPropertyReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); return builder.build(); } @Override - protected MaterialsProducerPropertyReportPluginDataInput convertAppObject( + protected MaterialsProducerPropertyReportPluginDataInput translateAppObject( MaterialsProducerPropertyReportPluginData appObject) { MaterialsProducerPropertyReportPluginDataInput.Builder builder = MaterialsProducerPropertyReportPluginDataInput .newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setReportLabel(reportLabelInput); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerResourceReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerResourceReportPluginDataTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerResourceReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerResourceReportPluginDataTranslationSpec.java index 6596d02..fdfd2b0 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/MaterialsProducerResourceReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/MaterialsProducerResourceReportPluginDataTranslationSpec.java @@ -1,11 +1,11 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.MaterialsProducerResourceReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerResourceReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -17,29 +17,29 @@ public class MaterialsProducerResourceReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected MaterialsProducerResourceReportPluginData convertInputObject( + protected MaterialsProducerResourceReportPluginData translateInputObject( MaterialsProducerResourceReportPluginDataInput inputObject) { if (!MaterialsProducerResourceReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } MaterialsProducerResourceReportPluginData.Builder builder = MaterialsProducerResourceReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); return builder.build(); } @Override - protected MaterialsProducerResourceReportPluginDataInput convertAppObject( + protected MaterialsProducerResourceReportPluginDataInput translateAppObject( MaterialsProducerResourceReportPluginData appObject) { MaterialsProducerResourceReportPluginDataInput.Builder builder = MaterialsProducerResourceReportPluginDataInput .newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setReportLabel(reportLabelInput); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/StageIdTranslationSpec.java similarity index 78% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/StageIdTranslationSpec.java index c3eaef0..f60ae77 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/StageIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.StageId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.StageIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between {@linkplain StageIdInput} @@ -11,12 +11,12 @@ public class StageIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected StageId convertInputObject(StageIdInput inputObject) { + protected StageId translateInputObject(StageIdInput inputObject) { return new StageId(inputObject.getId()); } @Override - protected StageIdInput convertAppObject(StageId appObject) { + protected StageIdInput translateAppObject(StageId appObject) { return StageIdInput.newBuilder().setId(appObject.getValue()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/StageReportPluginDataTranslationSpec.java similarity index 71% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/StageReportPluginDataTranslationSpec.java index 8c3b5aa..447450e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/StageReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/StageReportPluginDataTranslationSpec.java @@ -1,11 +1,11 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.StageReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.StageReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -17,26 +17,26 @@ public class StageReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected StageReportPluginData convertInputObject(StageReportPluginDataInput inputObject) { + protected StageReportPluginData translateInputObject(StageReportPluginDataInput inputObject) { if (!StageReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } StageReportPluginData.Builder builder = StageReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); return builder.build(); } @Override - protected StageReportPluginDataInput convertAppObject(StageReportPluginData appObject) { + protected StageReportPluginDataInput translateAppObject(StageReportPluginData appObject) { StageReportPluginDataInput.Builder builder = StageReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setReportLabel(reportLabelInput); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestBatchPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestBatchPropertyIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestBatchPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestBatchPropertyIdTranslationSpec.java index 597511d..f6bb887 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestBatchPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestBatchPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestBatchPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestBatchPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,12 +12,12 @@ public class TestBatchPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestBatchPropertyId convertInputObject(TestBatchPropertyIdInput inputObject) { + protected TestBatchPropertyId translateInputObject(TestBatchPropertyIdInput inputObject) { return TestBatchPropertyId.valueOf(inputObject.name()); } @Override - protected TestBatchPropertyIdInput convertAppObject(TestBatchPropertyId appObject) { + protected TestBatchPropertyIdInput translateAppObject(TestBatchPropertyId appObject) { return TestBatchPropertyIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialIdTranslationSpec.java index 2028b8b..5f24725 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestMaterialIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TestMaterialIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestMaterialId convertInputObject(TestMaterialIdInput inputObject) { + protected TestMaterialId translateInputObject(TestMaterialIdInput inputObject) { return TestMaterialId.valueOf(inputObject.name()); } @Override - protected TestMaterialIdInput convertAppObject(TestMaterialId appObject) { + protected TestMaterialIdInput translateAppObject(TestMaterialId appObject) { return TestMaterialIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialsProducerIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialsProducerIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialsProducerIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialsProducerIdTranslationSpec.java index 51ee54f..115e4ba 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialsProducerIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialsProducerIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialsProducerId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestMaterialsProducerIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,12 +13,12 @@ public class TestMaterialsProducerIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestMaterialsProducerId convertInputObject(TestMaterialsProducerIdInput inputObject) { + protected TestMaterialsProducerId translateInputObject(TestMaterialsProducerIdInput inputObject) { return TestMaterialsProducerId.valueOf(inputObject.name()); } @Override - protected TestMaterialsProducerIdInput convertAppObject(TestMaterialsProducerId appObject) { + protected TestMaterialsProducerIdInput translateAppObject(TestMaterialsProducerId appObject) { return TestMaterialsProducerIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialsProducerPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialsProducerPropertyIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialsProducerPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialsProducerPropertyIdTranslationSpec.java index f64c8f3..f6c054e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/TestMaterialsProducerPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/TestMaterialsProducerPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialsProducerPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestMaterialsProducerPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,12 +13,12 @@ public class TestMaterialsProducerPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestMaterialsProducerPropertyId convertInputObject(TestMaterialsProducerPropertyIdInput inputObject) { + protected TestMaterialsProducerPropertyId translateInputObject(TestMaterialsProducerPropertyIdInput inputObject) { return TestMaterialsProducerPropertyId.valueOf(inputObject.name()); } @Override - protected TestMaterialsProducerPropertyIdInput convertAppObject(TestMaterialsProducerPropertyId appObject) { + protected TestMaterialsProducerPropertyIdInput translateAppObject(TestMaterialsProducerPropertyId appObject) { return TestMaterialsProducerPropertyIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/TestFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/TestFilterTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/TestFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/TestFilterTranslationSpec.java index 08d7635..f2224ac 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/TestFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/TestFilterTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.input.TestFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TestFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestFilter convertInputObject(TestFilterInput inputObject) { + protected TestFilter translateInputObject(TestFilterInput inputObject) { return new TestFilter(inputObject.getFilterId()); } @Override - protected TestFilterInput convertAppObject(TestFilter appObject) { + protected TestFilterInput translateAppObject(TestFilter appObject) { return TestFilterInput.newBuilder().setFilterId(appObject.getFilterId()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/TestLabelerTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/TestLabelerTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/TestLabelerTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/TestLabelerTranslationSpec.java index eb93d3e..ccda095 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/TestLabelerTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/TestLabelerTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestLabeler; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.input.TestLabelerInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TestLabelerTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestLabeler convertInputObject(TestLabelerInput inputObject) { + protected TestLabeler translateInputObject(TestLabelerInput inputObject) { return new TestLabeler(inputObject.getId()); } @Override - protected TestLabelerInput convertAppObject(TestLabeler appObject) { + protected TestLabelerInput translateAppObject(TestLabeler appObject) { return TestLabelerInput.newBuilder().setId(appObject.getId().toString()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/PartitionsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/PartitionsTranslator.java similarity index 62% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/PartitionsTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/PartitionsTranslator.java index 3e8fe00..4911e50 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/PartitionsTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/PartitionsTranslator.java @@ -1,36 +1,36 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation; import java.util.ArrayList; import java.util.List; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.AndFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.AttributeFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.AttributeIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.EqualityTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.FalseFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.FilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.LabelerTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.NotFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.OrFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.PartitionTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.PartitionsPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.TestAttributeIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs.TrueFilterTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.AndFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.AttributeFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.AttributeIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.EqualityTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.FalseFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.FilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.LabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.NotFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.OrFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.PartitionTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.PartitionsPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.TestAttributeIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs.TrueFilterTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the Partitions Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the PartitionsPlugin. + * necessary TranslationSpecs needed to read and write the PartitionsPlugin. */ public class PartitionsTranslator { private PartitionsTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new AttributeIdTranslationSpec()); list.add(new TestAttributeIdTranslationSpec()); @@ -57,11 +57,11 @@ private static Translator.Builder builder() { Translator.Builder builder = Translator.builder() .setTranslatorId(PartitionsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } }); @@ -69,8 +69,7 @@ private static Translator.Builder builder() { } /** - * Returns a Translator that includes TranslationSpecs for the - * PartitionsPlugin. + * Returns a Translator that includes TranslationSpecs for the PartitionsPlugin. */ public static Translator getTranslator() { return builder().build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/PartitionsTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/PartitionsTranslatorId.java similarity index 64% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/PartitionsTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/PartitionsTranslatorId.java index e0a9553..4f13b27 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/PartitionsTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/PartitionsTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Partitions Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AndFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AndFilterTranslationSpec.java similarity index 61% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AndFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AndFilterTranslationSpec.java index d2c23c1..8e44254 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AndFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AndFilterTranslationSpec.java @@ -1,10 +1,10 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.AndFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.AndFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,15 +13,15 @@ public class AndFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected AndFilter convertInputObject(AndFilterInput inputObject) { - return new AndFilter(this.translationEngine.convertObject(inputObject.getA()), - this.translationEngine.convertObject(inputObject.getB())); + protected AndFilter translateInputObject(AndFilterInput inputObject) { + return new AndFilter(this.taskitEngine.translateObject(inputObject.getA()), + this.taskitEngine.translateObject(inputObject.getB())); } @Override - protected AndFilterInput convertAppObject(AndFilter appObject) { - FilterInput a = this.translationEngine.convertObjectAsSafeClass(appObject.getFirstFilter(), Filter.class); - FilterInput b = this.translationEngine.convertObjectAsSafeClass(appObject.getSecondFilter(), Filter.class); + protected AndFilterInput translateAppObject(AndFilter appObject) { + FilterInput a = this.taskitEngine.translateObjectAsClassSafe(appObject.getFirstFilter(), Filter.class); + FilterInput b = this.taskitEngine.translateObjectAsClassSafe(appObject.getSecondFilter(), Filter.class); return AndFilterInput.newBuilder().setA(a).setB(b).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AttributeFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AttributeFilterTranslationSpec.java similarity index 65% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AttributeFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AttributeFilterTranslationSpec.java index 79eec98..b7fec04 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AttributeFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AttributeFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import com.google.protobuf.Any; @@ -8,7 +8,7 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.attributes.input.AttributeFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.attributes.input.AttributeIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -17,21 +17,21 @@ public class AttributeFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected AttributeFilter convertInputObject(AttributeFilterInput inputObject) { - AttributeId attributeId = this.translationEngine.convertObject(inputObject.getAttributeId()); - Equality equality = this.translationEngine.convertObject(inputObject.getEquality()); - Object value = this.translationEngine.getObjectFromAny(inputObject.getValue()); + protected AttributeFilter translateInputObject(AttributeFilterInput inputObject) { + AttributeId attributeId = this.taskitEngine.translateObject(inputObject.getAttributeId()); + Equality equality = this.taskitEngine.translateObject(inputObject.getEquality()); + Object value = this.taskitEngine.getObjectFromAny(inputObject.getValue()); return new AttributeFilter(attributeId, equality, value); } @Override - protected AttributeFilterInput convertAppObject(AttributeFilter appObject) { - AttributeIdInput attributeIdInput = this.translationEngine.convertObjectAsSafeClass(appObject.getAttributeId(), + protected AttributeFilterInput translateAppObject(AttributeFilter appObject) { + AttributeIdInput attributeIdInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getAttributeId(), AttributeId.class); - EqualityInput equalityInput = this.translationEngine.convertObjectAsSafeClass(appObject.getEquality(), + EqualityInput equalityInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getEquality(), Equality.class); - Any value = this.translationEngine.getAnyFromObject(appObject.getValue()); + Any value = this.taskitEngine.getAnyFromObject(appObject.getValue()); return AttributeFilterInput.newBuilder() .setAttributeId(attributeIdInput) diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AttributeIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AttributeIdTranslationSpec.java similarity index 64% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AttributeIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AttributeIdTranslationSpec.java index 2e387cf..d4855af 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AttributeIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AttributeIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.testsupport.attributes.support.AttributeId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.attributes.input.AttributeIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class AttributeIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected AttributeId convertInputObject(AttributeIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected AttributeId translateInputObject(AttributeIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected AttributeIdInput convertAppObject(AttributeId appObject) { - return AttributeIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected AttributeIdInput translateAppObject(AttributeId appObject) { + return AttributeIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/EqualityTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/EqualityTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/EqualityTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/EqualityTranslationSpec.java index b5b15f8..b7391f5 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/EqualityTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/EqualityTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class EqualityTranslationSpec extends ProtobufTranslationSpec { @Override - protected Equality convertInputObject(EqualityInput inputObject) { + protected Equality translateInputObject(EqualityInput inputObject) { return Equality.valueOf(inputObject.name()); } @Override - protected EqualityInput convertAppObject(Equality appObject) { + protected EqualityInput translateAppObject(Equality appObject) { return EqualityInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/FalseFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/FalseFilterTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/FalseFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/FalseFilterTranslationSpec.java index bf9b61c..bcf2792 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/FalseFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/FalseFilterTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.FalseFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FalseFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class FalseFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected FalseFilter convertInputObject(FalseFilterInput inputObject) { + protected FalseFilter translateInputObject(FalseFilterInput inputObject) { return new FalseFilter(); } @Override - protected FalseFilterInput convertAppObject(FalseFilter appObject) { + protected FalseFilterInput translateAppObject(FalseFilter appObject) { return FalseFilterInput.newBuilder().build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/FilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/FilterTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/FilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/FilterTranslationSpec.java index 21b3106..693713e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/FilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/FilterTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between {@linkplain FilterInput} @@ -11,13 +11,13 @@ public class FilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected Filter convertInputObject(FilterInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getFilter()); + protected Filter translateInputObject(FilterInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getFilter()); } @Override - protected FilterInput convertAppObject(Filter appObject) { - return FilterInput.newBuilder().setFilter(this.translationEngine.getAnyFromObject(appObject)).build(); + protected FilterInput translateAppObject(Filter appObject) { + return FilterInput.newBuilder().setFilter(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/LabelerTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/LabelerTranslationSpec.java similarity index 62% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/LabelerTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/LabelerTranslationSpec.java index 7434869..b0cc8e5 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/LabelerTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/LabelerTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Labeler; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.LabelerInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between {@linkplain LabelerInput} @@ -11,13 +11,13 @@ public class LabelerTranslationSpec extends ProtobufTranslationSpec { @Override - protected Labeler convertInputObject(LabelerInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getLabeler()); + protected Labeler translateInputObject(LabelerInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getLabeler()); } @Override - protected LabelerInput convertAppObject(Labeler appObject) { - return LabelerInput.newBuilder().setLabeler(this.translationEngine.getAnyFromObject(appObject)).build(); + protected LabelerInput translateAppObject(Labeler appObject) { + return LabelerInput.newBuilder().setLabeler(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/NotFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/NotFilterTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/NotFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/NotFilterTranslationSpec.java index bf3b288..007497c 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/NotFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/NotFilterTranslationSpec.java @@ -1,10 +1,10 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.NotFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.NotFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,13 +13,13 @@ public class NotFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected NotFilter convertInputObject(NotFilterInput inputObject) { - return new NotFilter(this.translationEngine.convertObject(inputObject.getA())); + protected NotFilter translateInputObject(NotFilterInput inputObject) { + return new NotFilter(this.taskitEngine.translateObject(inputObject.getA())); } @Override - protected NotFilterInput convertAppObject(NotFilter appObject) { - FilterInput a = this.translationEngine.convertObjectAsSafeClass(appObject.getSubFilter(), Filter.class); + protected NotFilterInput translateAppObject(NotFilter appObject) { + FilterInput a = this.taskitEngine.translateObjectAsClassSafe(appObject.getSubFilter(), Filter.class); return NotFilterInput.newBuilder().setA(a).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/OrFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/OrFilterTranslationSpec.java similarity index 61% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/OrFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/OrFilterTranslationSpec.java index a90b0e8..1ea6684 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/OrFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/OrFilterTranslationSpec.java @@ -1,10 +1,10 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.OrFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.OrFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,15 +13,15 @@ public class OrFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected OrFilter convertInputObject(OrFilterInput inputObject) { - return new OrFilter(this.translationEngine.convertObject(inputObject.getA()), - this.translationEngine.convertObject(inputObject.getB())); + protected OrFilter translateInputObject(OrFilterInput inputObject) { + return new OrFilter(this.taskitEngine.translateObject(inputObject.getA()), + this.taskitEngine.translateObject(inputObject.getB())); } @Override - protected OrFilterInput convertAppObject(OrFilter appObject) { - FilterInput a = this.translationEngine.convertObjectAsSafeClass(appObject.getFirstFilter(), Filter.class); - FilterInput b = this.translationEngine.convertObjectAsSafeClass(appObject.getSecondFilter(), Filter.class); + protected OrFilterInput translateAppObject(OrFilter appObject) { + FilterInput a = this.taskitEngine.translateObjectAsClassSafe(appObject.getFirstFilter(), Filter.class); + FilterInput b = this.taskitEngine.translateObjectAsClassSafe(appObject.getSecondFilter(), Filter.class); return OrFilterInput.newBuilder().setA(a).setB(b).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/PartitionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/PartitionTranslationSpec.java similarity index 74% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/PartitionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/PartitionTranslationSpec.java index 96be96a..fc92061 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/PartitionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/PartitionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Labeler; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Partition; @@ -6,7 +6,7 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.LabelerInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.PartitionInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -15,19 +15,19 @@ public class PartitionTranslationSpec extends ProtobufTranslationSpec { @Override - protected Partition convertInputObject(PartitionInput inputObject) { + protected Partition translateInputObject(PartitionInput inputObject) { Partition.Builder builder = Partition.builder(); builder.setRetainPersonKeys(inputObject.getRetainPersonKeys()); if (inputObject.hasFilter()) { - Filter filter = this.translationEngine.convertObject(inputObject.getFilter()); + Filter filter = this.taskitEngine.translateObject(inputObject.getFilter()); builder.setFilter(filter); } for (LabelerInput labelerInput : inputObject.getLabelersList()) { - Labeler labeler = this.translationEngine.convertObject(labelerInput); + Labeler labeler = this.taskitEngine.translateObject(labelerInput); builder.addLabeler(labeler); } @@ -36,20 +36,20 @@ protected Partition convertInputObject(PartitionInput inputObject) { } @Override - protected PartitionInput convertAppObject(Partition appObject) { + protected PartitionInput translateAppObject(Partition appObject) { PartitionInput.Builder builder = PartitionInput.newBuilder(); builder.setRetainPersonKeys(appObject.retainPersonKeys()); if (appObject.getFilter().isPresent()) { - FilterInput filterInput = this.translationEngine.convertObjectAsSafeClass(appObject.getFilter().get(), + FilterInput filterInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getFilter().get(), Filter.class); builder.setFilter(filterInput); } for (Labeler labeler : appObject.getLabelers()) { - LabelerInput labelerInput = this.translationEngine.convertObjectAsSafeClass(labeler, Labeler.class); + LabelerInput labelerInput = this.taskitEngine.translateObjectAsClassSafe(labeler, Labeler.class); builder.addLabelers(labelerInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/PartitionsPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/PartitionsPluginDataTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/PartitionsPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/PartitionsPluginDataTranslationSpec.java index c28d5b7..04f4f92 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/PartitionsPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/PartitionsPluginDataTranslationSpec.java @@ -1,9 +1,9 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.datamanagers.PartitionsPluginData; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.data.input.PartitionsPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -14,9 +14,9 @@ public class PartitionsPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected PartitionsPluginData convertInputObject(PartitionsPluginDataInput inputObject) { + protected PartitionsPluginData translateInputObject(PartitionsPluginDataInput inputObject) { if (!PartitionsPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } PartitionsPluginData.Builder builder = PartitionsPluginData.builder(); @@ -27,7 +27,7 @@ protected PartitionsPluginData convertInputObject(PartitionsPluginDataInput inpu } @Override - protected PartitionsPluginDataInput convertAppObject(PartitionsPluginData appObject) { + protected PartitionsPluginDataInput translateAppObject(PartitionsPluginData appObject) { PartitionsPluginDataInput.Builder builder = PartitionsPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()).setSupportRunContinuity(appObject.supportsRunContinuity()); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/TestAttributeIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/TestAttributeIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/TestAttributeIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/TestAttributeIdTranslationSpec.java index 9b968f9..fd1aab6 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/TestAttributeIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/TestAttributeIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.testsupport.attributes.support.TestAttributeId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.input.TestAttributeIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TestAttributeIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestAttributeId convertInputObject(TestAttributeIdInput inputObject) { + protected TestAttributeId translateInputObject(TestAttributeIdInput inputObject) { return TestAttributeId.valueOf(inputObject.name()); } @Override - protected TestAttributeIdInput convertAppObject(TestAttributeId appObject) { + protected TestAttributeIdInput translateAppObject(TestAttributeId appObject) { return TestAttributeIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/TrueFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/TrueFilterTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/TrueFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/TrueFilterTranslationSpec.java index eb91b58..96c9c72 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/TrueFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/TrueFilterTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.TrueFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.TrueFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TrueFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected TrueFilter convertInputObject(TrueFilterInput inputObject) { + protected TrueFilter translateInputObject(TrueFilterInput inputObject) { return new TrueFilter(); } @Override - protected TrueFilterInput convertAppObject(TrueFilter appObject) { + protected TrueFilterInput translateAppObject(TrueFilter appObject) { return TrueFilterInput.newBuilder().build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/PeopleTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/PeopleTranslator.java deleted file mode 100644 index cd3a766..0000000 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/PeopleTranslator.java +++ /dev/null @@ -1,61 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people; - -import java.util.ArrayList; -import java.util.List; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.support.input.PersonIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs.PeoplePluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs.PersonIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs.PersonRangeTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; - -/** - * Translator for the People Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the PeoplePlugin - */ -public class PeopleTranslator { - - private PeopleTranslator() { - } - - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); - - list.add(new PeoplePluginDataTranslationSpec()); - list.add(new PersonIdTranslationSpec()); - list.add(new PersonRangeTranslationSpec()); - - return list; - } - - /** - * Returns a Translator Builder that already includes the necessary - * TranslationSpecs needed to read and write the PeoplePlugin - */ - private static Translator.Builder builder() { - return Translator.builder() - .setTranslatorId(PeopleTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); - - translationEngineBuilder.addTranslationSpec(new PeoplePluginDataTranslationSpec()) - .addTranslationSpec(new PersonIdTranslationSpec()) - .addTranslationSpec(new PersonRangeTranslationSpec()); - - translationEngineBuilder - .addFieldToIncludeDefaultValue(PersonIdInput.getDescriptor().findFieldByName("id")); - }); - - } - - /** - * Returns a Translator that includes TranslationSpecs for the - * PeoplePlugin. - */ - public static Translator getTranslator() { - return builder().build(); - } -} diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/PeopleTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/PeopleTranslator.java new file mode 100644 index 0000000..7f971a0 --- /dev/null +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/PeopleTranslator.java @@ -0,0 +1,63 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation; + +import java.util.ArrayList; +import java.util.List; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.support.input.PersonIdInput; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs.PeoplePluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs.PersonIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs.PersonRangeTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; + +/** + * Translator for the People Plugin. Using this Translator will add all the + * necessary TranslationSpecs needed to read and write the PeoplePlugin + */ +public class PeopleTranslator { + + private PeopleTranslator() { + } + + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); + + list.add(new PeoplePluginDataTranslationSpec()); + list.add(new PersonIdTranslationSpec()); + list.add(new PersonRangeTranslationSpec()); + + return list; + } + + /** + * Returns a Translator Builder that already includes the necessary + * TranslationSpecs needed to read and write the PeoplePlugin + */ + private static Translator.Builder builder() { + return Translator.builder() + .setTranslatorId(PeopleTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); + + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); + } + + if (taskitEngineBuilder instanceof ProtobufJsonTaskitEngine.Builder) { + ((ProtobufJsonTaskitEngine.Builder) taskitEngineBuilder) + .addFieldToIncludeDefaultValue(PersonIdInput.getDescriptor().findFieldByName("id")); + } + }); + + } + + /** + * Returns a Translator that includes TranslationSpecs for the PeoplePlugin. + */ + public static Translator getTranslator() { + return builder().build(); + } +} diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/PeopleTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/PeopleTranslatorId.java similarity index 64% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/PeopleTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/PeopleTranslatorId.java index 8499382..afe88cb 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/PeopleTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/PeopleTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the People Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PeoplePluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PeoplePluginDataTranslationSpec.java similarity index 75% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PeoplePluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PeoplePluginDataTranslationSpec.java index 0288f55..95f32d3 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PeoplePluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PeoplePluginDataTranslationSpec.java @@ -1,11 +1,11 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.datamanagers.PeoplePluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonRange; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.data.input.PeoplePluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.support.input.PersonRangeInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -15,15 +15,15 @@ public class PeoplePluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected PeoplePluginData convertInputObject(PeoplePluginDataInput inputObject) { + protected PeoplePluginData translateInputObject(PeoplePluginDataInput inputObject) { if (!PeoplePluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } PeoplePluginData.Builder builder = PeoplePluginData.builder(); for (PersonRangeInput personRangeInput : inputObject.getPersonRangesList()) { - PersonRange personRange = this.translationEngine.convertObject(personRangeInput); + PersonRange personRange = this.taskitEngine.translateObject(personRangeInput); builder.addPersonRange(personRange); } @@ -35,13 +35,13 @@ protected PeoplePluginData convertInputObject(PeoplePluginDataInput inputObject) } @Override - protected PeoplePluginDataInput convertAppObject(PeoplePluginData appObject) { + protected PeoplePluginDataInput translateAppObject(PeoplePluginData appObject) { PeoplePluginDataInput.Builder builder = PeoplePluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); for (PersonRange personRange : appObject.getPersonRanges()) { - PersonRangeInput personRangeInput = this.translationEngine.convertObject(personRange); + PersonRangeInput personRangeInput = this.taskitEngine.translateObject(personRange); builder.addPersonRanges(personRangeInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PersonIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PersonIdTranslationSpec.java similarity index 78% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PersonIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PersonIdTranslationSpec.java index 81fc366..c339a98 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PersonIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PersonIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.support.input.PersonIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class PersonIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonId convertInputObject(PersonIdInput inputObject) { + protected PersonId translateInputObject(PersonIdInput inputObject) { return new PersonId(inputObject.getId()); } @Override - protected PersonIdInput convertAppObject(PersonId appObject) { + protected PersonIdInput translateAppObject(PersonId appObject) { return PersonIdInput.newBuilder().setId(appObject.getValue()).build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PersonRangeTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PersonRangeTranslationSpec.java similarity index 80% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PersonRangeTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PersonRangeTranslationSpec.java index 2680a8b..89b8388 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/PersonRangeTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/PersonRangeTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonRange; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.support.input.PersonRangeInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class PersonRangeTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonRange convertInputObject(PersonRangeInput inputObject) { + protected PersonRange translateInputObject(PersonRangeInput inputObject) { return new PersonRange(inputObject.getLowPersonId(), inputObject.getHighPersonId()); } @Override - protected PersonRangeInput convertAppObject(PersonRange appObject) { + protected PersonRangeInput translateAppObject(PersonRange appObject) { return PersonRangeInput.newBuilder() .setLowPersonId(appObject.getLowPersonId()) .setHighPersonId(appObject.getHighPersonId()) diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/PersonPropertiesTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/PersonPropertiesTranslator.java similarity index 53% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/PersonPropertiesTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/PersonPropertiesTranslator.java index d29b84f..94ea3eb 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/PersonPropertiesTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/PersonPropertiesTranslator.java @@ -1,26 +1,27 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation; import java.util.ArrayList; import java.util.List; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyValueInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs.PersonPropertiesPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs.PersonPropertyDimensionTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs.PersonPropertyFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs.PersonPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs.PersonPropertyInteractionReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs.PersonPropertyReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs.TestPersonPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs.PersonPropertiesPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs.PersonPropertyDimensionTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs.PersonPropertyFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs.PersonPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs.PersonPropertyInteractionReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs.PersonPropertyReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs.TestPersonPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the PersonProperties Plugin. Using this Translator will add - * all the necessary TanslationSpecs needed to read and write the + * all the necessary TranslationSpecs needed to read and write the * PersonPropertiesPluginData */ public class PersonPropertiesTranslator { @@ -28,8 +29,8 @@ public class PersonPropertiesTranslator { private PersonPropertiesTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new PersonPropertiesPluginDataTranslationSpec()); list.add(new PersonPropertyDimensionTranslationSpec()); @@ -53,15 +54,17 @@ private static Translator.Builder builder() { .addDependency(PeopleTranslatorId.TRANSLATOR_ID) .addDependency(ReportsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } - translationEngineBuilder.addFieldToIncludeDefaultValue( - PersonPropertyValueInput.getDescriptor().findFieldByName("pId")); + if (taskitEngineBuilder instanceof ProtobufJsonTaskitEngine.Builder) { + ((ProtobufJsonTaskitEngine.Builder) taskitEngineBuilder).addFieldToIncludeDefaultValue( + PersonPropertyValueInput.getDescriptor().findFieldByName("pId")); + } }); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/PersonPropertiesTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/PersonPropertiesTranslatorId.java similarity index 81% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/PersonPropertiesTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/PersonPropertiesTranslatorId.java index 233eb38..47e1c2f 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/PersonPropertiesTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/PersonPropertiesTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the PersonProperties Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertiesPluginDataTranslationSpec.java similarity index 84% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertiesPluginDataTranslationSpec.java index cfadeb4..942010b 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertiesPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertiesPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import java.util.LinkedHashMap; import java.util.List; @@ -18,8 +18,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyValueMapInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionMapInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -31,9 +31,9 @@ public class PersonPropertiesPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonPropertiesPluginData convertInputObject(PersonPropertiesPluginDataInput inputObject) { + protected PersonPropertiesPluginData translateInputObject(PersonPropertiesPluginDataInput inputObject) { if (!PersonPropertiesPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } PersonPropertiesPluginData.Builder builder = PersonPropertiesPluginData.builder(); @@ -41,12 +41,12 @@ protected PersonPropertiesPluginData convertInputObject(PersonPropertiesPluginDa Map personPropIdMap = new LinkedHashMap<>(); for (PropertyDefinitionMapInput propertyDefinitionMapInput : inputObject.getPersonPropertyDefinitionsList()) { - PersonPropertyId propertyId = this.translationEngine + PersonPropertyId propertyId = this.taskitEngine .getObjectFromAny(propertyDefinitionMapInput.getPropertyId()); personPropIdMap.put(propertyDefinitionMapInput.getPropertyId(), propertyId); - PropertyDefinition propertyDefinition = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyDefinition()); + PropertyDefinition propertyDefinition = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyDefinition()); builder.definePersonProperty(propertyId, propertyDefinition, propertyDefinitionMapInput.getPropertyDefinitionTime(), @@ -60,7 +60,7 @@ protected PersonPropertiesPluginData convertInputObject(PersonPropertiesPluginDa .getPropertyValuesList()) { for (int pId : personPropertyValueInput.getPIdList()) { builder.setPersonPropertyValue(new PersonId(pId), propertyId, - this.translationEngine.getObjectFromAny(personPropertyValueInput.getValue())); + this.taskitEngine.getObjectFromAny(personPropertyValueInput.getValue())); } } } @@ -81,7 +81,7 @@ protected PersonPropertiesPluginData convertInputObject(PersonPropertiesPluginDa } @Override - protected PersonPropertiesPluginDataInput convertAppObject(PersonPropertiesPluginData appObject) { + protected PersonPropertiesPluginDataInput translateAppObject(PersonPropertiesPluginData appObject) { PersonPropertiesPluginDataInput.Builder builder = PersonPropertiesPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); @@ -96,13 +96,13 @@ protected PersonPropertiesPluginDataInput convertAppObject(PersonPropertiesPlugi for (PersonPropertyId personPropertyId : personPropertyDefinitions.keySet()) { PropertyDefinition propertyDefinition = appObject.getPersonPropertyDefinition(personPropertyId); - PropertyDefinitionInput propertyDefinitionInput = this.translationEngine.convertObject(propertyDefinition); + PropertyDefinitionInput propertyDefinitionInput = this.taskitEngine.translateObject(propertyDefinition); double propertyDefinitionTime = personPropertyDefinitionTimes.get(personPropertyId); boolean propertyTrackingPolicy = personPropertyTimeTrackingPolicies.get(personPropertyId); PropertyDefinitionMapInput propertyDefinitionMapInput = PropertyDefinitionMapInput.newBuilder() .setPropertyDefinition(propertyDefinitionInput) - .setPropertyId(this.translationEngine.getAnyFromObject(personPropertyId)) + .setPropertyId(this.taskitEngine.getAnyFromObject(personPropertyId)) .setPropertyDefinitionTime(propertyDefinitionTime) .setPropertyTrackingPolicy(propertyTrackingPolicy) .build(); @@ -123,7 +123,7 @@ protected PersonPropertiesPluginDataInput convertAppObject(PersonPropertiesPlugi if (personPropertyValueInputBuilder == null) { personPropertyValueInputBuilder = PersonPropertyValueInput.newBuilder() - .setValue(this.translationEngine.getAnyFromObject(propertyValues.get(i))); + .setValue(this.taskitEngine.getAnyFromObject(propertyValues.get(i))); personPropertyInputBuildersMap.put(propertyValues.get(i), personPropertyValueInputBuilder); } @@ -133,14 +133,14 @@ protected PersonPropertiesPluginDataInput convertAppObject(PersonPropertiesPlugi } PersonPropertyValueMapInput.Builder valueMapInputBuilder = PersonPropertyValueMapInput.newBuilder() - .setPersonPropertyId((PersonPropertyIdInput) this.translationEngine - .convertObjectAsSafeClass(personPropertyId, PersonPropertyId.class)); + .setPersonPropertyId((PersonPropertyIdInput) this.taskitEngine + .translateObjectAsClassSafe(personPropertyId, PersonPropertyId.class)); for (PersonPropertyValueInput.Builder personPropertyValueInputBuilder : personPropertyInputBuildersMap .values()) { - if (personPropertyValueInputBuilder != null) { - valueMapInputBuilder.addPropertyValues(personPropertyValueInputBuilder.build()); - } + + valueMapInputBuilder.addPropertyValues(personPropertyValueInputBuilder.build()); + } builder.addPersonPropertyValues(valueMapInputBuilder.build()); @@ -171,14 +171,14 @@ protected PersonPropertiesPluginDataInput convertAppObject(PersonPropertiesPlugi } PersonPropertyTimeMapInput.Builder timeMapInputBuilder = PersonPropertyTimeMapInput.newBuilder() - .setPersonPropertyId((PersonPropertyIdInput) this.translationEngine - .convertObjectAsSafeClass(personPropertyId, PersonPropertyId.class)); + .setPersonPropertyId((PersonPropertyIdInput) this.taskitEngine + .translateObjectAsClassSafe(personPropertyId, PersonPropertyId.class)); for (PersonPropertyTimeInput.Builder personPropertyTimeInputBuilder : personPropertyInputBuildersMap .values()) { - if (personPropertyTimeInputBuilder != null) { - timeMapInputBuilder.addPropertyTimes(personPropertyTimeInputBuilder.build()); - } + + timeMapInputBuilder.addPropertyTimes(personPropertyTimeInputBuilder.build()); + } builder.addPersonPropertyTimes(timeMapInputBuilder.build()); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyDimensionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyDimensionTranslationSpec.java similarity index 68% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyDimensionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyDimensionTranslationSpec.java index ffb4355..b19248d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyDimensionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import com.google.protobuf.Any; @@ -6,21 +6,21 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyDimensionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class PersonPropertyDimensionTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonPropertyDimension convertInputObject(PersonPropertyDimensionInput inputObject) { + protected PersonPropertyDimension translateInputObject(PersonPropertyDimensionInput inputObject) { PersonPropertyDimension.Builder builder = PersonPropertyDimension.builder(); - PersonPropertyId personPropertyId = this.translationEngine.convertObject(inputObject.getPersonPropertyId()); + PersonPropertyId personPropertyId = this.taskitEngine.translateObject(inputObject.getPersonPropertyId()); builder.setPersonPropertyId(personPropertyId).setTrackTimes(inputObject.getTrackTimes()); for (Any anyValue : inputObject.getValuesList()) { - Object value = this.translationEngine.getObjectFromAny(anyValue); + Object value = this.taskitEngine.getObjectFromAny(anyValue); builder.addValue(value); } @@ -28,16 +28,16 @@ protected PersonPropertyDimension convertInputObject(PersonPropertyDimensionInpu } @Override - protected PersonPropertyDimensionInput convertAppObject(PersonPropertyDimension appObject) { + protected PersonPropertyDimensionInput translateAppObject(PersonPropertyDimension appObject) { PersonPropertyDimensionInput.Builder builder = PersonPropertyDimensionInput.newBuilder(); - PersonPropertyIdInput personPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(appObject.getPersonPropertyId(), PersonPropertyId.class); + PersonPropertyIdInput personPropertyIdInput = this.taskitEngine + .translateObjectAsClassSafe(appObject.getPersonPropertyId(), PersonPropertyId.class); builder.setPersonPropertyId(personPropertyIdInput).setTrackTimes(appObject.getTrackTimes()); for (Object objValue : appObject.getValues()) { - builder.addValues(this.translationEngine.getAnyFromObject(objValue)); + builder.addValues(this.taskitEngine.getAnyFromObject(objValue)); } return builder.build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyFilterTranslationSpec.java similarity index 59% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyFilterTranslationSpec.java index 7d52db2..209047b 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import com.google.protobuf.Any; @@ -8,27 +8,27 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class PersonPropertyFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonPropertyFilter convertInputObject(PersonPropertyFilterInput inputObject) { - PersonPropertyId personPropertyId = this.translationEngine.convertObject(inputObject.getPersonPropertyId()); - Equality equality = this.translationEngine.convertObject(inputObject.getEquality()); - Object personPropertyValue = this.translationEngine.getObjectFromAny(inputObject.getPersonPropertyValue()); + protected PersonPropertyFilter translateInputObject(PersonPropertyFilterInput inputObject) { + PersonPropertyId personPropertyId = this.taskitEngine.translateObject(inputObject.getPersonPropertyId()); + Equality equality = this.taskitEngine.translateObject(inputObject.getEquality()); + Object personPropertyValue = this.taskitEngine.getObjectFromAny(inputObject.getPersonPropertyValue()); return new PersonPropertyFilter(personPropertyId, equality, personPropertyValue); } @Override - protected PersonPropertyFilterInput convertAppObject(PersonPropertyFilter appObject) { - PersonPropertyIdInput personPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(appObject.getPersonPropertyId(), PersonPropertyId.class); - EqualityInput equalityInput = this.translationEngine.convertObjectAsSafeClass(appObject.getEquality(), + protected PersonPropertyFilterInput translateAppObject(PersonPropertyFilter appObject) { + PersonPropertyIdInput personPropertyIdInput = this.taskitEngine + .translateObjectAsClassSafe(appObject.getPersonPropertyId(), PersonPropertyId.class); + EqualityInput equalityInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getEquality(), Equality.class); - Any personPropertyValue = this.translationEngine.getAnyFromObject(appObject.getPersonPropertyValue()); + Any personPropertyValue = this.taskitEngine.getAnyFromObject(appObject.getPersonPropertyValue()); return PersonPropertyFilterInput.newBuilder() .setPersonPropertyId(personPropertyIdInput) diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyIdTranslationSpec.java index 4d6a8ac..eaa5d30 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class PersonPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonPropertyId convertInputObject(PersonPropertyIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected PersonPropertyId translateInputObject(PersonPropertyIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected PersonPropertyIdInput convertAppObject(PersonPropertyId appObject) { - return PersonPropertyIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected PersonPropertyIdInput translateAppObject(PersonPropertyId appObject) { + return PersonPropertyIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyInteractionReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyInteractionReportPluginDataTranslationSpec.java similarity index 73% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyInteractionReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyInteractionReportPluginDataTranslationSpec.java index a311804..300419c 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyInteractionReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyInteractionReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.reports.PersonPropertyInteractionReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.support.PersonPropertyId; @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportPeriodInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -21,22 +21,22 @@ public class PersonPropertyInteractionReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonPropertyInteractionReportPluginData convertInputObject( + protected PersonPropertyInteractionReportPluginData translateInputObject( PersonPropertyInteractionReportPluginDataInput inputObject) { if (!PersonPropertyInteractionReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } PersonPropertyInteractionReportPluginData.Builder builder = PersonPropertyInteractionReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); - ReportPeriod reportPeriod = this.translationEngine.convertObject(inputObject.getReportPeriod()); + ReportPeriod reportPeriod = this.taskitEngine.translateObject(inputObject.getReportPeriod()); builder.setReportPeriod(reportPeriod); for (PersonPropertyIdInput personPropertyIdInput : inputObject.getPersonPropertyIdsList()) { - PersonPropertyId personPropertyId = this.translationEngine.convertObject(personPropertyIdInput); + PersonPropertyId personPropertyId = this.taskitEngine.translateObject(personPropertyIdInput); builder.addPersonPropertyId(personPropertyId); } @@ -44,22 +44,22 @@ protected PersonPropertyInteractionReportPluginData convertInputObject( } @Override - protected PersonPropertyInteractionReportPluginDataInput convertAppObject( + protected PersonPropertyInteractionReportPluginDataInput translateAppObject( PersonPropertyInteractionReportPluginData appObject) { PersonPropertyInteractionReportPluginDataInput.Builder builder = PersonPropertyInteractionReportPluginDataInput .newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); - ReportPeriodInput reportPeriodInput = this.translationEngine.convertObject(appObject.getReportPeriod()); + ReportPeriodInput reportPeriodInput = this.taskitEngine.translateObject(appObject.getReportPeriod()); builder.setReportLabel(reportLabelInput).setReportPeriod(reportPeriodInput); for (PersonPropertyId personPropertyId : appObject.getPersonPropertyIds()) { - PersonPropertyIdInput personPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(personPropertyId, PersonPropertyId.class); + PersonPropertyIdInput personPropertyIdInput = this.taskitEngine.translateObjectAsClassSafe(personPropertyId, + PersonPropertyId.class); builder.addPersonPropertyIds(personPropertyIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyReportPluginDataTranslationSpec.java similarity index 70% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyReportPluginDataTranslationSpec.java index 309d0bb..ce40f04 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/PersonPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/PersonPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.reports.PersonPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.support.PersonPropertyId; @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportPeriodInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -21,28 +21,28 @@ public class PersonPropertyReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonPropertyReportPluginData convertInputObject(PersonPropertyReportPluginDataInput inputObject) { + protected PersonPropertyReportPluginData translateInputObject(PersonPropertyReportPluginDataInput inputObject) { if (!PersonPropertyReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } PersonPropertyReportPluginData.Builder builder = PersonPropertyReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); - ReportPeriod reportPeriod = this.translationEngine.convertObject(inputObject.getReportPeriod()); + ReportPeriod reportPeriod = this.taskitEngine.translateObject(inputObject.getReportPeriod()); builder.setReportPeriod(reportPeriod); builder.setDefaultInclusion(inputObject.getDefaultInclusionPolicy()); for (PersonPropertyIdInput personPropertyIdInput : inputObject.getIncludedPropertiesList()) { - PersonPropertyId personPropertyId = this.translationEngine.convertObject(personPropertyIdInput); + PersonPropertyId personPropertyId = this.taskitEngine.translateObject(personPropertyIdInput); builder.includePersonProperty(personPropertyId); } for (PersonPropertyIdInput personPropertyIdInput : inputObject.getExcludedPropertiesList()) { - PersonPropertyId personPropertyId = this.translationEngine.convertObject(personPropertyIdInput); + PersonPropertyId personPropertyId = this.taskitEngine.translateObject(personPropertyIdInput); builder.excludePersonProperty(personPropertyId); } @@ -50,28 +50,28 @@ protected PersonPropertyReportPluginData convertInputObject(PersonPropertyReport } @Override - protected PersonPropertyReportPluginDataInput convertAppObject(PersonPropertyReportPluginData appObject) { + protected PersonPropertyReportPluginDataInput translateAppObject(PersonPropertyReportPluginData appObject) { PersonPropertyReportPluginDataInput.Builder builder = PersonPropertyReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); - ReportPeriodInput reportPeriodInput = this.translationEngine.convertObject(appObject.getReportPeriod()); + ReportPeriodInput reportPeriodInput = this.taskitEngine.translateObject(appObject.getReportPeriod()); builder.setDefaultInclusionPolicy(appObject.getDefaultInclusionPolicy()) .setReportLabel(reportLabelInput) .setReportPeriod(reportPeriodInput); for (PersonPropertyId personPropertyId : appObject.getIncludedProperties()) { - PersonPropertyIdInput personPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(personPropertyId, PersonPropertyId.class); + PersonPropertyIdInput personPropertyIdInput = this.taskitEngine.translateObjectAsClassSafe(personPropertyId, + PersonPropertyId.class); builder.addIncludedProperties(personPropertyIdInput); } for (PersonPropertyId personPropertyId : appObject.getExcludedProperties()) { - PersonPropertyIdInput personPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(personPropertyId, PersonPropertyId.class); + PersonPropertyIdInput personPropertyIdInput = this.taskitEngine.translateObjectAsClassSafe(personPropertyId, + PersonPropertyId.class); builder.addExcludedProperties(personPropertyIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/TestPersonPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/TestPersonPropertyIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/TestPersonPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/TestPersonPropertyIdTranslationSpec.java index b4e5373..c7fc799 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/TestPersonPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/TestPersonPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.testsupport.TestPersonPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.testsupport.input.TestPersonPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,12 +12,12 @@ public class TestPersonPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestPersonPropertyId convertInputObject(TestPersonPropertyIdInput inputObject) { + protected TestPersonPropertyId translateInputObject(TestPersonPropertyIdInput inputObject) { return TestPersonPropertyId.valueOf(inputObject.name()); } @Override - protected TestPersonPropertyIdInput convertAppObject(TestPersonPropertyId appObject) { + protected TestPersonPropertyIdInput translateAppObject(TestPersonPropertyId appObject) { return TestPersonPropertyIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/PropertiesTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/PropertiesTranslator.java similarity index 51% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/PropertiesTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/PropertiesTranslator.java index 1ec35ae..7eddfa6 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/PropertiesTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/PropertiesTranslator.java @@ -1,24 +1,24 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation; import java.util.ArrayList; import java.util.List; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translationSpecs.PropertyDefinitionTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.specs.PropertyDefinitionTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the Properties Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the PropertiesPlugin + * necessary TranslationSpecs needed to read and write the PropertiesPlugin */ public class PropertiesTranslator { private PropertiesTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new PropertyDefinitionTranslationSpec()); @@ -33,11 +33,11 @@ private static Translator.Builder builder() { Translator.Builder builder = Translator.builder() .setTranslatorId(PropertiesTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } }); @@ -45,8 +45,7 @@ private static Translator.Builder builder() { } /** - * Returns a Translator that includes TranslationSpecs for the - * PropertiesPlugin. + * Returns a Translator that includes TranslationSpecs for the PropertiesPlugin. */ public static Translator getTranslator() { return builder().build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/PropertiesTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/PropertiesTranslatorId.java similarity index 65% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/PropertiesTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/PropertiesTranslatorId.java index f39e39e..9a9f133 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/PropertiesTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/PropertiesTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Properties Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translationSpecs/PropertyDefinitionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/specs/PropertyDefinitionTranslationSpec.java similarity index 78% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translationSpecs/PropertyDefinitionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/specs/PropertyDefinitionTranslationSpec.java index a87d559..e5637be 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translationSpecs/PropertyDefinitionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/specs/PropertyDefinitionTranslationSpec.java @@ -1,10 +1,10 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.specs; import com.google.protobuf.Any; import gov.hhs.aspr.ms.gcm.simulation.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -14,13 +14,13 @@ public class PropertyDefinitionTranslationSpec extends ProtobufTranslationSpec { @Override - protected PropertyDefinition convertInputObject(PropertyDefinitionInput inputObject) { + protected PropertyDefinition translateInputObject(PropertyDefinitionInput inputObject) { PropertyDefinition.Builder builder = PropertyDefinition.builder(); builder.setPropertyValueMutability(inputObject.getPropertyValuesAreMutable()); if (inputObject.hasDefaultValue()) { - Object defaultValue = this.translationEngine.convertObject(inputObject.getDefaultValue()); + Object defaultValue = this.taskitEngine.translateObject(inputObject.getDefaultValue()); builder.setDefaultValue(defaultValue); builder.setType(defaultValue.getClass()); } else { @@ -38,11 +38,11 @@ protected PropertyDefinition convertInputObject(PropertyDefinitionInput inputObj } @Override - protected PropertyDefinitionInput convertAppObject(PropertyDefinition appObject) { + protected PropertyDefinitionInput translateAppObject(PropertyDefinition appObject) { PropertyDefinitionInput.Builder builder = PropertyDefinitionInput.newBuilder(); if (appObject.getDefaultValue().isPresent()) { - builder.setDefaultValue((Any) this.translationEngine - .convertObjectAsUnsafeClass(appObject.getDefaultValue().get(), Any.class)); + builder.setDefaultValue( + (Any) this.taskitEngine.translateObjectAsClassUnsafe(appObject.getDefaultValue().get(), Any.class)); } else { builder.setType(appObject.getType().getName()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/RegionsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/RegionsTranslator.java similarity index 54% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/RegionsTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/RegionsTranslator.java index f0e7ecc..d3cef57 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/RegionsTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/RegionsTranslator.java @@ -1,38 +1,39 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation; import java.util.ArrayList; import java.util.List; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionMembershipInput.RegionPersonInfo; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.RegionFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.RegionIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.RegionPropertyDimensionTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.RegionPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.RegionPropertyReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.RegionTransferReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.RegionsPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.SimpleRegionIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.SimpleRegionPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.TestRegionIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs.TestRegionPropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.RegionFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.RegionIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.RegionPropertyDimensionTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.RegionPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.RegionPropertyReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.RegionTransferReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.RegionsPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.SimpleRegionIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.SimpleRegionPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.TestRegionIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs.TestRegionPropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the Regions Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the RegionsPlugin + * necessary TranslationSpecs needed to read and write the RegionsPlugin */ public class RegionsTranslator { private RegionsTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new RegionFilterTranslationSpec()); list.add(new RegionIdTranslationSpec()); @@ -60,15 +61,17 @@ private static Translator.Builder builder() { .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) .addDependency(ReportsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } - translationEngineBuilder.addFieldToIncludeDefaultValue( - RegionPersonInfo.getDescriptor().findFieldByName("personId")); + if (taskitEngineBuilder instanceof ProtobufJsonTaskitEngine.Builder) { + ((ProtobufJsonTaskitEngine.Builder) taskitEngineBuilder).addFieldToIncludeDefaultValue( + RegionPersonInfo.getDescriptor().findFieldByName("personId")); + } }); @@ -76,8 +79,7 @@ private static Translator.Builder builder() { } /** - * Returns a Translator that includes TranslationSpecs for the - * RegionsPlugin. + * Returns a Translator that includes TranslationSpecs for the RegionsPlugin. */ public static Translator getTranslator() { return builder().build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/RegionsTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/RegionsTranslatorId.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/RegionsTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/RegionsTranslatorId.java index be992b5..bf67cd8 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/RegionsTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/RegionsTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Regions Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionFilterTranslationSpec.java similarity index 76% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionFilterTranslationSpec.java index cec6756..fa6b16e 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -16,21 +16,21 @@ public class RegionFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected RegionFilter convertInputObject(RegionFilterInput inputObject) { + protected RegionFilter translateInputObject(RegionFilterInput inputObject) { List regionIds = new ArrayList<>(); for (RegionIdInput regionIdInput : inputObject.getRegionIdsList()) { - regionIds.add(this.translationEngine.convertObject(regionIdInput)); + regionIds.add(this.taskitEngine.translateObject(regionIdInput)); } return new RegionFilter(regionIds.toArray(new RegionId[0])); } @Override - protected RegionFilterInput convertAppObject(RegionFilter appObject) { + protected RegionFilterInput translateAppObject(RegionFilter appObject) { RegionFilterInput.Builder builder = RegionFilterInput.newBuilder(); for (RegionId regionId : appObject.getRegionIds()) { - RegionIdInput regionIdInput = this.translationEngine.convertObjectAsSafeClass(regionId, RegionId.class); + RegionIdInput regionIdInput = this.taskitEngine.translateObjectAsClassSafe(regionId, RegionId.class); builder.addRegionIds(regionIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionIdTranslationSpec.java index dc30d86..5283307 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class RegionIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected RegionId convertInputObject(RegionIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected RegionId translateInputObject(RegionIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected RegionIdInput convertAppObject(RegionId appObject) { - return RegionIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected RegionIdInput translateAppObject(RegionId appObject) { + return RegionIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyDimensionTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyDimensionTranslationSpec.java similarity index 64% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyDimensionTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyDimensionTranslationSpec.java index 07aba60..666c8c2 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyDimensionTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import com.google.protobuf.Any; @@ -8,21 +8,21 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionPropertyDimensionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class RegionPropertyDimensionTranslationSpec extends ProtobufTranslationSpec { @Override - protected RegionPropertyDimension convertInputObject(RegionPropertyDimensionInput inputObject) { + protected RegionPropertyDimension translateInputObject(RegionPropertyDimensionInput inputObject) { RegionPropertyDimension.Builder builder = RegionPropertyDimension.builder(); - RegionPropertyId globalPropertyId = this.translationEngine.convertObject(inputObject.getRegionPropertyId()); - RegionId groupId = this.translationEngine.convertObject(inputObject.getRegionId()); + RegionPropertyId globalPropertyId = this.taskitEngine.translateObject(inputObject.getRegionPropertyId()); + RegionId groupId = this.taskitEngine.translateObject(inputObject.getRegionId()); builder.setRegionPropertyId(globalPropertyId).setRegionId(groupId); for (Any anyValue : inputObject.getValuesList()) { - Object value = this.translationEngine.getObjectFromAny(anyValue); + Object value = this.taskitEngine.getObjectFromAny(anyValue); builder.addValue(value); } @@ -30,18 +30,18 @@ protected RegionPropertyDimension convertInputObject(RegionPropertyDimensionInpu } @Override - protected RegionPropertyDimensionInput convertAppObject(RegionPropertyDimension appObject) { + protected RegionPropertyDimensionInput translateAppObject(RegionPropertyDimension appObject) { RegionPropertyDimensionInput.Builder builder = RegionPropertyDimensionInput.newBuilder(); - RegionPropertyIdInput globalPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(appObject.getRegionPropertyId(), RegionPropertyId.class); - RegionIdInput groupIdInput = this.translationEngine.convertObjectAsSafeClass(appObject.getRegionId(), + RegionPropertyIdInput globalPropertyIdInput = this.taskitEngine + .translateObjectAsClassSafe(appObject.getRegionPropertyId(), RegionPropertyId.class); + RegionIdInput groupIdInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getRegionId(), RegionId.class); builder.setRegionPropertyId(globalPropertyIdInput).setRegionId(groupIdInput); for (Object objValue : appObject.getValues()) { - builder.addValues(this.translationEngine.getAnyFromObject(objValue)); + builder.addValues(this.taskitEngine.getAnyFromObject(objValue)); } return builder.build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyIdTranslationSpec.java index b2c4fe8..097e91d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class RegionPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected RegionPropertyId convertInputObject(RegionPropertyIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected RegionPropertyId translateInputObject(RegionPropertyIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected RegionPropertyIdInput convertAppObject(RegionPropertyId appObject) { - return RegionPropertyIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected RegionPropertyIdInput translateAppObject(RegionPropertyId appObject) { + return RegionPropertyIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyReportPluginDataTranslationSpec.java similarity index 72% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyReportPluginDataTranslationSpec.java index 83a0f41..f5f8694 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.reports.RegionPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionPropertyId; @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.reports.input.RegionPropertyReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionPropertyIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -19,25 +19,25 @@ public class RegionPropertyReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected RegionPropertyReportPluginData convertInputObject(RegionPropertyReportPluginDataInput inputObject) { + protected RegionPropertyReportPluginData translateInputObject(RegionPropertyReportPluginDataInput inputObject) { if (!RegionPropertyReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } RegionPropertyReportPluginData.Builder builder = RegionPropertyReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); builder.setDefaultInclusion(inputObject.getDefaultInclusionPolicy()); for (RegionPropertyIdInput regionPropertyIdInput : inputObject.getIncludedPropertiesList()) { - RegionPropertyId regionPropertyId = this.translationEngine.convertObject(regionPropertyIdInput); + RegionPropertyId regionPropertyId = this.taskitEngine.translateObject(regionPropertyIdInput); builder.includeRegionProperty(regionPropertyId); } for (RegionPropertyIdInput regionPropertyIdInput : inputObject.getExcludedPropertiesList()) { - RegionPropertyId regionPropertyId = this.translationEngine.convertObject(regionPropertyIdInput); + RegionPropertyId regionPropertyId = this.taskitEngine.translateObject(regionPropertyIdInput); builder.excludeRegionProperty(regionPropertyId); } @@ -45,25 +45,25 @@ protected RegionPropertyReportPluginData convertInputObject(RegionPropertyReport } @Override - protected RegionPropertyReportPluginDataInput convertAppObject(RegionPropertyReportPluginData appObject) { + protected RegionPropertyReportPluginDataInput translateAppObject(RegionPropertyReportPluginData appObject) { RegionPropertyReportPluginDataInput.Builder builder = RegionPropertyReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setDefaultInclusionPolicy(appObject.getDefaultInclusionPolicy()).setReportLabel(reportLabelInput); for (RegionPropertyId regionPropertyId : appObject.getIncludedProperties()) { - RegionPropertyIdInput regionPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(regionPropertyId, RegionPropertyId.class); + RegionPropertyIdInput regionPropertyIdInput = this.taskitEngine.translateObjectAsClassSafe(regionPropertyId, + RegionPropertyId.class); builder.addIncludedProperties(regionPropertyIdInput); } for (RegionPropertyId regionPropertyId : appObject.getExcludedProperties()) { - RegionPropertyIdInput regionPropertyIdInput = this.translationEngine - .convertObjectAsSafeClass(regionPropertyId, RegionPropertyId.class); + RegionPropertyIdInput regionPropertyIdInput = this.taskitEngine.translateObjectAsClassSafe(regionPropertyId, + RegionPropertyId.class); builder.addExcludedProperties(regionPropertyIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionTransferReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionTransferReportPluginDataTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionTransferReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionTransferReportPluginDataTranslationSpec.java index 21c0c9a..119fafd 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionTransferReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionTransferReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.reports.RegionTransferReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; @@ -6,8 +6,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.reports.input.RegionTransferReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportPeriodInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -19,15 +19,15 @@ public class RegionTransferReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected RegionTransferReportPluginData convertInputObject(RegionTransferReportPluginDataInput inputObject) { + protected RegionTransferReportPluginData translateInputObject(RegionTransferReportPluginDataInput inputObject) { if (!RegionTransferReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } RegionTransferReportPluginData.Builder builder = RegionTransferReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); - ReportPeriod reportPeriod = this.translationEngine.convertObject(inputObject.getReportPeriod()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); + ReportPeriod reportPeriod = this.taskitEngine.translateObject(inputObject.getReportPeriod()); builder.setReportLabel(reportLabel).setReportPeriod(reportPeriod); @@ -35,15 +35,15 @@ protected RegionTransferReportPluginData convertInputObject(RegionTransferReport } @Override - protected RegionTransferReportPluginDataInput convertAppObject(RegionTransferReportPluginData appObject) { + protected RegionTransferReportPluginDataInput translateAppObject(RegionTransferReportPluginData appObject) { RegionTransferReportPluginDataInput.Builder builder = RegionTransferReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); - ReportPeriodInput reportPeriodInput = this.translationEngine.convertObject(appObject.getReportPeriod()); + ReportPeriodInput reportPeriodInput = this.taskitEngine.translateObject(appObject.getReportPeriod()); builder.setReportLabel(reportLabelInput).setReportPeriod(reportPeriodInput); return builder.build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionsPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionsPluginDataTranslationSpec.java similarity index 79% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionsPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionsPluginDataTranslationSpec.java index 5aadf13..0a4e01d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/RegionsPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/RegionsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -18,8 +18,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionMembershipInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionMembershipInput.RegionPersonInfo; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionPropertyValueMapInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -30,37 +30,37 @@ public class RegionsPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected RegionsPluginData convertInputObject(RegionsPluginDataInput inputObject) { + protected RegionsPluginData translateInputObject(RegionsPluginDataInput inputObject) { if (!RegionsPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } RegionsPluginData.Builder builder = RegionsPluginData.builder(); // add regions for (RegionIdInput regionIdInput : inputObject.getRegionIdsList()) { - RegionId regionId = this.translationEngine.convertObject(regionIdInput); + RegionId regionId = this.taskitEngine.translateObject(regionIdInput); builder.addRegion(regionId); } // define regions for (PropertyDefinitionMapInput propertyDefinitionMapInput : inputObject.getRegionPropertyDefinitionsList()) { - RegionPropertyId regionPropertyId = this.translationEngine + RegionPropertyId regionPropertyId = this.taskitEngine .getObjectFromAny(propertyDefinitionMapInput.getPropertyId()); - PropertyDefinition propertyDefinition = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyDefinition()); + PropertyDefinition propertyDefinition = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyDefinition()); builder.defineRegionProperty(regionPropertyId, propertyDefinition); } // add region property values for (RegionPropertyValueMapInput regionPropertyValueMapInput : inputObject.getRegionPropertyValuesList()) { - RegionId regionId = this.translationEngine.convertObject(regionPropertyValueMapInput.getRegionId()); + RegionId regionId = this.taskitEngine.translateObject(regionPropertyValueMapInput.getRegionId()); for (PropertyValueMapInput propertyValueMapInput : regionPropertyValueMapInput.getPropertyValueMapList()) { - RegionPropertyId regionPropertyId = this.translationEngine + RegionPropertyId regionPropertyId = this.taskitEngine .getObjectFromAny(propertyValueMapInput.getPropertyId()); - Object regionPropertyValue = this.translationEngine + Object regionPropertyValue = this.taskitEngine .getObjectFromAny(propertyValueMapInput.getPropertyValue()); builder.setRegionPropertyValue(regionId, regionPropertyId, regionPropertyValue); @@ -72,7 +72,7 @@ protected RegionsPluginData convertInputObject(RegionsPluginDataInput inputObjec builder.setPersonRegionArrivalTracking(trackRegionArrivalTimes); for (RegionMembershipInput regionMembershipInput : inputObject.getPersonRegionsList()) { - RegionId regionId = this.translationEngine.convertObject(regionMembershipInput.getRegionId()); + RegionId regionId = this.taskitEngine.translateObject(regionMembershipInput.getRegionId()); for (RegionPersonInfo regionPersonInfo : regionMembershipInput.getPeopleList()) { PersonId personId = new PersonId(regionPersonInfo.getPersonId()); @@ -88,24 +88,24 @@ protected RegionsPluginData convertInputObject(RegionsPluginDataInput inputObjec } @Override - protected RegionsPluginDataInput convertAppObject(RegionsPluginData appObject) { + protected RegionsPluginDataInput translateAppObject(RegionsPluginData appObject) { RegionsPluginDataInput.Builder builder = RegionsPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); // add regions for (RegionId regionId : appObject.getRegionIds()) { - RegionIdInput regionIdInput = this.translationEngine.convertObjectAsSafeClass(regionId, RegionId.class); + RegionIdInput regionIdInput = this.taskitEngine.translateObjectAsClassSafe(regionId, RegionId.class); builder.addRegionIds(regionIdInput); } // add region property definitions for (RegionPropertyId regionPropertyId : appObject.getRegionPropertyIds()) { - PropertyDefinitionInput propertyDefinitionInput = this.translationEngine - .convertObject(appObject.getRegionPropertyDefinition(regionPropertyId)); + PropertyDefinitionInput propertyDefinitionInput = this.taskitEngine + .translateObject(appObject.getRegionPropertyDefinition(regionPropertyId)); PropertyDefinitionMapInput propertyDefinitionMapInput = PropertyDefinitionMapInput.newBuilder() - .setPropertyId(this.translationEngine.getAnyFromObject(regionPropertyId)) + .setPropertyId(this.taskitEngine.getAnyFromObject(regionPropertyId)) .setPropertyDefinition(propertyDefinitionInput) .build(); @@ -113,12 +113,12 @@ protected RegionsPluginDataInput convertAppObject(RegionsPluginData appObject) { } for (RegionId regionId : appObject.getRegionIds()) { - RegionIdInput regionIdInput = this.translationEngine.convertObjectAsSafeClass(regionId, RegionId.class); + RegionIdInput regionIdInput = this.taskitEngine.translateObjectAsClassSafe(regionId, RegionId.class); for (RegionPropertyId regionPropertyId : appObject.getRegionPropertyValues(regionId).keySet()) { PropertyValueMapInput propertyValueMapInput = PropertyValueMapInput.newBuilder() - .setPropertyId(this.translationEngine.getAnyFromObject(regionPropertyId)) - .setPropertyValue(this.translationEngine + .setPropertyId(this.taskitEngine.getAnyFromObject(regionPropertyId)) + .setPropertyValue(this.taskitEngine .getAnyFromObject(appObject.getRegionPropertyValues(regionId).get(regionPropertyId))) .build(); @@ -140,7 +140,7 @@ protected RegionsPluginDataInput convertAppObject(RegionsPluginData appObject) { PersonId personId = new PersonId(i); RegionId regionId = appObject.getPersonRegion(personId).get(); - RegionIdInput regionIdInput = this.translationEngine.convertObjectAsSafeClass(regionId, RegionId.class); + RegionIdInput regionIdInput = this.taskitEngine.translateObjectAsClassSafe(regionId, RegionId.class); List peopleInRegion = regionMembershipMap.get(regionIdInput); if (peopleInRegion == null) { diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/SimpleRegionIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/SimpleRegionIdTranslationSpec.java similarity index 65% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/SimpleRegionIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/SimpleRegionIdTranslationSpec.java index 7c20a42..ac79faa 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/SimpleRegionIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/SimpleRegionIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.SimpleRegionId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.SimpleRegionIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,14 +11,14 @@ public class SimpleRegionIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected SimpleRegionId convertInputObject(SimpleRegionIdInput inputObject) { - return new SimpleRegionId(this.translationEngine.getObjectFromAny(inputObject.getValue())); + protected SimpleRegionId translateInputObject(SimpleRegionIdInput inputObject) { + return new SimpleRegionId(this.taskitEngine.getObjectFromAny(inputObject.getValue())); } @Override - protected SimpleRegionIdInput convertAppObject(SimpleRegionId appObject) { + protected SimpleRegionIdInput translateAppObject(SimpleRegionId appObject) { return SimpleRegionIdInput.newBuilder() - .setValue(this.translationEngine.getAnyFromObject(appObject.getValue())) + .setValue(this.taskitEngine.getAnyFromObject(appObject.getValue())) .build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/SimpleRegionPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/SimpleRegionPropertyIdTranslationSpec.java similarity index 66% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/SimpleRegionPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/SimpleRegionPropertyIdTranslationSpec.java index 2fb6102..9a28876 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/SimpleRegionPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/SimpleRegionPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.SimpleRegionPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.SimpleRegionPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,14 +13,14 @@ public class SimpleRegionPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected SimpleRegionPropertyId convertInputObject(SimpleRegionPropertyIdInput inputObject) { - return new SimpleRegionPropertyId(this.translationEngine.getObjectFromAny(inputObject.getValue())); + protected SimpleRegionPropertyId translateInputObject(SimpleRegionPropertyIdInput inputObject) { + return new SimpleRegionPropertyId(this.taskitEngine.getObjectFromAny(inputObject.getValue())); } @Override - protected SimpleRegionPropertyIdInput convertAppObject(SimpleRegionPropertyId appObject) { + protected SimpleRegionPropertyIdInput translateAppObject(SimpleRegionPropertyId appObject) { return SimpleRegionPropertyIdInput.newBuilder() - .setValue(this.translationEngine.getAnyFromObject(appObject.getValue())) + .setValue(this.taskitEngine.getAnyFromObject(appObject.getValue())) .build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/TestRegionIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/TestRegionIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/TestRegionIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/TestRegionIdTranslationSpec.java index 68acad8..cdbeb69 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/TestRegionIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/TestRegionIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.testsupport.input.TestRegionIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TestRegionIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestRegionId convertInputObject(TestRegionIdInput inputObject) { + protected TestRegionId translateInputObject(TestRegionIdInput inputObject) { return TestRegionId.valueOf(inputObject.name()); } @Override - protected TestRegionIdInput convertAppObject(TestRegionId appObject) { + protected TestRegionIdInput translateAppObject(TestRegionId appObject) { return TestRegionIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/TestRegionPropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/TestRegionPropertyIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/TestRegionPropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/TestRegionPropertyIdTranslationSpec.java index 57f0a88..58c915a 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/TestRegionPropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/TestRegionPropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionPropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.testsupport.input.TestRegionPropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,12 +12,12 @@ public class TestRegionPropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestRegionPropertyId convertInputObject(TestRegionPropertyIdInput inputObject) { + protected TestRegionPropertyId translateInputObject(TestRegionPropertyIdInput inputObject) { return TestRegionPropertyId.valueOf(inputObject.name()); } @Override - protected TestRegionPropertyIdInput convertAppObject(TestRegionPropertyId appObject) { + protected TestRegionPropertyIdInput translateAppObject(TestRegionPropertyId appObject) { return TestRegionPropertyIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/ReportsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/ReportsTranslator.java deleted file mode 100644 index 3fc6a62..0000000 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/ReportsTranslator.java +++ /dev/null @@ -1,63 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports; - -import java.util.ArrayList; -import java.util.List; - -import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; -import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs.ReportLabelTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs.ReportPeriodTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs.SimpleReportLabelTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; - -/** - * Translator for the Reports Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the ReportsPlugin - */ -public class ReportsTranslator { - - private ReportsTranslator() { - } - - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); - - list.add(new ReportLabelTranslationSpec()); - list.add(new ReportPeriodTranslationSpec()); - list.add(new SimpleReportLabelTranslationSpec()); - - return list; - } - - /** - * Returns a Translator Builder that already includes the necessary - * TranslationSpecs needed to read and write the ReportsPlugin - */ - private static Translator.Builder builder() { - Translator.Builder builder = Translator.builder() - .setTranslatorId(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); - - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); - } - - translationEngineBuilder.addParentChildClassRelationship(SimpleReportLabel.class, - ReportLabel.class); - }); - - return builder; - } - - /** - * Returns a Translator that includes TranslationSpecs for the - * ReportsPlugin. - */ - public static Translator getTranslator() { - return builder().build(); - } -} diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/ReportsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/ReportsTranslator.java new file mode 100644 index 0000000..dbfeaa8 --- /dev/null +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/ReportsTranslator.java @@ -0,0 +1,58 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation; + +import java.util.ArrayList; +import java.util.List; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs.ReportLabelTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs.ReportPeriodTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs.SimpleReportLabelTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; + +/** + * Translator for the Reports Plugin. Using this Translator will add all the + * necessary TranslationSpecs needed to read and write the ReportsPlugin + */ +public class ReportsTranslator { + + private ReportsTranslator() { + } + + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); + + list.add(new ReportLabelTranslationSpec()); + list.add(new ReportPeriodTranslationSpec()); + list.add(new SimpleReportLabelTranslationSpec()); + + return list; + } + + /** + * Returns a Translator Builder that already includes the necessary + * TranslationSpecs needed to read and write the ReportsPlugin + */ + private static Translator.Builder builder() { + Translator.Builder builder = Translator.builder() + .setTranslatorId(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); + + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); + } + + }); + + return builder; + } + + /** + * Returns a Translator that includes TranslationSpecs for the ReportsPlugin. + */ + public static Translator getTranslator() { + return builder().build(); + } +} diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/ReportsTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/ReportsTranslatorId.java similarity index 64% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/ReportsTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/ReportsTranslatorId.java index 65f37fd..cee796c 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/ReportsTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/ReportsTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Reports Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/ReportLabelTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/ReportLabelTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/ReportLabelTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/ReportLabelTranslationSpec.java index c31afd2..38666ec 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/ReportLabelTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/ReportLabelTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class ReportLabelTranslationSpec extends ProtobufTranslationSpec { @Override - protected ReportLabel convertInputObject(ReportLabelInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getLabel()); + protected ReportLabel translateInputObject(ReportLabelInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getLabel()); } @Override - protected ReportLabelInput convertAppObject(ReportLabel appObject) { - return ReportLabelInput.newBuilder().setLabel(this.translationEngine.getAnyFromObject(appObject)).build(); + protected ReportLabelInput translateAppObject(ReportLabel appObject) { + return ReportLabelInput.newBuilder().setLabel(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/ReportPeriodTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/ReportPeriodTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/ReportPeriodTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/ReportPeriodTranslationSpec.java index a800e4a..fdc202c 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/ReportPeriodTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/ReportPeriodTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportPeriodInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class ReportPeriodTranslationSpec extends ProtobufTranslationSpec { @Override - protected ReportPeriod convertInputObject(ReportPeriodInput inputObject) { + protected ReportPeriod translateInputObject(ReportPeriodInput inputObject) { return ReportPeriod.valueOf(inputObject.name()); } @Override - protected ReportPeriodInput convertAppObject(ReportPeriod appObject) { + protected ReportPeriodInput translateAppObject(ReportPeriod appObject) { return ReportPeriodInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/SimpleReportLabelTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/SimpleReportLabelTranslationSpec.java similarity index 66% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/SimpleReportLabelTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/SimpleReportLabelTranslationSpec.java index 4199dcf..e453d57 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/SimpleReportLabelTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/SimpleReportLabelTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.SimpleReportLabelInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,14 +12,14 @@ public class SimpleReportLabelTranslationSpec extends ProtobufTranslationSpec { @Override - protected SimpleReportLabel convertInputObject(SimpleReportLabelInput inputObject) { - return new SimpleReportLabel(this.translationEngine.getObjectFromAny(inputObject.getValue())); + protected SimpleReportLabel translateInputObject(SimpleReportLabelInput inputObject) { + return new SimpleReportLabel(this.taskitEngine.getObjectFromAny(inputObject.getValue())); } @Override - protected SimpleReportLabelInput convertAppObject(SimpleReportLabel appObject) { + protected SimpleReportLabelInput translateAppObject(SimpleReportLabel appObject) { return SimpleReportLabelInput.newBuilder() - .setValue(this.translationEngine.getAnyFromObject(appObject.getValue())) + .setValue(this.taskitEngine.getAnyFromObject(appObject.getValue())) .build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/ResourcesTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/ResourcesTranslator.java similarity index 57% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/ResourcesTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/ResourcesTranslator.java index 21a9924..6d72b57 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/ResourcesTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/ResourcesTranslator.java @@ -1,37 +1,37 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation; import java.util.ArrayList; import java.util.List; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.PersonResourceReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.ResourceFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.ResourceIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.ResourceInitializationTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.ResourcePropertyIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.ResourcePropertyReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.ResourceReportPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.ResourcesPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.TestResourceIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs.TestResourcePropertyIdTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.PersonResourceReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.ResourceFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.ResourceIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.ResourceInitializationTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.ResourcePropertyIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.ResourcePropertyReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.ResourceReportPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.ResourcesPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.TestResourceIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs.TestResourcePropertyIdTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the Resources Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the ResourcesPlugin + * necessary TranslationSpecs needed to read and write the ResourcesPlugin */ public class ResourcesTranslator { private ResourcesTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new PersonResourceReportPluginDataTranslationSpec()); list.add(new ResourceFilterTranslationSpec()); @@ -59,11 +59,11 @@ private static Translator.Builder builder() { .addDependency(RegionsTranslatorId.TRANSLATOR_ID) .addDependency(ReportsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } }); @@ -72,8 +72,7 @@ private static Translator.Builder builder() { } /** - * Returns a Translator that includes TranslationSpecs for the - * ResourcesPlugin. + * Returns a Translator that includes TranslationSpecs for the ResourcesPlugin. */ public static Translator getTranslator() { return builder().build(); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/ResourcesTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/ResourcesTranslatorId.java similarity index 64% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/ResourcesTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/ResourcesTranslatorId.java index c07d09d..69d1ee6 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/ResourcesTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/ResourcesTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Regions Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/PersonResourceReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/PersonResourceReportPluginDataTranslationSpec.java similarity index 70% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/PersonResourceReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/PersonResourceReportPluginDataTranslationSpec.java index a7d0397..52fd559 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/PersonResourceReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/PersonResourceReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportPeriodInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.PersonResourceReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceIdInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -21,27 +21,27 @@ public class PersonResourceReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected PersonResourceReportPluginData convertInputObject(PersonResourceReportPluginDataInput inputObject) { + protected PersonResourceReportPluginData translateInputObject(PersonResourceReportPluginDataInput inputObject) { if (!PersonResourceReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } PersonResourceReportPluginData.Builder builder = PersonResourceReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); - ReportPeriod reportPeriod = this.translationEngine.convertObject(inputObject.getReportPeriod()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); + ReportPeriod reportPeriod = this.taskitEngine.translateObject(inputObject.getReportPeriod()); builder.setReportLabel(reportLabel) .setReportPeriod(reportPeriod) .setDefaultInclusion(inputObject.getDefaultInclusionPolicy()); for (ResourceIdInput resourceIdInput : inputObject.getIncludedPropertiesList()) { - ResourceId resourceId = this.translationEngine.convertObject(resourceIdInput); + ResourceId resourceId = this.taskitEngine.translateObject(resourceIdInput); builder.includeResource(resourceId); } for (ResourceIdInput resourceIdInput : inputObject.getExcludedPropertiesList()) { - ResourceId resourceId = this.translationEngine.convertObject(resourceIdInput); + ResourceId resourceId = this.taskitEngine.translateObject(resourceIdInput); builder.excludeResource(resourceId); } @@ -49,27 +49,27 @@ protected PersonResourceReportPluginData convertInputObject(PersonResourceReport } @Override - protected PersonResourceReportPluginDataInput convertAppObject(PersonResourceReportPluginData appObject) { + protected PersonResourceReportPluginDataInput translateAppObject(PersonResourceReportPluginData appObject) { PersonResourceReportPluginDataInput.Builder builder = PersonResourceReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); - ReportPeriodInput reportPeriodInput = this.translationEngine.convertObject(appObject.getReportPeriod()); + ReportPeriodInput reportPeriodInput = this.taskitEngine.translateObject(appObject.getReportPeriod()); builder.setDefaultInclusionPolicy(appObject.getDefaultInclusionPolicy()) .setReportPeriod(reportPeriodInput) .setReportLabel(reportLabelInput); for (ResourceId resourceId : appObject.getIncludedResourceIds()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); builder.addIncludedProperties(resourceIdInput); } for (ResourceId resourceId : appObject.getExcludedResourceIds()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); builder.addExcludedProperties(resourceIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceFilterTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceFilterTranslationSpec.java similarity index 67% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceFilterTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceFilterTranslationSpec.java index 1df717a..f36117d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceFilterTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceFilter; @@ -6,25 +6,24 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; public class ResourceFilterTranslationSpec extends ProtobufTranslationSpec { @Override - protected ResourceFilter convertInputObject(ResourceFilterInput inputObject) { - ResourceId resourceId = this.translationEngine.convertObject(inputObject.getResourceId()); - Equality equality = this.translationEngine.convertObject(inputObject.getEquality()); + protected ResourceFilter translateInputObject(ResourceFilterInput inputObject) { + ResourceId resourceId = this.taskitEngine.translateObject(inputObject.getResourceId()); + Equality equality = this.taskitEngine.translateObject(inputObject.getEquality()); long resourceValue = inputObject.getResourceValue(); return new ResourceFilter(resourceId, equality, resourceValue); } @Override - protected ResourceFilterInput convertAppObject(ResourceFilter appObject) { - ResourceIdInput resourceId = this.translationEngine.convertObjectAsSafeClass(appObject.getResourceId(), + protected ResourceFilterInput translateAppObject(ResourceFilter appObject) { + ResourceIdInput resourceId = this.taskitEngine.translateObjectAsClassSafe(appObject.getResourceId(), ResourceId.class); - EqualityInput equality = this.translationEngine.convertObjectAsSafeClass(appObject.getEquality(), - Equality.class); + EqualityInput equality = this.taskitEngine.translateObjectAsClassSafe(appObject.getEquality(), Equality.class); long resourceValue = appObject.getResourceValue(); return ResourceFilterInput.newBuilder() diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceIdTranslationSpec.java index 65788be..0ea236a 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,13 +11,13 @@ public class ResourceIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected ResourceId convertInputObject(ResourceIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected ResourceId translateInputObject(ResourceIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected ResourceIdInput convertAppObject(ResourceId appObject) { - return ResourceIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected ResourceIdInput translateAppObject(ResourceId appObject) { + return ResourceIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceInitializationTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceInitializationTranslationSpec.java similarity index 71% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceInitializationTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceInitializationTranslationSpec.java index 7723c4d..7ca77ed 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceInitializationTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceInitializationTranslationSpec.java @@ -1,9 +1,9 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceInitialization; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceInitializationInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -14,17 +14,17 @@ public class ResourceInitializationTranslationSpec extends ProtobufTranslationSpec { @Override - protected ResourceInitialization convertInputObject(ResourceInitializationInput inputObject) { - ResourceId resourceId = this.translationEngine.convertObject(inputObject.getResourceId()); + protected ResourceInitialization translateInputObject(ResourceInitializationInput inputObject) { + ResourceId resourceId = this.taskitEngine.translateObject(inputObject.getResourceId()); long amount = inputObject.getAmount(); return new ResourceInitialization(resourceId, amount); } @Override - protected ResourceInitializationInput convertAppObject(ResourceInitialization appObject) { + protected ResourceInitializationInput translateAppObject(ResourceInitialization appObject) { return ResourceInitializationInput.newBuilder() .setAmount(appObject.getAmount()) - .setResourceId(this.translationEngine.getAnyFromObject(appObject.getResourceId())) + .setResourceId(this.taskitEngine.getAnyFromObject(appObject.getResourceId())) .build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcePropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcePropertyIdTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcePropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcePropertyIdTranslationSpec.java index 833bdce..aa1fd28 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcePropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcePropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourcePropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourcePropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -12,13 +12,13 @@ public class ResourcePropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected ResourcePropertyId convertInputObject(ResourcePropertyIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected ResourcePropertyId translateInputObject(ResourcePropertyIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected ResourcePropertyIdInput convertAppObject(ResourcePropertyId appObject) { - return ResourcePropertyIdInput.newBuilder().setId(this.translationEngine.getAnyFromObject(appObject)).build(); + protected ResourcePropertyIdInput translateAppObject(ResourcePropertyId appObject) { + return ResourcePropertyIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcePropertyReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcePropertyReportPluginDataTranslationSpec.java similarity index 72% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcePropertyReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcePropertyReportPluginDataTranslationSpec.java index 3e2a09f..30cbeba 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcePropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcePropertyReportPluginDataTranslationSpec.java @@ -1,11 +1,11 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.reports.ResourcePropertyReportPluginData; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.ResourcePropertyReportPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -17,26 +17,26 @@ public class ResourcePropertyReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected ResourcePropertyReportPluginData convertInputObject(ResourcePropertyReportPluginDataInput inputObject) { + protected ResourcePropertyReportPluginData translateInputObject(ResourcePropertyReportPluginDataInput inputObject) { if (!ResourcePropertyReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } ResourcePropertyReportPluginData.Builder builder = ResourcePropertyReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); builder.setReportLabel(reportLabel); return builder.build(); } @Override - protected ResourcePropertyReportPluginDataInput convertAppObject(ResourcePropertyReportPluginData appObject) { + protected ResourcePropertyReportPluginDataInput translateAppObject(ResourcePropertyReportPluginData appObject) { ResourcePropertyReportPluginDataInput.Builder builder = ResourcePropertyReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); builder.setReportLabel(reportLabelInput); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceReportPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceReportPluginDataTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceReportPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceReportPluginDataTranslationSpec.java index 776543c..99d267a 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourceReportPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourceReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; @@ -8,8 +8,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportPeriodInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.ResourceReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceIdInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -21,27 +21,27 @@ public class ResourceReportPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected ResourceReportPluginData convertInputObject(ResourceReportPluginDataInput inputObject) { + protected ResourceReportPluginData translateInputObject(ResourceReportPluginDataInput inputObject) { if (!ResourceReportPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } ResourceReportPluginData.Builder builder = ResourceReportPluginData.builder(); - ReportLabel reportLabel = this.translationEngine.convertObject(inputObject.getReportLabel()); - ReportPeriod reportPeriod = this.translationEngine.convertObject(inputObject.getReportPeriod()); + ReportLabel reportLabel = this.taskitEngine.translateObject(inputObject.getReportLabel()); + ReportPeriod reportPeriod = this.taskitEngine.translateObject(inputObject.getReportPeriod()); builder.setReportLabel(reportLabel) .setReportPeriod(reportPeriod) .setDefaultInclusion(inputObject.getDefaultInclusionPolicy()); for (ResourceIdInput resourceIdInput : inputObject.getIncludedPropertiesList()) { - ResourceId resourceId = this.translationEngine.convertObject(resourceIdInput); + ResourceId resourceId = this.taskitEngine.translateObject(resourceIdInput); builder.includeResource(resourceId); } for (ResourceIdInput resourceIdInput : inputObject.getExcludedPropertiesList()) { - ResourceId resourceId = this.translationEngine.convertObject(resourceIdInput); + ResourceId resourceId = this.taskitEngine.translateObject(resourceIdInput); builder.excludeResource(resourceId); } @@ -49,27 +49,27 @@ protected ResourceReportPluginData convertInputObject(ResourceReportPluginDataIn } @Override - protected ResourceReportPluginDataInput convertAppObject(ResourceReportPluginData appObject) { + protected ResourceReportPluginDataInput translateAppObject(ResourceReportPluginData appObject) { ResourceReportPluginDataInput.Builder builder = ResourceReportPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - ReportLabelInput reportLabelInput = this.translationEngine.convertObjectAsSafeClass(appObject.getReportLabel(), + ReportLabelInput reportLabelInput = this.taskitEngine.translateObjectAsClassSafe(appObject.getReportLabel(), ReportLabel.class); - ReportPeriodInput reportPeriodInput = this.translationEngine.convertObject(appObject.getReportPeriod()); + ReportPeriodInput reportPeriodInput = this.taskitEngine.translateObject(appObject.getReportPeriod()); builder.setDefaultInclusionPolicy(appObject.getDefaultInclusionPolicy()) .setReportPeriod(reportPeriodInput) .setReportLabel(reportLabelInput); for (ResourceId resourceId : appObject.getIncludedResourceIds()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); builder.addIncludedProperties(resourceIdInput); } for (ResourceId resourceId : appObject.getExcludedResourceIds()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); builder.addExcludedProperties(resourceIdInput); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcesPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcesPluginDataTranslationSpec.java similarity index 81% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcesPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcesPluginDataTranslationSpec.java index 7100b6d..f8f1e30 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/ResourcesPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/ResourcesPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceInitializationInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourcePropertyDefinitionMapInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourcePropertyValueMapInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -38,49 +38,49 @@ public class ResourcesPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected ResourcesPluginData convertInputObject(ResourcesPluginDataInput inputObject) { + protected ResourcesPluginData translateInputObject(ResourcesPluginDataInput inputObject) { if (!ResourcesPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } ResourcesPluginData.Builder builder = ResourcesPluginData.builder(); for (ResourceIdMapInput resourceIdInput : inputObject.getResourceIdsList()) { - ResourceId resourceId = this.translationEngine.convertObject(resourceIdInput.getResourceId()); + ResourceId resourceId = this.taskitEngine.translateObject(resourceIdInput.getResourceId()); builder.addResource(resourceId, resourceIdInput.getResourceTime(), resourceIdInput.getResourceTimeTrackingPolicy()); } for (ResourcePropertyDefinitionMapInput resourcePropertyDefinitionMapInput : inputObject .getResourcePropertyDefinitionsList()) { - ResourceId resourceId = this.translationEngine - .convertObject(resourcePropertyDefinitionMapInput.getResourceId()); + ResourceId resourceId = this.taskitEngine + .translateObject(resourcePropertyDefinitionMapInput.getResourceId()); PropertyDefinitionMapInput propertyDefinitionMapInput = resourcePropertyDefinitionMapInput .getResourcePropertyDefinitionMap(); - ResourcePropertyId resourcePropertyId = this.translationEngine + ResourcePropertyId resourcePropertyId = this.taskitEngine .getObjectFromAny(propertyDefinitionMapInput.getPropertyId()); - PropertyDefinition propertyDefinition = this.translationEngine - .convertObject(propertyDefinitionMapInput.getPropertyDefinition()); + PropertyDefinition propertyDefinition = this.taskitEngine + .translateObject(propertyDefinitionMapInput.getPropertyDefinition()); builder.defineResourceProperty(resourceId, resourcePropertyId, propertyDefinition); } for (ResourcePropertyValueMapInput resourcePropertyValueMapInput : inputObject .getResourcePropertyValuesList()) { - ResourceId resourceId = this.translationEngine.convertObject(resourcePropertyValueMapInput.getResourceId()); + ResourceId resourceId = this.taskitEngine.translateObject(resourcePropertyValueMapInput.getResourceId()); PropertyValueMapInput propertyValueMapInput = resourcePropertyValueMapInput.getResourcePropertyValueMap(); - ResourcePropertyId resourcePropertyId = this.translationEngine + ResourcePropertyId resourcePropertyId = this.taskitEngine .getObjectFromAny(propertyValueMapInput.getPropertyId()); - Object propertyValue = this.translationEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); + Object propertyValue = this.taskitEngine.getObjectFromAny(propertyValueMapInput.getPropertyValue()); builder.setResourcePropertyValue(resourceId, resourcePropertyId, propertyValue); } for (PersonResourceLevelMapInput personResourceLevelsInput : inputObject.getPersonResourceLevelsList()) { - ResourceId resourceId = this.translationEngine.convertObject(personResourceLevelsInput.getResourceId()); + ResourceId resourceId = this.taskitEngine.translateObject(personResourceLevelsInput.getResourceId()); for (PersonResourceLevelInput personResourceInput : personResourceLevelsInput .getPersonResourceLevelsList()) { @@ -92,7 +92,7 @@ protected ResourcesPluginData convertInputObject(ResourcesPluginDataInput inputO } for (PersonResourceTimeMapInput personResourceTimesInput : inputObject.getPersonResourceTimesList()) { - ResourceId resourceId = this.translationEngine.convertObject(personResourceTimesInput.getResourceId()); + ResourceId resourceId = this.taskitEngine.translateObject(personResourceTimesInput.getResourceId()); for (PersonResourceTimeInput personResourceInput : personResourceTimesInput.getPersonResourceTimesList()) { PersonId personId = new PersonId(personResourceInput.getPersonId()); @@ -103,12 +103,12 @@ protected ResourcesPluginData convertInputObject(ResourcesPluginDataInput inputO } for (RegionResourceLevelMapInput regionResourceLevelsInput : inputObject.getRegionResourceLevelsList()) { - RegionId regionId = this.translationEngine.convertObject(regionResourceLevelsInput.getRegionId()); + RegionId regionId = this.taskitEngine.translateObject(regionResourceLevelsInput.getRegionId()); for (ResourceInitializationInput resourceInitializationInput : regionResourceLevelsInput .getRegionResourceLevelsList()) { - ResourceInitialization resourceInitialization = this.translationEngine - .convertObject(resourceInitializationInput); + ResourceInitialization resourceInitialization = this.taskitEngine + .translateObject(resourceInitializationInput); builder.setRegionResourceLevel(regionId, resourceInitialization.getResourceId(), resourceInitialization.getAmount()); @@ -119,7 +119,7 @@ protected ResourcesPluginData convertInputObject(ResourcesPluginDataInput inputO } @Override - protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObject) { + protected ResourcesPluginDataInput translateAppObject(ResourcesPluginData appObject) { ResourcesPluginDataInput.Builder builder = ResourcesPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); @@ -134,7 +134,7 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec // Resource Ids for (ResourceId resourceId : resourceDefaultTimes.keySet()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); ResourceIdMapInput resourceIdMapInput = ResourceIdMapInput.newBuilder() @@ -148,19 +148,19 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec // Resource Property Defs for (ResourceId resourceId : resourcePropDefs.keySet()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); for (ResourcePropertyId resourcePropertyId : resourcePropDefs.get(resourceId).keySet()) { ResourcePropertyDefinitionMapInput.Builder resourcePropDefBuilder = ResourcePropertyDefinitionMapInput .newBuilder(); - PropertyDefinitionInput propertyDefinitionInput = this.translationEngine - .convertObject(appObject.getResourcePropertyDefinition(resourceId, resourcePropertyId)); + PropertyDefinitionInput propertyDefinitionInput = this.taskitEngine + .translateObject(appObject.getResourcePropertyDefinition(resourceId, resourcePropertyId)); PropertyDefinitionMapInput propertyDefInput = PropertyDefinitionMapInput.newBuilder() .setPropertyDefinition(propertyDefinitionInput) - .setPropertyId(this.translationEngine.getAnyFromObject(resourcePropertyId)) + .setPropertyId(this.taskitEngine.getAnyFromObject(resourcePropertyId)) .build(); resourcePropDefBuilder.setResourcePropertyDefinitionMap(propertyDefInput) @@ -173,7 +173,7 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec // Resource Property Values for (ResourceId resourceId : resourcePropValues.keySet()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); for (ResourcePropertyId resourcePropertyId : resourcePropValues.get(resourceId).keySet()) { @@ -183,8 +183,8 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec Object propertyValue = appObject.getResourcePropertyValue(resourceId, resourcePropertyId).get(); PropertyValueMapInput propertyValueMapInput = PropertyValueMapInput.newBuilder() - .setPropertyValue(this.translationEngine.getAnyFromObject(propertyValue)) - .setPropertyId(this.translationEngine.getAnyFromObject(resourcePropertyId)) + .setPropertyValue(this.taskitEngine.getAnyFromObject(propertyValue)) + .setPropertyId(this.taskitEngine.getAnyFromObject(resourcePropertyId)) .build(); resourcePropValBuilder.setResourcePropertyValueMap(propertyValueMapInput) @@ -196,7 +196,7 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec // Region Resource Values for (RegionId regionId : regionResourceLevels.keySet()) { - RegionIdInput regionIdInput = this.translationEngine.convertObjectAsSafeClass(regionId, RegionId.class); + RegionIdInput regionIdInput = this.taskitEngine.translateObjectAsClassSafe(regionId, RegionId.class); RegionResourceLevelMapInput.Builder regionResourceLevelsBuilder = RegionResourceLevelMapInput.newBuilder() .setRegionId(regionIdInput); @@ -206,8 +206,8 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec ResourceInitialization resourceInitialization = new ResourceInitialization(resourceId, regionResourceLevel); - ResourceInitializationInput resourceInitializationInput = this.translationEngine - .convertObject(resourceInitialization); + ResourceInitializationInput resourceInitializationInput = this.taskitEngine + .translateObject(resourceInitialization); regionResourceLevelsBuilder.addRegionResourceLevels(resourceInitializationInput); } @@ -217,7 +217,7 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec // Person Resource Levels for (ResourceId resourceId : personResourceLevels.keySet()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); List resourceLevels = personResourceLevels.get(resourceId); @@ -250,7 +250,7 @@ protected ResourcesPluginDataInput convertAppObject(ResourcesPluginData appObjec // Person Resource Times for (ResourceId resourceId : personResourceTimes.keySet()) { - ResourceIdInput resourceIdInput = this.translationEngine.convertObjectAsSafeClass(resourceId, + ResourceIdInput resourceIdInput = this.taskitEngine.translateObjectAsClassSafe(resourceId, ResourceId.class); List resourceTimes = appObject.getPersonResourceTimes(resourceId); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/TestResourceIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/TestResourceIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/TestResourceIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/TestResourceIdTranslationSpec.java index b072dad..d0302ba 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/TestResourceIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/TestResourceIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.testsupport.input.TestResourceIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -11,12 +11,12 @@ public class TestResourceIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestResourceId convertInputObject(TestResourceIdInput inputObject) { + protected TestResourceId translateInputObject(TestResourceIdInput inputObject) { return TestResourceId.valueOf(inputObject.name()); } @Override - protected TestResourceIdInput convertAppObject(TestResourceId appObject) { + protected TestResourceIdInput translateAppObject(TestResourceId appObject) { return TestResourceIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/TestResourcePropertyIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/TestResourcePropertyIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/TestResourcePropertyIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/TestResourcePropertyIdTranslationSpec.java index a8adc7c..fbee49c 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/TestResourcePropertyIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/TestResourcePropertyIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourcePropertyId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.testsupport.input.TestResourcePropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,12 +13,12 @@ public class TestResourcePropertyIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestResourcePropertyId convertInputObject(TestResourcePropertyIdInput inputObject) { + protected TestResourcePropertyId translateInputObject(TestResourcePropertyIdInput inputObject) { return TestResourcePropertyId.valueOf(inputObject.name()); } @Override - protected TestResourcePropertyIdInput convertAppObject(TestResourcePropertyId appObject) { + protected TestResourcePropertyIdInput translateAppObject(TestResourcePropertyId appObject) { return TestResourcePropertyIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslator.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/StochasticsTranslator.java similarity index 57% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslator.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/StochasticsTranslator.java index 3fb5492..459d2b2 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslator.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/StochasticsTranslator.java @@ -1,35 +1,34 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation; import java.util.ArrayList; import java.util.List; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.RandomNumberGeneratorIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.SimpleRandomNumberGeneratorIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.StochasticsPluginDataTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.TestRandomGeneratorIdTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs.WellStateTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs.RandomNumberGeneratorIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs.SimpleRandomNumberGeneratorIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs.StochasticsPluginDataTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs.TestRandomGeneratorIdTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs.WellStateTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.IProtobufTaskitEngineBuilder; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * Translator for the Stochastics Plugin. Using this Translator will add all the - * necessary TanslationSpecs needed to read and write the StochasticsPlugin + * necessary TranslationSpecs needed to read and write the StochasticsPlugin */ public class StochasticsTranslator { private StochasticsTranslator() { } - protected static List> getTranslationSpecs() { - List> list = new ArrayList<>(); + protected static List> getTranslationSpecs() { + List> list = new ArrayList<>(); list.add(new StochasticsPluginDataTranslationSpec()); list.add(new WellStateTranslationSpec()); list.add(new RandomNumberGeneratorIdTranslationSpec()); list.add(new TestRandomGeneratorIdTranslationSpec()); list.add(new SimpleRandomNumberGeneratorIdTranslationSpec()); - return list; } @@ -42,11 +41,11 @@ private static Translator.Builder builder() { Translator.Builder builder = Translator.builder() .setTranslatorId(StochasticsTranslatorId.TRANSLATOR_ID) .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); + IProtobufTaskitEngineBuilder taskitEngineBuilder = translatorContext + .getTaskitEngineBuilder(IProtobufTaskitEngineBuilder.class); - for (TranslationSpec translationSpec : getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); + for (ProtobufTranslationSpec translationSpec : getTranslationSpecs()) { + taskitEngineBuilder.addTranslationSpec(translationSpec); } }); diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslatorId.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/StochasticsTranslatorId.java similarity index 65% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslatorId.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/StochasticsTranslatorId.java index 8d60111..57a18c5 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/StochasticsTranslatorId.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/StochasticsTranslatorId.java @@ -1,6 +1,6 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation; -import gov.hhs.aspr.ms.taskit.core.TranslatorId; +import gov.hhs.aspr.ms.taskit.core.translation.TranslatorId; /** * TranslatorId for the Stochastics Translator diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/RandomNumberGeneratorIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/RandomNumberGeneratorIdTranslationSpec.java similarity index 63% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/RandomNumberGeneratorIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/RandomNumberGeneratorIdTranslationSpec.java index ca1ba9f..79566fd 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/RandomNumberGeneratorIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/RandomNumberGeneratorIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.RandomNumberGeneratorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.RandomNumberGeneratorIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,15 +13,13 @@ public class RandomNumberGeneratorIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected RandomNumberGeneratorId convertInputObject(RandomNumberGeneratorIdInput inputObject) { - return this.translationEngine.getObjectFromAny(inputObject.getId()); + protected RandomNumberGeneratorId translateInputObject(RandomNumberGeneratorIdInput inputObject) { + return this.taskitEngine.getObjectFromAny(inputObject.getId()); } @Override - protected RandomNumberGeneratorIdInput convertAppObject(RandomNumberGeneratorId appObject) { - return RandomNumberGeneratorIdInput.newBuilder() - .setId(this.translationEngine.getAnyFromObject(appObject)) - .build(); + protected RandomNumberGeneratorIdInput translateAppObject(RandomNumberGeneratorId appObject) { + return RandomNumberGeneratorIdInput.newBuilder().setId(this.taskitEngine.getAnyFromObject(appObject)).build(); } @Override diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/SimpleRandomNumberGeneratorIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/SimpleRandomNumberGeneratorIdTranslationSpec.java similarity index 69% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/SimpleRandomNumberGeneratorIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/SimpleRandomNumberGeneratorIdTranslationSpec.java index 540f487..a2ab2e7 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/SimpleRandomNumberGeneratorIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/SimpleRandomNumberGeneratorIdTranslationSpec.java @@ -1,10 +1,10 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.SimpleRandomNumberGeneratorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.SimpleReportLabelInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.SimpleRandomNumberGeneratorIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -14,14 +14,14 @@ public class SimpleRandomNumberGeneratorIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected SimpleRandomNumberGeneratorId convertInputObject(SimpleRandomNumberGeneratorIdInput inputObject) { - return new SimpleRandomNumberGeneratorId(this.translationEngine.getObjectFromAny(inputObject.getValue())); + protected SimpleRandomNumberGeneratorId translateInputObject(SimpleRandomNumberGeneratorIdInput inputObject) { + return new SimpleRandomNumberGeneratorId(this.taskitEngine.getObjectFromAny(inputObject.getValue())); } @Override - protected SimpleRandomNumberGeneratorIdInput convertAppObject(SimpleRandomNumberGeneratorId appObject) { + protected SimpleRandomNumberGeneratorIdInput translateAppObject(SimpleRandomNumberGeneratorId appObject) { return SimpleRandomNumberGeneratorIdInput.newBuilder() - .setValue(this.translationEngine.getAnyFromObject(appObject.getValue())) + .setValue(this.taskitEngine.getAnyFromObject(appObject.getValue())) .build(); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/StochasticsPluginDataTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/StochasticsPluginDataTranslationSpec.java similarity index 68% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/StochasticsPluginDataTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/StochasticsPluginDataTranslationSpec.java index 17870ad..ce53a1d 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/StochasticsPluginDataTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/StochasticsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.datamanagers.StochasticsPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.RandomNumberGeneratorId; @@ -7,8 +7,8 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.RandomNumberGeneratorIdInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.RandomNumberGeneratorMapInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.WellStateInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; import gov.hhs.aspr.ms.util.errors.ContractException; /** @@ -20,21 +20,21 @@ public class StochasticsPluginDataTranslationSpec extends ProtobufTranslationSpec { @Override - protected StochasticsPluginData convertInputObject(StochasticsPluginDataInput inputObject) { + protected StochasticsPluginData translateInputObject(StochasticsPluginDataInput inputObject) { if (!StochasticsPluginData.checkVersionSupported(inputObject.getVersion())) { - throw new ContractException(CoreTranslationError.UNSUPPORTED_VERSION); + throw new ContractException(TaskitError.UNSUPPORTED_VERSION); } StochasticsPluginData.Builder builder = StochasticsPluginData.builder(); - WellState wellState = this.translationEngine.convertObject(inputObject.getWellState()); + WellState wellState = this.taskitEngine.translateObject(inputObject.getWellState()); builder.setMainRNGState(wellState); for (RandomNumberGeneratorMapInput randomGenIdInput : inputObject.getRandomNumberGeneratorIdsList()) { - RandomNumberGeneratorId generatorId = this.translationEngine - .convertObject(randomGenIdInput.getRandomNumberGeneratorId()); - WellState generatorWellState = this.translationEngine.convertObject(randomGenIdInput.getWellState()); + RandomNumberGeneratorId generatorId = this.taskitEngine + .translateObject(randomGenIdInput.getRandomNumberGeneratorId()); + WellState generatorWellState = this.taskitEngine.translateObject(randomGenIdInput.getWellState()); builder.addRNG(generatorId, generatorWellState); } @@ -42,19 +42,19 @@ protected StochasticsPluginData convertInputObject(StochasticsPluginDataInput in } @Override - protected StochasticsPluginDataInput convertAppObject(StochasticsPluginData appObject) { + protected StochasticsPluginDataInput translateAppObject(StochasticsPluginData appObject) { StochasticsPluginDataInput.Builder builder = StochasticsPluginDataInput.newBuilder(); builder.setVersion(appObject.getVersion()); - WellStateInput wellStateInput = this.translationEngine.convertObject(appObject.getWellState()); + WellStateInput wellStateInput = this.taskitEngine.translateObject(appObject.getWellState()); builder.setWellState(wellStateInput); for (RandomNumberGeneratorId randomNumberGeneratorId : appObject.getRandomNumberGeneratorIds()) { - RandomNumberGeneratorIdInput randomNumberGeneratorIdInput = this.translationEngine - .convertObjectAsSafeClass(randomNumberGeneratorId, RandomNumberGeneratorId.class); - WellStateInput generatorWellStateInput = this.translationEngine - .convertObject(appObject.getWellState(randomNumberGeneratorId)); + RandomNumberGeneratorIdInput randomNumberGeneratorIdInput = this.taskitEngine + .translateObjectAsClassSafe(randomNumberGeneratorId, RandomNumberGeneratorId.class); + WellStateInput generatorWellStateInput = this.taskitEngine + .translateObject(appObject.getWellState(randomNumberGeneratorId)); builder.addRandomNumberGeneratorIds(RandomNumberGeneratorMapInput.newBuilder() .setWellState(generatorWellStateInput) diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/TestRandomGeneratorIdTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/TestRandomGeneratorIdTranslationSpec.java similarity index 77% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/TestRandomGeneratorIdTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/TestRandomGeneratorIdTranslationSpec.java index ffd1b96..a40b4e6 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/TestRandomGeneratorIdTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/TestRandomGeneratorIdTranslationSpec.java @@ -1,8 +1,8 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.testsupport.TestRandomGeneratorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.testsupport.input.TestRandomGeneratorIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -13,12 +13,12 @@ public class TestRandomGeneratorIdTranslationSpec extends ProtobufTranslationSpec { @Override - protected TestRandomGeneratorId convertInputObject(TestRandomGeneratorIdInput inputObject) { + protected TestRandomGeneratorId translateInputObject(TestRandomGeneratorIdInput inputObject) { return TestRandomGeneratorId.valueOf(inputObject.name()); } @Override - protected TestRandomGeneratorIdInput convertAppObject(TestRandomGeneratorId appObject) { + protected TestRandomGeneratorIdInput translateAppObject(TestRandomGeneratorId appObject) { return TestRandomGeneratorIdInput.valueOf(appObject.name()); } diff --git a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/WellStateTranslationSpec.java b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/WellStateTranslationSpec.java similarity index 90% rename from protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/WellStateTranslationSpec.java rename to protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/WellStateTranslationSpec.java index 0a1ba39..ce8ed78 100644 --- a/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/WellStateTranslationSpec.java +++ b/protobuf/src/main/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/WellStateTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -7,7 +7,7 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.WellStateInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationSpec; +import gov.hhs.aspr.ms.taskit.protobuf.translation.ProtobufTranslationSpec; /** * TranslationSpec that defines how to convert between @@ -16,7 +16,7 @@ public class WellStateTranslationSpec extends ProtobufTranslationSpec { @Override - protected WellState convertInputObject(WellStateInput inputObject) { + protected WellState translateInputObject(WellStateInput inputObject) { WellState.Builder builder = WellState.builder(); builder.setSeed(inputObject.getSeed()); @@ -32,7 +32,7 @@ protected WellState convertInputObject(WellStateInput inputObject) { } @Override - protected WellStateInput convertAppObject(WellState appObject) { + protected WellStateInput translateAppObject(WellState appObject) { WellStateInput.Builder builder = WellStateInput.newBuilder(); builder.setSeed(appObject.getSeed()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java deleted file mode 100644 index 17617f8..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslator.java +++ /dev/null @@ -1,80 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_NucleusTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = NucleusTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = NucleusTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - - Translator expectedTranslator = Translator.builder() - .setTranslatorId(NucleusTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - ProtobufTranslationEngine.Builder translationEngineBuilder = translatorContext - .getTranslationEngineBuilder(ProtobufTranslationEngine.Builder.class); - - for (TranslationSpec translationSpec : NucleusTranslator.getTranslationSpecs()) { - translationEngineBuilder.addTranslationSpec(translationSpec); - } - - translationEngineBuilder.addFieldToIncludeDefaultValue( - SimulationStateInput.getDescriptor().findFieldByName("startTime")); - }) - .build(); - - assertEquals(expectedTranslator, NucleusTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translationSpecs/AT_ExampleDimensionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translation/specs/AT_ExampleDimensionTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translationSpecs/AT_ExampleDimensionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translation/specs/AT_ExampleDimensionTranslationSpec.java index 50e8523..f7563de 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translationSpecs/AT_ExampleDimensionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/testsupport/translation/specs/AT_ExampleDimensionTranslationSpec.java @@ -1,14 +1,15 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.NucleusTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.ExampleDimension; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.input.ExampleDimensionInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.NucleusTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,20 +24,20 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { + public void testTranslateObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(NucleusTranslator.getTranslator()) .build(); ExampleDimensionTranslationSpec translationSpec = new ExampleDimensionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ExampleDimension expectedAppValue = new ExampleDimension("test"); - ExampleDimensionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ExampleDimensionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ExampleDimension actualAppValue = translationSpec.convertInputObject(inputValue); + ExampleDimension actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/AT_NucleusTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/AT_NucleusTranslator.java new file mode 100644 index 0000000..0877cd0 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/AT_NucleusTranslator.java @@ -0,0 +1,38 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_NucleusTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(NucleusTranslator.class, + NucleusTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = NucleusTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + + Translator expectedTranslator = Translator.builder() + .setTranslatorId(NucleusTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, NucleusTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/AT_NucleusTranslatorId.java similarity index 85% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/AT_NucleusTranslatorId.java index 5c07237..9bd2f5b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/AT_NucleusTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/AT_NucleusTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/IT_NucleusTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/IT_NucleusTranslator.java similarity index 53% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/IT_NucleusTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/IT_NucleusTranslator.java index 561b92b..5699f34 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/IT_NucleusTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/IT_NucleusTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -11,9 +11,9 @@ import gov.hhs.aspr.ms.gcm.simulation.nucleus.SimulationState; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.ExperimentParameterDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -28,28 +28,25 @@ public void testSimulationStateTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine( - ProtobufTranslationEngine.builder().addTranslator(NucleusTranslator.getTranslator()).build()) - .addInputFilePath(filePath.resolve(fileName), SimulationStateInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine( + ProtobufJsonTaskitEngine.builder().addTranslator(NucleusTranslator.getTranslator()).build()) .build(); double startTime = 5; - SimulationState exptectedSimulationState = SimulationState.builder() + SimulationState expectedSimulationState = SimulationState.builder() .setStartTime(startTime) .setBaseDate(LocalDate.of(2023, 4, 12)) .build(); - translatorController.writeOutput(exptectedSimulationState, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedSimulationState, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - translatorController.readInput(); + SimulationState actualSimulationState = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + SimulationStateInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); - SimulationState actualSimulationState = translatorController.getFirstObject(SimulationState.class); - - assertEquals(exptectedSimulationState, actualSimulationState); + assertEquals(expectedSimulationState, actualSimulationState); } @Test @@ -59,11 +56,9 @@ public void testExperimentParameterDataTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine( - ProtobufTranslationEngine.builder().addTranslator(NucleusTranslator.getTranslator()).build()) - .addInputFilePath(filePath.resolve(fileName), ExperimentParameterDataInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine( + ProtobufJsonTaskitEngine.builder().addTranslator(NucleusTranslator.getTranslator()).build()) .build(); ExperimentParameterData.Builder builder = ExperimentParameterData.builder() @@ -78,13 +73,11 @@ public void testExperimentParameterDataTranslator() { ExperimentParameterData expectedExperimentParameterData = builder.build(); - translatorController.writeOutput(expectedExperimentParameterData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedExperimentParameterData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - ExperimentParameterData actualExperimentParameterData = translatorController - .getFirstObject(ExperimentParameterData.class); + ExperimentParameterData actualExperimentParameterData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), ExperimentParameterDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedExperimentParameterData, actualExperimentParameterData); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_DimensionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_DimensionTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_DimensionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_DimensionTranslationSpec.java index ee15150..5420f8f 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_DimensionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_DimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,10 +6,11 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.nucleus.Dimension; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.NucleusTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.DimensionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.testsupport.ExampleDimension; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.NucleusTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -24,19 +25,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(NucleusTranslator.getTranslator()) .build(); DimensionTranslationSpec translationSpec = new DimensionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Dimension expectedAppValue = new ExampleDimension("test"); - DimensionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + DimensionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - Dimension actualAppValue = translationSpec.convertInputObject(inputValue); + Dimension actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_ExperimentParameterDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_ExperimentParameterDataTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_ExperimentParameterDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_ExperimentParameterDataTranslationSpec.java index fbd7dea..3cdd0a0 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_ExperimentParameterDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_ExperimentParameterDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,10 +9,11 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.nucleus.ExperimentParameterData; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.NucleusTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.ExperimentParameterDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.NucleusTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,13 +29,13 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(NucleusTranslator.getTranslator()) .build(); ExperimentParameterDataTranslationSpec translationSpec = new ExperimentParameterDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ExperimentParameterData.Builder builder = ExperimentParameterData.builder() .setThreadCount(8) @@ -48,31 +49,32 @@ public void testConvertObject() { ExperimentParameterData expectedAppValue = builder.build(); - ExperimentParameterDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ExperimentParameterDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ExperimentParameterData actualAppValue = translationSpec.convertInputObject(inputValue); + ExperimentParameterData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); expectedAppValue = builder.setSimulationHaltTime(10.0).build(); - inputValue = translationSpec.convertAppObject(expectedAppValue); - actualAppValue = translationSpec.convertInputObject(inputValue); + inputValue = translationSpec.translateAppObject(expectedAppValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); expectedAppValue = builder.setExperimentProgressLog(Path.of("")).build(); - inputValue = translationSpec.convertAppObject(expectedAppValue); - actualAppValue = translationSpec.convertInputObject(inputValue); + inputValue = translationSpec.translateAppObject(expectedAppValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(ExperimentParameterDataInput.newBuilder().setVersion("badversion").build()); + translationSpec + .translateInputObject(ExperimentParameterDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_PlannerTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_PlannerTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_PlannerTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_PlannerTranslationSpec.java index 5eab000..9e37c28 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_PlannerTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_PlannerTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.nucleus.Planner; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.NucleusTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.PlannerInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.NucleusTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,19 +24,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(NucleusTranslator.getTranslator()) .build(); PlannerTranslationSpec translationSpec = new PlannerTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Planner expectedAppValue = Planner.DATA_MANAGER; - PlannerInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PlannerInput inputValue = translationSpec.translateAppObject(expectedAppValue); - Planner actualAppValue = translationSpec.convertInputObject(inputValue); + Planner actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_SimulationStateTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_SimulationStateTranslationSpec.java similarity index 69% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_SimulationStateTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_SimulationStateTranslationSpec.java index ee449df..096f4b1 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translationSpecs/AT_SimulationStateTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/nucleus/translation/specs/AT_SimulationStateTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,10 +9,11 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.nucleus.SimulationState; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.NucleusTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.input.SimulationStateInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.nucleus.translation.NucleusTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,13 +29,13 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(NucleusTranslator.getTranslator()) .build(); SimulationStateTranslationSpec translationSpec = new SimulationStateTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); double startTime = 5; @@ -43,25 +44,25 @@ public void testConvertObject() { .setBaseDate(LocalDate.of(2023, 4, 12)) .build(); - SimulationStateInput inputValue = translationSpec.convertAppObject(expectedAppValue); + SimulationStateInput inputValue = translationSpec.translateAppObject(expectedAppValue); - SimulationState actualAppValue = translationSpec.convertInputObject(inputValue); + SimulationState actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); expectedAppValue = SimulationState.builder().setStartTime(startTime).build(); - actualAppValue = translationSpec.convertInputObject(inputValue.toBuilder().clearBaseDate().build()); + actualAppValue = translationSpec.translateInputObject(inputValue.toBuilder().clearBaseDate().build()); assertEquals(expectedAppValue, actualAppValue); // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(SimulationStateInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(SimulationStateInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java deleted file mode 100644 index af14bb4..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslator.java +++ /dev/null @@ -1,72 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_GlobalPropertiesTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = GlobalPropertiesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = GlobalPropertiesTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(GlobalPropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, GlobalPropertiesTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/AT_GlobalPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/AT_GlobalPropertiesTranslator.java new file mode 100644 index 0000000..32a064b --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/AT_GlobalPropertiesTranslator.java @@ -0,0 +1,41 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_GlobalPropertiesTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(GlobalPropertiesTranslator.class, + GlobalPropertiesTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = GlobalPropertiesTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(GlobalPropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, GlobalPropertiesTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/AT_GlobalPropertiesTranslatorId.java similarity index 96% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/AT_GlobalPropertiesTranslatorId.java index 236bf05..8508fb7 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/AT_GlobalPropertiesTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/AT_GlobalPropertiesTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/IT_GlobalPropertiesTranslator.java similarity index 66% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/IT_GlobalPropertiesTranslator.java index 106123f..189f6cc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/IT_GlobalPropertiesTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -15,11 +15,12 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.data.input.GlobalPropertiesPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.reports.input.GlobalPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -35,28 +36,24 @@ public void testGlobalPropertiesPluginDataIntegration() { ResourceHelper.createFile(filePath, fileName); - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(protobufTranslationEngine) - .addInputFilePath(filePath.resolve(fileName), GlobalPropertiesPluginDataInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(protobufTaskitEngine) .build(); GlobalPropertiesPluginData expectedPluginData = GlobalPropertiesTestPluginFactory .getStandardGlobalPropertiesPluginData(8368397106493368066L); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - translatorController.readInput(); - - GlobalPropertiesPluginData actualPluginData = translatorController - .getFirstObject(GlobalPropertiesPluginData.class); + GlobalPropertiesPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + GlobalPropertiesPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -70,16 +67,14 @@ public void testGlobalPropertyReportPluginDataIntegration() { ResourceHelper.createFile(filePath, fileName); - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(protobufTranslationEngine) - .addInputFilePath(filePath.resolve(fileName), GlobalPropertyReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(protobufTaskitEngine) .build(); RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(524805676405822016L); @@ -99,13 +94,12 @@ public void testGlobalPropertyReportPluginDataIntegration() { GlobalPropertyReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); + - translatorController.readInput(); - GlobalPropertyReportPluginData actualPluginData = translatorController - .getFirstObject(GlobalPropertyReportPluginData.class); + GlobalPropertyReportPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), GlobalPropertyReportPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertiesPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertiesPluginDataTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertiesPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertiesPluginDataTranslationSpec.java index 0bb6277..3457b9d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertiesPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertiesPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,12 +8,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.datamanagers.GlobalPropertiesPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.testsupport.GlobalPropertiesTestPluginFactory; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.GlobalPropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.data.input.GlobalPropertiesPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.GlobalPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,24 +30,25 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { + public void testTranslateObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); GlobalPropertiesPluginDataTranslationSpec translationSpec = new GlobalPropertiesPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GlobalPropertiesPluginData expectedAppValue = GlobalPropertiesTestPluginFactory .getStandardGlobalPropertiesPluginData(8368397106493368066L); GlobalPropertiesPluginDataInput globalPropertiesPluginDataInput = translationSpec - .convertAppObject(expectedAppValue); + .translateAppObject(expectedAppValue); - GlobalPropertiesPluginData actualAppValue = translationSpec.convertInputObject(globalPropertiesPluginDataInput); + GlobalPropertiesPluginData actualAppValue = translationSpec + .translateInputObject(globalPropertiesPluginDataInput); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -54,10 +56,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(GlobalPropertiesPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + GlobalPropertiesPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyDimensionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyDimensionTranslationSpec.java similarity index 80% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyDimensionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyDimensionTranslationSpec.java index 4b4cdba..8c0f360 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyDimensionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,11 +7,12 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyDimension; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.testsupport.TestGlobalPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.GlobalPropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyDimensionInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.GlobalPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,15 +27,15 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); GlobalPropertyDimensionTranslationSpec translationSpec = new GlobalPropertyDimensionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GlobalPropertyDimension expectedAppValue = GlobalPropertyDimension.builder() .setAssignmentTime(0) @@ -44,9 +45,9 @@ public void testConvertObject() { .addValue(15000.5) .build(); - GlobalPropertyDimensionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GlobalPropertyDimensionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GlobalPropertyDimension actualAppValue = translationSpec.convertInputObject(inputValue); + GlobalPropertyDimension actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyIdTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyIdTranslationSpec.java index e84c3a4..ab0ca6e 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,11 +7,12 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.support.GlobalPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.testsupport.TestGlobalPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.GlobalPropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.support.input.GlobalPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.GlobalPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,21 +27,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); GlobalPropertyIdTranslationSpec translationSpec = new GlobalPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GlobalPropertyId expectedAppValue = TestGlobalPropertyId.GLOBAL_PROPERTY_1_BOOLEAN_MUTABLE; - GlobalPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GlobalPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GlobalPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + GlobalPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyReportPluginDataTranslationSpec.java similarity index 79% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyReportPluginDataTranslationSpec.java index c29ff93..16a1557 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_GlobalPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_GlobalPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -11,12 +11,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.testsupport.TestGlobalPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.GlobalPropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.reports.input.GlobalPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.GlobalPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -33,15 +34,15 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); GlobalPropertyReportPluginDataTranslationSpec translationSpec = new GlobalPropertyReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(524805676405822016L); GlobalPropertyReportPluginData.Builder builder = GlobalPropertyReportPluginData.builder(); @@ -61,10 +62,10 @@ public void testConvertObject() { GlobalPropertyReportPluginData expectedAppValue = builder.build(); GlobalPropertyReportPluginDataInput globalPropertiesPluginDataInput = translationSpec - .convertAppObject(expectedAppValue); + .translateAppObject(expectedAppValue); GlobalPropertyReportPluginData actualAppValue = translationSpec - .convertInputObject(globalPropertiesPluginDataInput); + .translateInputObject(globalPropertiesPluginDataInput); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -72,10 +73,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(GlobalPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + GlobalPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_TestGlobalPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_TestGlobalPropertyIdTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_TestGlobalPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_TestGlobalPropertyIdTranslationSpec.java index 7f0da99..3c6fd8e 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translationSpecs/AT_TestGlobalPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/translation/specs/AT_TestGlobalPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,11 +6,12 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.globalproperties.testsupport.TestGlobalPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.GlobalPropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.testsupport.input.TestGlobalPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.globalproperties.translation.GlobalPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -25,21 +26,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GlobalPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); TestGlobalPropertyIdTranslationSpec translationSpec = new TestGlobalPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestGlobalPropertyId expectedValue = TestGlobalPropertyId.GLOBAL_PROPERTY_1_BOOLEAN_MUTABLE; - TestGlobalPropertyIdInput inputValue = translationSpec.convertAppObject(expectedValue); + TestGlobalPropertyIdInput inputValue = translationSpec.translateAppObject(expectedValue); - TestGlobalPropertyId actualValue = translationSpec.convertInputObject(inputValue); + TestGlobalPropertyId actualValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedValue, actualValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java deleted file mode 100644 index cd49a81..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslator.java +++ /dev/null @@ -1,75 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_GroupsTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = GroupsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = GroupsTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(GroupsTranslatorId.TRANSLATOR_ID) - .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(PeopleTranslatorId.TRANSLATOR_ID) - .addDependency(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, GroupsTranslator.getTranslator()); - } - -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/AT_GroupsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/AT_GroupsTranslator.java new file mode 100644 index 0000000..5c53b2f --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/AT_GroupsTranslator.java @@ -0,0 +1,44 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_GroupsTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(GroupsTranslator.class, + GroupsTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = GroupsTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(GroupsTranslatorId.TRANSLATOR_ID) + .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(PeopleTranslatorId.TRANSLATOR_ID) + .addDependency(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, GroupsTranslator.getTranslator()); + } + +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/AT_GroupsTranslatorId.java similarity index 84% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/AT_GroupsTranslatorId.java index 4b26325..bb29d28 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/AT_GroupsTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/AT_GroupsTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/IT_GroupsTranslator.java similarity index 60% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/IT_GroupsTranslator.java index 67a449f..d337213 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/IT_GroupsTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,12 +22,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.data.input.GroupsPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.reports.input.GroupPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -43,17 +44,15 @@ public void testGroupsTranslator() { ResourceHelper.createFile(filePath, fileName); - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(protobufTranslationEngine) - .addInputFilePath(filePath.resolve(fileName), GroupsPluginDataInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(protobufTaskitEngine) .build(); long seed = 524805676405822016L; @@ -67,31 +66,20 @@ public void testGroupsTranslator() { people.add(new PersonId(i)); } - List expectedPluginDatas = new ArrayList<>(); - Random random = new Random(seed); - for (int i = 0; i < 10; i++) { - Collections.shuffle(people, new Random(random.nextLong())); - - GroupsPluginData expectedPluginData = GroupsTestPluginFactory.getStandardGroupsPluginData(groupCount, - membershipCount, people, seed); - - expectedPluginDatas.add(expectedPluginData); - - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); - } + Collections.shuffle(people, new Random(random.nextLong())); - List actualPluginDatas = translatorController.getObjects(GroupsPluginData.class); + GroupsPluginData expectedPluginData = GroupsTestPluginFactory.getStandardGroupsPluginData(groupCount, + membershipCount, people, seed); - assertEquals(expectedPluginDatas.size(), actualPluginDatas.size()); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - for (int i = 0; i < expectedPluginDatas.size(); i++) { - assertEquals(expectedPluginDatas.get(i), actualPluginDatas.get(i)); - assertEquals(expectedPluginDatas.get(i).toString(), actualPluginDatas.get(i).toString()); - } + GroupsPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + GroupsPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); + assertEquals(expectedPluginData, actualPluginData); + assertEquals(expectedPluginData.toString(), actualPluginData.toString()); } @Test @@ -101,17 +89,15 @@ public void testGroupPropertyReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build(); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(protobufTranslationEngine) - .addInputFilePath(filePath.resolve(fileName), GroupPropertyReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(protobufTaskitEngine) .build(); RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(524805676405822016L); @@ -134,13 +120,10 @@ public void testGroupPropertyReportTranslatorSpec() { GroupPropertyReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - GroupPropertyReportPluginData actualPluginData = translatorController - .getFirstObject(GroupPropertyReportPluginData.class); + GroupPropertyReportPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), GroupPropertyReportPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupIdTranslationSpec.java similarity index 69% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupIdTranslationSpec.java index eb42d37..19f4a5b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); GroupIdTranslationSpec translationSpec = new GroupIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupId expectedAppValue = new GroupId(0); - GroupIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupId actualAppValue = translationSpec.convertInputObject(inputValue); + GroupId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupMemberFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupMemberFilterTranslationSpec.java similarity index 69% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupMemberFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupMemberFilterTranslationSpec.java index 312ab2d..e1d0292 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupMemberFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupMemberFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,13 +7,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupMemberFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupMemberFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -38,13 +39,13 @@ public void testConvertObject() { .build(); GroupMemberFilterTranslationSpec translationSpec = new GroupMemberFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupMemberFilter expectedAppValue = new GroupMemberFilter(new GroupId(0)); - GroupMemberFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupMemberFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupMemberFilter actualAppValue = translationSpec.convertInputObject(inputValue); + GroupMemberFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPopulationReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPopulationReportPluginDataTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPopulationReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPopulationReportPluginDataTranslationSpec.java index 45af5cf..255ecb3 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPopulationReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPopulationReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -10,13 +10,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.reports.input.GroupPopulationReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -32,8 +33,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -41,7 +42,7 @@ public void testConvertObject() { .build(); GroupPopulationReportPluginDataTranslationSpec translationSpec = new GroupPopulationReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ReportLabel reportLabel = new SimpleReportLabel("property report label"); ReportPeriod reportPeriod = ReportPeriod.DAILY; @@ -53,9 +54,9 @@ public void testConvertObject() { GroupPopulationReportPluginData expectedAppValue = builder.build(); - GroupPopulationReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupPopulationReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupPopulationReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + GroupPopulationReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -63,10 +64,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(GroupPopulationReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + GroupPopulationReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyDimensionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyDimensionTranslationSpec.java similarity index 78% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyDimensionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyDimensionTranslationSpec.java index 6003972..61411f1 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyDimensionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,12 +8,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupId; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyDimension; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyDimensionInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -37,7 +38,7 @@ public void testConvertObject() { .build(); GroupPropertyDimensionTranslationSpec translationSpec = new GroupPropertyDimensionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupPropertyDimension expectedAppValue = GroupPropertyDimension.builder() .setGroupId(new GroupId(0)) @@ -47,9 +48,9 @@ public void testConvertObject() { .addValue(15000.5) .build(); - GroupPropertyDimensionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupPropertyDimensionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupPropertyDimension actualAppValue = translationSpec.convertInputObject(inputValue); + GroupPropertyDimension actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyIdTranslationSpec.java similarity index 71% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyIdTranslationSpec.java index 202cccd..eb5a6bc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -36,13 +37,13 @@ public void testConvertObject() { .build(); GroupPropertyIdTranslationSpec translationSpec = new GroupPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupPropertyId expectedAppValue = TestGroupPropertyId.GROUP_PROPERTY_1_1_BOOLEAN_MUTABLE_NO_TRACK; - GroupPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + GroupPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyReportPluginDataTranslationSpec.java similarity index 79% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyReportPluginDataTranslationSpec.java index 3662b56..12836ca 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -13,13 +13,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.reports.input.GroupPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -36,8 +37,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -45,7 +46,7 @@ public void testConvertObject() { .build(); GroupPropertyReportPluginDataTranslationSpec translationSpec = new GroupPropertyReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(524805676405822016L); @@ -67,9 +68,9 @@ public void testConvertObject() { GroupPropertyReportPluginData expectedAppValue = builder.build(); - GroupPropertyReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupPropertyReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupPropertyReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + GroupPropertyReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -77,10 +78,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(GroupPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + GroupPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupTypeIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupTypeIdTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupTypeIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupTypeIdTranslationSpec.java index fc58c9c..2c390b5 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupTypeIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupTypeIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypeId; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupTypeId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypeIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -36,13 +37,13 @@ public void testConvertObject() { .build(); GroupTypeIdTranslationSpec translationSpec = new GroupTypeIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupTypeId expectedAppValue = TestGroupTypeId.GROUP_TYPE_1; - GroupTypeIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupTypeIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupTypeId actualAppValue = translationSpec.convertInputObject(inputValue); + GroupTypeId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupTypesForPersonFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupTypesForPersonFilterTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupTypesForPersonFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupTypesForPersonFilterTranslationSpec.java index f62864c..7c290bc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupTypesForPersonFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupTypesForPersonFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,13 +7,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupTypesForPersonFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupTypesForPersonFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -38,13 +39,13 @@ public void testConvertObject() { .build(); GroupTypesForPersonFilterTranslationSpec translationSpec = new GroupTypesForPersonFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupTypesForPersonFilter expectedAppValue = new GroupTypesForPersonFilter(Equality.EQUAL, 10); - GroupTypesForPersonFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupTypesForPersonFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupTypesForPersonFilter actualAppValue = translationSpec.convertInputObject(inputValue); + GroupTypesForPersonFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsForPersonAndGroupTypeFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsForPersonAndGroupTypeFilterTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsForPersonAndGroupTypeFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsForPersonAndGroupTypeFilterTranslationSpec.java index fc3a02d..1891b61 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsForPersonAndGroupTypeFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsForPersonAndGroupTypeFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,13 +8,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupsForPersonAndGroupTypeFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupTypeId; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupsForPersonAndGroupTypeFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,8 +30,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -39,14 +40,14 @@ public void testConvertObject() { .build(); GroupsForPersonAndGroupTypeFilterTranslationSpec translationSpec = new GroupsForPersonAndGroupTypeFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupsForPersonAndGroupTypeFilter expectedAppValue = new GroupsForPersonAndGroupTypeFilter( TestGroupTypeId.GROUP_TYPE_1, Equality.EQUAL, 10); - GroupsForPersonAndGroupTypeFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupsForPersonAndGroupTypeFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupsForPersonAndGroupTypeFilter actualAppValue = translationSpec.convertInputObject(inputValue); + GroupsForPersonAndGroupTypeFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsForPersonFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsForPersonFilterTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsForPersonFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsForPersonFilterTranslationSpec.java index 5a6a914..c949002 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsForPersonFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsForPersonFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,13 +7,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.support.GroupsForPersonFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.support.input.GroupsForPersonFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -38,13 +39,13 @@ public void testConvertObject() { .build(); GroupsForPersonFilterTranslationSpec translationSpec = new GroupsForPersonFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); GroupsForPersonFilter expectedAppValue = new GroupsForPersonFilter(Equality.EQUAL, 10); - GroupsForPersonFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupsForPersonFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupsForPersonFilter actualAppValue = translationSpec.convertInputObject(inputValue); + GroupsForPersonFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsPluginDataTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsPluginDataTranslationSpec.java index 21b966c..4cdbd2d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_GroupsPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_GroupsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -14,13 +14,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.GroupsTestPluginFactory; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupTypeId; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.data.input.GroupsPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -36,8 +37,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -45,7 +46,7 @@ public void testConvertObject() { .build(); GroupsPluginDataTranslationSpec translationSpec = new GroupsPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 524805676405822016L; int initialPopulation = 100; @@ -61,9 +62,9 @@ public void testConvertObject() { GroupsPluginData expectedAppValue = GroupsTestPluginFactory.getStandardGroupsPluginData(expectedGroupsPerPerson, expectedPeoplePerGroup, people, seed); - GroupsPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + GroupsPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - GroupsPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + GroupsPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -78,9 +79,9 @@ public void testConvertObject() { .setNextGroupIdValue(101); expectedAppValue = builder.build(); - inputValue = translationSpec.convertAppObject(expectedAppValue); + inputValue = translationSpec.translateAppObject(expectedAppValue); - actualAppValue = translationSpec.convertInputObject(inputValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -88,10 +89,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(GroupsPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(GroupsPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_TestGroupPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_TestGroupPropertyIdTranslationSpec.java similarity index 71% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_TestGroupPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_TestGroupPropertyIdTranslationSpec.java index 0a25bc5..ef43c18 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_TestGroupPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_TestGroupPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.testsupport.input.TestGroupPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); TestGroupPropertyIdTranslationSpec translationSpec = new TestGroupPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestGroupPropertyId expectedAppValue = TestGroupPropertyId.GROUP_PROPERTY_1_1_BOOLEAN_MUTABLE_NO_TRACK; - TestGroupPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestGroupPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestGroupPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + TestGroupPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_TestGroupTypeIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_TestGroupTypeIdTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_TestGroupTypeIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_TestGroupTypeIdTranslationSpec.java index 53a9009..a86e3bc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translationSpecs/AT_TestGroupTypeIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/translation/specs/AT_TestGroupTypeIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.groups.testsupport.TestGroupTypeId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.GroupsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.testsupport.input.TestGroupTypeIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.groups.translation.GroupsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(GroupsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); TestGroupTypeIdTranslationSpec translationSpec = new TestGroupTypeIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestGroupTypeId expectedAppValue = TestGroupTypeId.GROUP_TYPE_1; - TestGroupTypeIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestGroupTypeIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestGroupTypeId actualAppValue = translationSpec.convertInputObject(inputValue); + TestGroupTypeId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java deleted file mode 100644 index 36d5534..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslator.java +++ /dev/null @@ -1,76 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_MaterialsTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = MaterialsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = MaterialsTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(MaterialsTranslatorId.TRANSLATOR_ID) - .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(ResourcesTranslatorId.TRANSLATOR_ID) - .addDependency(RegionsTranslatorId.TRANSLATOR_ID) - .addDependency(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, MaterialsTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/AT_MaterialsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/AT_MaterialsTranslator.java new file mode 100644 index 0000000..117a535 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/AT_MaterialsTranslator.java @@ -0,0 +1,45 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslatorId; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_MaterialsTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(MaterialsTranslator.class, + MaterialsTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = MaterialsTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(MaterialsTranslatorId.TRANSLATOR_ID) + .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(ResourcesTranslatorId.TRANSLATOR_ID) + .addDependency(RegionsTranslatorId.TRANSLATOR_ID) + .addDependency(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, MaterialsTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/AT_MaterialsTranslatorId.java similarity index 83% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/AT_MaterialsTranslatorId.java index fdd0422..6c5f3dc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/AT_MaterialsTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/AT_MaterialsTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/IT_MaterialsTranslator.java similarity index 67% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/IT_MaterialsTranslator.java index 1ddc44a..ae52814 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/IT_MaterialsTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -19,14 +19,14 @@ import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerPropertyReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerResourceReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.StageReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -41,8 +41,8 @@ public void testMaterialsTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(ResourcesTranslator.getTranslator()) @@ -50,8 +50,6 @@ public void testMaterialsTranslator() { .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), MaterialsPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); int numBatches = 50; @@ -61,11 +59,11 @@ public void testMaterialsTranslator() { MaterialsPluginData expectedPluginData = MaterialsTestPluginFactory.getStandardMaterialsPluginData(numBatches, numStages, numBatchesInStage, seed); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - translatorController.readInput(); - MaterialsPluginData actualPluginData = translatorController.getFirstObject(MaterialsPluginData.class); + MaterialsPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + MaterialsPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -78,8 +76,8 @@ public void testBatchStatusReportPluginDataTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -87,8 +85,6 @@ public void testBatchStatusReportPluginDataTranslatorSpec() { .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), BatchStatusReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); BatchStatusReportPluginData.Builder builder = BatchStatusReportPluginData.builder(); @@ -99,13 +95,11 @@ public void testBatchStatusReportPluginDataTranslatorSpec() { BatchStatusReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - translatorController.readInput(); - - BatchStatusReportPluginData actualPluginData = translatorController - .getFirstObject(BatchStatusReportPluginData.class); + BatchStatusReportPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + BatchStatusReportPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -118,8 +112,8 @@ public void testMaterialsProducerPropertyReportPluginDataTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -127,8 +121,6 @@ public void testMaterialsProducerPropertyReportPluginDataTranslatorSpec() { .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), MaterialsProducerPropertyReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); MaterialsProducerPropertyReportPluginData.Builder builder = MaterialsProducerPropertyReportPluginData.builder(); @@ -138,13 +130,12 @@ public void testMaterialsProducerPropertyReportPluginDataTranslatorSpec() { MaterialsProducerPropertyReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - MaterialsProducerPropertyReportPluginData actualPluginData = translatorController - .getFirstObject(MaterialsProducerPropertyReportPluginData.class); + MaterialsProducerPropertyReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), MaterialsProducerPropertyReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -157,8 +148,8 @@ public void testMaterialsProducerResourceReportPluginDataTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -166,8 +157,6 @@ public void testMaterialsProducerResourceReportPluginDataTranslatorSpec() { .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), MaterialsProducerResourceReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); MaterialsProducerResourceReportPluginData.Builder builder = MaterialsProducerResourceReportPluginData.builder(); @@ -178,12 +167,12 @@ public void testMaterialsProducerResourceReportPluginDataTranslatorSpec() { MaterialsProducerResourceReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - MaterialsProducerResourceReportPluginData actualPluginData = translatorController - .getFirstObject(MaterialsProducerResourceReportPluginData.class); + MaterialsProducerResourceReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), MaterialsProducerResourceReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -196,8 +185,8 @@ public void testStageReportPluginDataTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -205,8 +194,6 @@ public void testStageReportPluginDataTranslatorSpec() { .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), StageReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); StageReportPluginData.Builder builder = StageReportPluginData.builder(); @@ -217,11 +204,11 @@ public void testStageReportPluginDataTranslatorSpec() { StageReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - StageReportPluginData actualPluginData = translatorController.getFirstObject(StageReportPluginData.class); + StageReportPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + StageReportPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchIdTranslationSpec.java similarity index 66% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchIdTranslationSpec.java index 09f5ff6..4db478d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,14 +6,15 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -39,13 +40,13 @@ public void testConvertObject() { .build(); BatchIdTranslationSpec translationSpec = new BatchIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); BatchId expectedAppValue = new BatchId(0); - BatchIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + BatchIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - BatchId actualAppValue = translationSpec.convertInputObject(inputValue); + BatchId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchPropertyIdTranslationSpec.java similarity index 68% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchPropertyIdTranslationSpec.java index 5837586..2c5665b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,14 +7,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.BatchPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestBatchPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.BatchPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,8 +30,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -40,13 +41,13 @@ public void testConvertObject() { .build(); BatchPropertyIdTranslationSpec translationSpec = new BatchPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); BatchPropertyId expectedAppValue = TestBatchPropertyId.BATCH_PROPERTY_1_1_BOOLEAN_IMMUTABLE_NO_TRACK; - BatchPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + BatchPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - BatchPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + BatchPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchStatusReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchStatusReportPluginDataTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchStatusReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchStatusReportPluginDataTranslationSpec.java index 7ca1efb..99aeff7 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_BatchStatusReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_BatchStatusReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,15 +9,16 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.BatchStatusReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.BatchStatusReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -33,8 +34,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -44,7 +45,7 @@ public void testConvertObject() { .build(); BatchStatusReportPluginDataTranslationSpec translationSpec = new BatchStatusReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); BatchStatusReportPluginData.Builder builder = BatchStatusReportPluginData.builder(); @@ -54,9 +55,9 @@ public void testConvertObject() { BatchStatusReportPluginData expectedAppValue = builder.build(); - BatchStatusReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + BatchStatusReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - BatchStatusReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + BatchStatusReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -64,10 +65,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(BatchStatusReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + BatchStatusReportPluginDataInput.newBuilder().setVersion("badVersion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialIdTranslationSpec.java similarity index 67% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialIdTranslationSpec.java index 546adc5..69bc68e 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,14 +7,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialId; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,8 +30,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -40,13 +41,13 @@ public void testConvertObject() { .build(); MaterialIdTranslationSpec translationSpec = new MaterialIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); MaterialId expectedAppValue = TestMaterialId.MATERIAL_1; - MaterialIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + MaterialIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - MaterialId actualAppValue = translationSpec.convertInputObject(inputValue); + MaterialId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsPluginDataTranslationSpec.java similarity index 68% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsPluginDataTranslationSpec.java index 7cc70dc..48a4fae 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,15 +8,16 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.datamangers.MaterialsPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.MaterialsTestPluginFactory; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.data.input.MaterialsPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -32,8 +33,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -43,7 +44,7 @@ public void testConvertObject() { .build(); MaterialsPluginDataTranslationSpec translationSpec = new MaterialsPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); int numBatches = 50; int numStages = 10; @@ -53,9 +54,9 @@ public void testConvertObject() { MaterialsPluginData expectedAppValue = MaterialsTestPluginFactory.getStandardMaterialsPluginData(numBatches, numStages, numBatchesInStage, seed); - MaterialsPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + MaterialsPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - MaterialsPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + MaterialsPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -63,10 +64,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(MaterialsPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec + .translateInputObject(MaterialsPluginDataInput.newBuilder().setVersion("badVersion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerIdTranslationSpec.java similarity index 68% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerIdTranslationSpec.java index 0caa863..7c3ec6d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,14 +7,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerId; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialsProducerId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialsProducerIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,8 +30,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -40,13 +41,13 @@ public void testConvertObject() { .build(); MaterialsProducerIdTranslationSpec translationSpec = new MaterialsProducerIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); MaterialsProducerId expectedAppValue = TestMaterialsProducerId.MATERIALS_PRODUCER_1; - MaterialsProducerIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + MaterialsProducerIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - MaterialsProducerId actualAppValue = translationSpec.convertInputObject(inputValue); + MaterialsProducerId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerPropertyIdTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerPropertyIdTranslationSpec.java index 799f63e..90eeadf 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,14 +7,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.MaterialsProducerPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialsProducerPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.MaterialsProducerPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,8 +30,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -40,13 +41,13 @@ public void testConvertObject() { .build(); MaterialsProducerPropertyIdTranslationSpec translationSpec = new MaterialsProducerPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); MaterialsProducerPropertyId expectedAppValue = TestMaterialsProducerPropertyId.MATERIALS_PRODUCER_PROPERTY_2_INTEGER_MUTABLE_NO_TRACK; - MaterialsProducerPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + MaterialsProducerPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - MaterialsProducerPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + MaterialsProducerPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerPropertyReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerPropertyReportPluginDataTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerPropertyReportPluginDataTranslationSpec.java index 95f30c2..40121d8 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,15 +9,16 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.MaterialsProducerPropertyReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -33,8 +34,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -44,7 +45,7 @@ public void testConvertObject() { .build(); MaterialsProducerPropertyReportPluginDataTranslationSpec translationSpec = new MaterialsProducerPropertyReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); MaterialsProducerPropertyReportPluginData.Builder builder = MaterialsProducerPropertyReportPluginData.builder(); ReportLabel reportLabel = new SimpleReportLabel("materials producer property report report label"); @@ -53,9 +54,10 @@ public void testConvertObject() { MaterialsProducerPropertyReportPluginData expectedAppValue = builder.build(); - MaterialsProducerPropertyReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + MaterialsProducerPropertyReportPluginDataInput inputValue = translationSpec + .translateAppObject(expectedAppValue); - MaterialsProducerPropertyReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + MaterialsProducerPropertyReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -63,10 +65,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(MaterialsProducerPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + MaterialsProducerPropertyReportPluginDataInput.newBuilder().setVersion("badVersion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerResourceReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerResourceReportPluginDataTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerResourceReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerResourceReportPluginDataTranslationSpec.java index 68ad4cc..7e62ee4 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_MaterialsProducerResourceReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_MaterialsProducerResourceReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,15 +9,16 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.MaterialsProducerResourceReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.MaterialsProducerResourceReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -33,8 +34,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -44,7 +45,7 @@ public void testConvertObject() { .build(); MaterialsProducerResourceReportPluginDataTranslationSpec translationSpec = new MaterialsProducerResourceReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); MaterialsProducerResourceReportPluginData.Builder builder = MaterialsProducerResourceReportPluginData.builder(); @@ -54,9 +55,10 @@ public void testConvertObject() { MaterialsProducerResourceReportPluginData expectedAppValue = builder.build(); - MaterialsProducerResourceReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + MaterialsProducerResourceReportPluginDataInput inputValue = translationSpec + .translateAppObject(expectedAppValue); - MaterialsProducerResourceReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + MaterialsProducerResourceReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -64,10 +66,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(MaterialsProducerResourceReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + MaterialsProducerResourceReportPluginDataInput.newBuilder().setVersion("badVersion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_StageIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_StageIdTranslationSpec.java similarity index 66% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_StageIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_StageIdTranslationSpec.java index 5efb9f6..52cf377 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_StageIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_StageIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,14 +6,15 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.support.StageId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.support.input.StageIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -39,13 +40,13 @@ public void testConvertObject() { .build(); StageIdTranslationSpec translationSpec = new StageIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); StageId expectedAppValue = new StageId(0); - StageIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + StageIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - StageId actualAppValue = translationSpec.convertInputObject(inputValue); + StageId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_StageReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_StageReportPluginDataTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_StageReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_StageReportPluginDataTranslationSpec.java index 115f711..754b32e 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_StageReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_StageReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,15 +9,16 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.reports.StageReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.reports.input.StageReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -33,8 +34,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -44,7 +45,7 @@ public void testConvertObject() { .build(); StageReportPluginDataTranslationSpec translationSpec = new StageReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); StageReportPluginData.Builder builder = StageReportPluginData.builder(); @@ -54,9 +55,9 @@ public void testConvertObject() { StageReportPluginData expectedAppValue = builder.build(); - StageReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + StageReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - StageReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + StageReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -64,10 +65,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(StageReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec + .translateInputObject(StageReportPluginDataInput.newBuilder().setVersion("badVersion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestBatchPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestBatchPropertyIdTranslationSpec.java similarity index 68% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestBatchPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestBatchPropertyIdTranslationSpec.java index 52fdf7e..6bbf8bc 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestBatchPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestBatchPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,14 +6,15 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestBatchPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestBatchPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -39,13 +40,13 @@ public void testConvertObject() { .build(); TestBatchPropertyIdTranslationSpec translationSpec = new TestBatchPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestBatchPropertyId expectedAppValue = TestBatchPropertyId.BATCH_PROPERTY_1_1_BOOLEAN_IMMUTABLE_NO_TRACK; - TestBatchPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestBatchPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestBatchPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + TestBatchPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialIdTranslationSpec.java similarity index 67% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialIdTranslationSpec.java index e6ee8a3..d92795d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,14 +6,15 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestMaterialIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -39,13 +40,13 @@ public void testConvertObject() { .build(); TestMaterialIdTranslationSpec translationSpec = new TestMaterialIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestMaterialId expectedAppValue = TestMaterialId.MATERIAL_1; - TestMaterialIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestMaterialIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestMaterialId actualAppValue = translationSpec.convertInputObject(inputValue); + TestMaterialId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialsProducerIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialsProducerIdTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialsProducerIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialsProducerIdTranslationSpec.java index 4414f8d..e999931 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialsProducerIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialsProducerIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,14 +6,15 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialsProducerId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestMaterialsProducerIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -39,13 +40,13 @@ public void testConvertObject() { .build(); TestMaterialsProducerIdTranslationSpec translationSpec = new TestMaterialsProducerIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestMaterialsProducerId expectedAppValue = TestMaterialsProducerId.MATERIALS_PRODUCER_1; - TestMaterialsProducerIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestMaterialsProducerIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestMaterialsProducerId actualAppValue = translationSpec.convertInputObject(inputValue); + TestMaterialsProducerId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialsProducerPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialsProducerPropertyIdTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialsProducerPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialsProducerPropertyIdTranslationSpec.java index cfdfc45..6d2bf43 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translationSpecs/AT_TestMaterialsProducerPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/translation/specs/AT_TestMaterialsProducerPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,14 +6,15 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.materials.testsupport.TestMaterialsProducerPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.MaterialsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.testsupport.input.TestMaterialsProducerPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.materials.translation.MaterialsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(MaterialsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) @@ -39,13 +40,13 @@ public void testConvertObject() { .build(); TestMaterialsProducerPropertyIdTranslationSpec translationSpec = new TestMaterialsProducerPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestMaterialsProducerPropertyId expectedAppValue = TestMaterialsProducerPropertyId.MATERIALS_PRODUCER_PROPERTY_1_BOOLEAN_MUTABLE_NO_TRACK; - TestMaterialsProducerPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestMaterialsProducerPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestMaterialsProducerPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + TestMaterialsProducerPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java deleted file mode 100644 index 660371e..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslator.java +++ /dev/null @@ -1,69 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_PartitionsTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PartitionsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = PartitionsTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - - Translator expectedTranslator = Translator.builder() - .setTranslatorId(PartitionsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, PartitionsTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/AT_TestFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/AT_TestFilterTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/AT_TestFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/AT_TestFilterTranslationSpec.java index 6e740df..63b31a8 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/AT_TestFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/AT_TestFilterTranslationSpec.java @@ -1,14 +1,15 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.input.TestFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,21 +24,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); TestFilterTranslationSpec translationSpec = new TestFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestFilter expectedAppValue = new TestFilter(0); - TestFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestFilter actualAppValue = translationSpec.convertInputObject(inputValue); + TestFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/AT_TestLabelerTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/AT_TestLabelerTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/AT_TestLabelerTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/AT_TestLabelerTranslationSpec.java index 6d637c1..17fcfe1 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translationSpecs/AT_TestLabelerTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/testsupport/translation/specs/AT_TestLabelerTranslationSpec.java @@ -1,14 +1,15 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.junit.jupiter.api.Test; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestLabeler; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.input.TestLabelerInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,21 +24,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); TestLabelerTranslationSpec translationSpec = new TestLabelerTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestLabeler expectedAppValue = new TestLabeler("test"); - TestLabelerInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestLabelerInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestLabeler actualAppValue = translationSpec.convertInputObject(inputValue); + TestLabeler actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/AT_PartitionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/AT_PartitionsTranslator.java new file mode 100644 index 0000000..141661f --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/AT_PartitionsTranslator.java @@ -0,0 +1,38 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_PartitionsTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(PartitionsTranslator.class, + PartitionsTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = PartitionsTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + + Translator expectedTranslator = Translator.builder() + .setTranslatorId(PartitionsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, PartitionsTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/AT_PartitionsTranslatorId.java similarity index 83% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/AT_PartitionsTranslatorId.java index 68f0495..f0cdf40 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/AT_PartitionsTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/AT_PartitionsTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/IT_PartitionsTranslator.java similarity index 61% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/IT_PartitionsTranslator.java index 1533094..6e95f78 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/IT_PartitionsTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,11 +8,11 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.datamanagers.PartitionsPluginData; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.data.input.PartitionsPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -27,24 +27,21 @@ public void testGroupsTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), PartitionsPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); PartitionsPluginData expectedPluginData = PartitionsPluginData.builder().setRunContinuitySupport(true).build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - translatorController.readInput(); - - PartitionsPluginData actualPluginData = translatorController.getFirstObject(PartitionsPluginData.class); + PartitionsPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + PartitionsPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AndFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AndFilterTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AndFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AndFilterTranslationSpec.java index 6f2e4ee..a7b225d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AndFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AndFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.AndFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.AndFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,24 +28,24 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); AndFilterTranslationSpec translationSpec = new AndFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Filter filterA = new TestFilter(0); Filter filterB = new TestFilter(1); AndFilter expectedAppValue = new AndFilter(filterA, filterB); - AndFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + AndFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - AndFilter actualAppValue = translationSpec.convertInputObject(inputValue); + AndFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AttributeFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AttributeFilterTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AttributeFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AttributeFilterTranslationSpec.java index 7757a68..bbd79a0 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AttributeFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AttributeFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,11 +8,12 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.testsupport.attributes.support.AttributeFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.testsupport.attributes.support.TestAttributeId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.attributes.input.AttributeFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,21 +28,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); AttributeFilterTranslationSpec translationSpec = new AttributeFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); AttributeFilter expectedAppValue = new AttributeFilter(TestAttributeId.BOOLEAN_0, Equality.EQUAL, "test"); - AttributeFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + AttributeFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - AttributeFilter actualAppValue = translationSpec.convertInputObject(inputValue); + AttributeFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AttributeIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AttributeIdTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AttributeIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AttributeIdTranslationSpec.java index 907e6f8..88cda1a 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_AttributeIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_AttributeIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,11 +7,12 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.testsupport.attributes.support.AttributeId; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.testsupport.attributes.support.TestAttributeId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.attributes.input.AttributeIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,21 +27,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); AttributeIdTranslationSpec translationSpec = new AttributeIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); AttributeId expectedAppValue = TestAttributeId.BOOLEAN_0; - AttributeIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + AttributeIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - AttributeId actualAppValue = translationSpec.convertInputObject(inputValue); + AttributeId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_EqualityTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_EqualityTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_EqualityTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_EqualityTranslationSpec.java index adfedbb..fe07423 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_EqualityTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_EqualityTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,11 +6,12 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.EqualityInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -25,21 +26,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); EqualityTranslationSpec translationSpec = new EqualityTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Equality expectedAppValue = Equality.EQUAL; - EqualityInput inputValue = translationSpec.convertAppObject(expectedAppValue); + EqualityInput inputValue = translationSpec.translateAppObject(expectedAppValue); - Equality actualAppValue = translationSpec.convertInputObject(inputValue); + Equality actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_FalseFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_FalseFilterTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_FalseFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_FalseFilterTranslationSpec.java index 2dc73c1..7e640fe 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_FalseFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_FalseFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,11 +6,12 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.FalseFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FalseFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -25,21 +26,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); FalseFilterTranslationSpec translationSpec = new FalseFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); FalseFilter expectedAppValue = new FalseFilter(); - FalseFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + FalseFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - FalseFilter actualAppValue = translationSpec.convertInputObject(inputValue); + FalseFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_FilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_FilterTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_FilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_FilterTranslationSpec.java index cf5a28d..97a3fa2 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_FilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_FilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.FilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,21 +27,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); FilterTranslationSpec translationSpec = new FilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Filter expectedAppValue = new TestFilter(0); - FilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + FilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - Filter actualAppValue = translationSpec.convertInputObject(inputValue); + Filter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_LabelerTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_LabelerTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_LabelerTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_LabelerTranslationSpec.java index 8e5887e..0f9b345 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_LabelerTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_LabelerTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Labeler; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.LabelerInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestLabeler; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,21 +27,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); LabelerTranslationSpec translationSpec = new LabelerTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Labeler expectedAppValue = new TestLabeler("test"); - LabelerInput inputValue = translationSpec.convertAppObject(expectedAppValue); + LabelerInput inputValue = translationSpec.translateAppObject(expectedAppValue); - Labeler actualAppValue = translationSpec.convertInputObject(inputValue); + Labeler actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_NotFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_NotFilterTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_NotFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_NotFilterTranslationSpec.java index 5831b35..ed46d56 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_NotFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_NotFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.NotFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.NotFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,23 +28,23 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); NotFilterTranslationSpec translationSpec = new NotFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Filter filterA = new TestFilter(0); NotFilter expectedAppValue = new NotFilter(filterA); - NotFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + NotFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - NotFilter actualAppValue = translationSpec.convertInputObject(inputValue); + NotFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_OrFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_OrFilterTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_OrFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_OrFilterTranslationSpec.java index bd69b41..fac058d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_OrFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_OrFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.OrFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.OrFilterInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,24 +28,24 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); OrFilterTranslationSpec translationSpec = new OrFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Filter filterA = new TestFilter(0); Filter filterB = new TestFilter(1); OrFilter expectedAppValue = new OrFilter(filterA, filterB); - OrFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + OrFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - OrFilter actualAppValue = translationSpec.convertInputObject(inputValue); + OrFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_PartitionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_PartitionTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_PartitionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_PartitionTranslationSpec.java index 6a4724a..4864f26 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_PartitionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_PartitionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,13 +8,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Labeler; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Partition; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.Filter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.input.PartitionInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestFilter; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.TestLabeler; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,15 +30,15 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); PartitionTranslationSpec translationSpec = new PartitionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Filter partitionFilter = new TestFilter(0); Labeler partitionLabeler = new TestLabeler("Test"); @@ -47,17 +48,17 @@ public void testConvertObject() { .addLabeler(partitionLabeler) .build(); - PartitionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PartitionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - Partition actualAppValue = translationSpec.convertInputObject(inputValue); + Partition actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); expectedAppValue = Partition.builder().addLabeler(partitionLabeler).build(); - inputValue = translationSpec.convertAppObject(expectedAppValue); + inputValue = translationSpec.translateAppObject(expectedAppValue); - actualAppValue = translationSpec.convertInputObject(inputValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_PartitionsPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_PartitionsPluginDataTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_PartitionsPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_PartitionsPluginDataTranslationSpec.java index 79f80e5..0ada451 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_PartitionsPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_PartitionsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.datamanagers.PartitionsPluginData; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.data.input.PartitionsPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,29 +29,29 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); PartitionsPluginDataTranslationSpec translationSpec = new PartitionsPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); PartitionsPluginData expectedAppValue = PartitionsPluginData.builder().setRunContinuitySupport(true).build(); - PartitionsPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PartitionsPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PartitionsPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + PartitionsPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); expectedAppValue = PartitionsPluginData.builder().setRunContinuitySupport(false).build(); - inputValue = translationSpec.convertAppObject(expectedAppValue); - actualAppValue = translationSpec.convertInputObject(inputValue); + inputValue = translationSpec.translateAppObject(expectedAppValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -58,10 +59,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(PartitionsPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec + .translateInputObject(PartitionsPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_TestAttributeIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_TestAttributeIdTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_TestAttributeIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_TestAttributeIdTranslationSpec.java index b01a8fe..74a70ad 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_TestAttributeIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_TestAttributeIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,11 +6,12 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.testsupport.attributes.support.TestAttributeId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.input.TestAttributeIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -25,21 +26,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); TestAttributeIdTranslationSpec translationSpec = new TestAttributeIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestAttributeId expectedAppValue = TestAttributeId.BOOLEAN_0; - TestAttributeIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestAttributeIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestAttributeId actualAppValue = translationSpec.convertInputObject(inputValue); + TestAttributeId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_TrueFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_TrueFilterTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_TrueFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_TrueFilterTranslationSpec.java index bce90a4..b988a45 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translationSpecs/AT_TrueFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/translation/specs/AT_TrueFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,11 +6,12 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.filters.TrueFilter; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.support.filters.input.TrueFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestFilterTranslationSpec; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translationSpecs.TestLabelerTranslationSpec; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestFilterTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.testsupport.translation.specs.TestLabelerTranslationSpec; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -25,21 +26,21 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslationSpec(new TestFilterTranslationSpec()) .addTranslationSpec(new TestLabelerTranslationSpec()) .addTranslator(PartitionsTranslator.getTranslator()) .build(); TrueFilterTranslationSpec translationSpec = new TrueFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TrueFilter expectedAppValue = new TrueFilter(); - TrueFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TrueFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TrueFilter actualAppValue = translationSpec.convertInputObject(inputValue); + TrueFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java deleted file mode 100644 index ea49150..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslator.java +++ /dev/null @@ -1,69 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_PeopleTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PeopleTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = PeopleTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - - Translator expectedTranslator = Translator.builder() - .setTranslatorId(PeopleTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, PeopleTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/AT_PeopleTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/AT_PeopleTranslator.java new file mode 100644 index 0000000..992425e --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/AT_PeopleTranslator.java @@ -0,0 +1,38 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_PeopleTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(PeopleTranslator.class, + PeopleTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = PeopleTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + + Translator expectedTranslator = Translator.builder() + .setTranslatorId(PeopleTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, PeopleTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/AT_PeopleTranslatorId.java similarity index 84% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/AT_PeopleTranslatorId.java index a1773b1..1e4f961 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/AT_PeopleTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/AT_PeopleTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/IT_PeopleTranslator.java similarity index 64% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/IT_PeopleTranslator.java index c3e8ef6..9ec7af7 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/IT_PeopleTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,9 +10,9 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.people.datamanagers.PeoplePluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonRange; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.data.input.PeoplePluginDataInput; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -28,11 +28,9 @@ public void testPeopleTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine( - ProtobufTranslationEngine.builder().addTranslator(PeopleTranslator.getTranslator()).build()) - .addInputFilePath(filePath.resolve(fileName), PeoplePluginDataInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine( + ProtobufJsonTaskitEngine.builder().addTranslator(PeopleTranslator.getTranslator()).build()) .build(); PeoplePluginData.Builder builder = PeoplePluginData.builder(); @@ -47,11 +45,11 @@ public void testPeopleTranslator() { PeoplePluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - PeoplePluginData actualPluginData = translatorController.getFirstObject(PeoplePluginData.class); + PeoplePluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + PeoplePluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PeoplePluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PeoplePluginDataTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PeoplePluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PeoplePluginDataTranslationSpec.java index 7bcc8a8..23a4c73 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PeoplePluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PeoplePluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,10 +9,11 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.people.datamanagers.PeoplePluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonRange; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.data.input.PeoplePluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,13 +30,13 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PeopleTranslator.getTranslator()) .build(); PeoplePluginDataTranslationSpec translationSpec = new PeoplePluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); PeoplePluginData.Builder builder = PeoplePluginData.builder(); RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(6573670690105604419L); @@ -49,16 +50,16 @@ public void testConvertObject() { PeoplePluginData expectedAppValue = builder.build(); - PeoplePluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PeoplePluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PeoplePluginData actualAppValue = translationSpec.convertInputObject(inputValue); + PeoplePluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); inputValue = inputValue.toBuilder().clearPersonCount().build(); - actualAppValue = translationSpec.convertInputObject(inputValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -66,10 +67,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(PeoplePluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(PeoplePluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PersonIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PersonIdTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PersonIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PersonIdTranslationSpec.java index ea1ece9..b4f0b13 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PersonIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PersonIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.support.input.PersonIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,19 +24,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PeopleTranslator.getTranslator()) .build(); PersonIdTranslationSpec translationSpec = new PersonIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); PersonId expectedAppValue = new PersonId(0); - PersonIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonId actualAppValue = translationSpec.convertInputObject(inputValue); + PersonId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PersonRangeTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PersonRangeTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PersonRangeTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PersonRangeTranslationSpec.java index a92ee97..1078fef 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translationSpecs/AT_PersonRangeTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/translation/specs/AT_PersonRangeTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonRange; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.support.input.PersonRangeInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,19 +24,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PeopleTranslator.getTranslator()) .build(); PersonRangeTranslationSpec translationSpec = new PersonRangeTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); PersonRange expectedAppValue = new PersonRange(1 * 15, (2 * 15) + 1); - PersonRangeInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonRangeInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonRange actualAppValue = translationSpec.convertInputObject(inputValue); + PersonRange actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslator.java deleted file mode 100644 index a64350e..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslator.java +++ /dev/null @@ -1,75 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_PersonPropertiesTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PersonPropertiesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = PersonPropertiesTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(PersonPropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(PeopleTranslatorId.TRANSLATOR_ID) - .addDependency(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, PersonPropertiesTranslator.getTranslator()); - } - -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/AT_PersonPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/AT_PersonPropertiesTranslator.java new file mode 100644 index 0000000..0361821 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/AT_PersonPropertiesTranslator.java @@ -0,0 +1,44 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_PersonPropertiesTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(PersonPropertiesTranslator.class, + PersonPropertiesTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = PersonPropertiesTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(PersonPropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(PeopleTranslatorId.TRANSLATOR_ID) + .addDependency(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, PersonPropertiesTranslator.getTranslator()); + } + +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/AT_PersonPropertiesTranslatorId.java similarity index 96% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/AT_PersonPropertiesTranslatorId.java index 3bb8e2f..e2c9687 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/AT_PersonPropertiesTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/AT_PersonPropertiesTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/IT_PersonPropertiesTranslator.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/IT_PersonPropertiesTranslator.java index 483bd29..9a0d582 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/IT_PersonPropertiesTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -21,15 +21,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.data.input.PersonPropertiesPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.reports.input.PersonPropertyInteractionReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.reports.input.PersonPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -45,34 +45,31 @@ public void testPersonPropertiesTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), PersonPropertiesPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 4684903523797799712L; - int initialPoptulation = 100; + int initialPopulation = 100; List people = new ArrayList<>(); - for (int i = 0; i < initialPoptulation; i++) { + for (int i = 0; i < initialPopulation; i++) { people.add(new PersonId(i)); } PersonPropertiesPluginData expectedPluginData = PersonPropertiesTestPluginFactory .getStandardPersonPropertiesPluginData(people, seed); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - PersonPropertiesPluginData actualPluginData = translatorController - .getFirstObject(PersonPropertiesPluginData.class); + PersonPropertiesPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + PersonPropertiesPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -85,15 +82,13 @@ public void testPersonPropertyReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), PersonPropertyReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 4684903523797799712L; @@ -119,12 +114,12 @@ public void testPersonPropertyReportTranslatorSpec() { PersonPropertyReportPluginData expectedPluginData = personPropertyReportPluginDataBuilder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - PersonPropertyReportPluginData actualPluginData = translatorController - .getFirstObject(PersonPropertyReportPluginData.class); + PersonPropertyReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), PersonPropertyReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -137,15 +132,13 @@ public void testPersonInteractionReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), PersonPropertyInteractionReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 4684903523797799712L; @@ -168,12 +161,12 @@ public void testPersonInteractionReportTranslatorSpec() { PersonPropertyInteractionReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - PersonPropertyInteractionReportPluginData actualPluginData = translatorController - .getFirstObject(PersonPropertyInteractionReportPluginData.class); + PersonPropertyInteractionReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), PersonPropertyInteractionReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/MT_PersonPropertiesTranslator.java similarity index 56% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/MT_PersonPropertiesTranslator.java index e4b5c10..e2ffc30 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/MT_PersonPropertiesTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation; import java.nio.file.Path; import java.util.ArrayList; @@ -7,30 +7,31 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.datamanagers.PersonPropertiesPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.testsupport.PersonPropertiesTestPluginFactory; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.data.input.PersonPropertiesPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; import gov.hhs.aspr.ms.util.time.TimeElapser; public class MT_PersonPropertiesTranslator { - long seed = 4684903523797799712L; - String times = ""; - Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); - ProtobufTranslationEngine protobufTranslationEngine; - TimeElapser timeElapser = new TimeElapser(); - PersonPropertiesPluginData pluginData; - PersonPropertiesPluginDataInput inputPluginData; - TranslationController translationController; + private long seed = 4684903523797799712L; + private String times = ""; + private Path basePath = ResourceHelper.getResourceDir(this.getClass()); + private Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); + private ProtobufTaskitEngine protobufTaskitEngine; + private TimeElapser timeElapser = new TimeElapser(); + private PersonPropertiesPluginData pluginData; + private PersonPropertiesPluginDataInput inputPluginData; + private TaskitEngineManager taskitEngineManager; private MT_PersonPropertiesTranslator() { - protobufTranslationEngine = ProtobufTranslationEngine.builder() + this.protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -43,11 +44,7 @@ private void createPluginData(int population) { ResourceHelper.createFile(filePath, fileName); - this.translationController = TranslationController.builder() - .addTranslationEngine(this.protobufTranslationEngine) - .addInputFilePath(filePath.resolve(fileName), PersonPropertiesPluginDataInput.class, - TranslationEngineType.PROTOBUF) - .build(); + this.taskitEngineManager = TaskitEngineManager.builder().addTaskitEngine(this.protobufTaskitEngine).build(); List people = new ArrayList<>(); for (int i = 0; i < population; i++) { @@ -61,10 +58,21 @@ private void createPluginData(int population) { this.times.concat(elapsedTime + ","); } - public void convertPluginDataToInput() { + private void convertPluginDataToInput() { + this.timeElapser.reset(); + // convert data + this.inputPluginData = this.protobufTaskitEngine.translateObject(this.pluginData); + double elapsedTime = this.timeElapser.getElapsedMilliSeconds(); + this.times.concat(elapsedTime + ","); + + this.pluginData = null; + System.gc(); + } + + private void convertPluginDataToApp() { this.timeElapser.reset(); // convert data - this.inputPluginData = this.protobufTranslationEngine.convertObject(this.pluginData); + this.pluginData = this.protobufTaskitEngine.translateObject(this.inputPluginData); double elapsedTime = this.timeElapser.getElapsedMilliSeconds(); this.times.concat(elapsedTime + ","); @@ -76,8 +84,8 @@ private void writeOutput(int population) { String fileName = "personPropertiesPluginData_mt-" + population + ".json"; this.timeElapser.reset(); - this.translationController.writeOutput(this.inputPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); + this.taskitEngineManager.write(filePath.resolve(fileName), this.inputPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); double elapsedTime = this.timeElapser.getElapsedMilliSeconds(); this.times.concat(elapsedTime + ","); @@ -85,10 +93,13 @@ private void writeOutput(int population) { System.gc(); } - private void readInput() { + private void readInput(int population) { + String fileName = "personPropertiesPluginData_mt-" + population + ".json"; this.timeElapser.reset(); - this.translationController.readInput(); + this.inputPluginData = this.taskitEngineManager.read(filePath.resolve(fileName), + PersonPropertiesPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); + double elapsedTime = this.timeElapser.getElapsedMilliSeconds(); this.times.concat(Double.toString(elapsedTime)); } @@ -104,7 +115,7 @@ private void clearTimesString() { public static void main(String[] args) { MT_PersonPropertiesTranslator test = new MT_PersonPropertiesTranslator(); - System.out.println("Population,Generating Data,Converting Data,Writing Data,Reading and Converting Data"); + System.out.println("Population,Generate,Translate,Write,Read,Translate"); for (int i = 0; i < 1_000_000; i += 5000) { if (i == 0) @@ -113,7 +124,8 @@ public static void main(String[] args) { test.createPluginData(i); test.convertPluginDataToInput(); test.writeOutput(i); - test.readInput(); + test.readInput(i); + test.convertPluginDataToApp(); System.out.println(test.times); test.clearTimesString(); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertiesPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertiesPluginDataTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertiesPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertiesPluginDataTranslationSpec.java index 653af02..0cfeb6a 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertiesPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertiesPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -12,13 +12,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.datamanagers.PersonPropertiesPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.testsupport.PersonPropertiesTestPluginFactory; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.data.input.PersonPropertiesPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -34,8 +35,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -43,7 +44,7 @@ public void testConvertObject() { .build(); PersonPropertiesPluginDataTranslationSpec translationSpec = new PersonPropertiesPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 4684903523797799712L; int initialPoptulation = 100; @@ -56,9 +57,9 @@ public void testConvertObject() { PersonPropertiesPluginData expectedAppValue = PersonPropertiesTestPluginFactory .getStandardPersonPropertiesPluginData(people, seed, 5.0); - PersonPropertiesPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonPropertiesPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonPropertiesPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + PersonPropertiesPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -66,10 +67,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(PersonPropertiesPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + PersonPropertiesPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyDimensionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyDimensionTranslationSpec.java similarity index 79% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyDimensionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyDimensionTranslationSpec.java index df033e3..b281357 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyDimensionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.support.PersonPropertyDimension; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.testsupport.TestPersonPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyDimensionInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -36,7 +37,7 @@ public void testConvertObject() { .build(); PersonPropertyDimensionTranslationSpec translationSpec = new PersonPropertyDimensionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); PersonPropertyDimension expectedAppValue = PersonPropertyDimension.builder() .setPersonPropertyId(TestPersonPropertyId.PERSON_PROPERTY_6_DOUBLE_MUTABLE_TRACK) @@ -46,9 +47,9 @@ public void testConvertObject() { .addValue(15000.5) .build(); - PersonPropertyDimensionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonPropertyDimensionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonPropertyDimension actualAppValue = translationSpec.convertInputObject(inputValue); + PersonPropertyDimension actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyFilterTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyFilterTranslationSpec.java index a659e47..2488322 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,13 +8,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.support.PersonPropertyFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.testsupport.TestPersonPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -29,8 +30,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -39,15 +40,15 @@ public void testConvertObject() { .build(); PersonPropertyFilterTranslationSpec translationSpec = new PersonPropertyFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); Equality equality = Equality.LESS_THAN; PersonPropertyFilter expectedAppValue = new PersonPropertyFilter( TestPersonPropertyId.PERSON_PROPERTY_1_BOOLEAN_MUTABLE_NO_TRACK, equality, false); - PersonPropertyFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonPropertyFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonPropertyFilter actualAppValue = translationSpec.convertInputObject(inputValue); + PersonPropertyFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyIdTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyIdTranslationSpec.java index 3cbd820..4846db1 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.support.PersonPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.testsupport.TestPersonPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.support.input.PersonPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -36,13 +37,13 @@ public void testConvertObject() { .build(); PersonPropertyIdTranslationSpec translationSpec = new PersonPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); PersonPropertyId expectedAppValue = TestPersonPropertyId.PERSON_PROPERTY_1_BOOLEAN_MUTABLE_NO_TRACK; - PersonPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + PersonPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyInteractionReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyInteractionReportPluginDataTranslationSpec.java similarity index 80% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyInteractionReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyInteractionReportPluginDataTranslationSpec.java index 018ed93..c93ad38 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyInteractionReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyInteractionReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -16,13 +16,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.reports.input.PersonPropertyInteractionReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -39,8 +40,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -48,7 +49,7 @@ public void testConvertObject() { .build(); PersonPropertyInteractionReportPluginDataTranslationSpec translationSpec = new PersonPropertyInteractionReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 4684903523797799712L; RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(seed); @@ -70,9 +71,9 @@ public void testConvertObject() { PersonPropertyInteractionReportPluginData expectedAppValue = builder.build(); - PersonPropertyInteractionReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonPropertyInteractionReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonPropertyInteractionReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + PersonPropertyInteractionReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -80,10 +81,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(PersonPropertyInteractionReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(PersonPropertyInteractionReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyReportPluginDataTranslationSpec.java similarity index 80% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyReportPluginDataTranslationSpec.java index 1cbb655..bbde6d5 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_PersonPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_PersonPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -16,13 +16,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.reports.input.PersonPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -39,8 +40,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -48,7 +49,7 @@ public void testConvertObject() { .build(); PersonPropertyReportPluginDataTranslationSpec translationSpec = new PersonPropertyReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 4684903523797799712L; @@ -73,9 +74,9 @@ public void testConvertObject() { PersonPropertyReportPluginData expectedAppValue = builder.build(); - PersonPropertyReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonPropertyReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonPropertyReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + PersonPropertyReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -83,10 +84,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(PersonPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + PersonPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_TestPersonPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_TestPersonPropertyIdTranslationSpec.java similarity index 72% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_TestPersonPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_TestPersonPropertyIdTranslationSpec.java index 578c239..716ec76 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translationSpecs/AT_TestPersonPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/translation/specs/AT_TestPersonPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.personproperties.testsupport.TestPersonPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.testsupport.input.TestPersonPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.personproperties.translation.PersonPropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PersonPropertiesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); TestPersonPropertyIdTranslationSpec translationSpec = new TestPersonPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestPersonPropertyId expectedAppValue = TestPersonPropertyId.PERSON_PROPERTY_1_BOOLEAN_MUTABLE_NO_TRACK; - TestPersonPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestPersonPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestPersonPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + TestPersonPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslator.java deleted file mode 100644 index 4ebcfca..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslator.java +++ /dev/null @@ -1,68 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_PropertiesTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = PropertiesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = PropertiesTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(PropertiesTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, PropertiesTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/AT_PropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/AT_PropertiesTranslator.java new file mode 100644 index 0000000..79ba79f --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/AT_PropertiesTranslator.java @@ -0,0 +1,37 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_PropertiesTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(PropertiesTranslator.class, + PropertiesTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = PropertiesTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(PropertiesTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, PropertiesTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/AT_PropertiesTranslatorId.java similarity index 83% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/AT_PropertiesTranslatorId.java index c4d361c..3d0bfee 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/AT_PropertiesTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/AT_PropertiesTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/IT_PropertiesTranslator.java similarity index 54% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/IT_PropertiesTranslator.java index f256add..a20ff0b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/IT_PropertiesTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,9 +8,9 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.properties.support.PropertyDefinition; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionInput; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -25,11 +25,9 @@ public void testPropertyValueMapTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine( - ProtobufTranslationEngine.builder().addTranslator(PropertiesTranslator.getTranslator()).build()) - .addInputFilePath(filePath.resolve(fileName), PropertyDefinitionInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine( + ProtobufJsonTaskitEngine.builder().addTranslator(PropertiesTranslator.getTranslator()).build()) .build(); PropertyDefinition expectedPropertyDefinition = PropertyDefinition.builder() @@ -38,13 +36,13 @@ public void testPropertyValueMapTranslator() { .setType(String.class) .build(); - translatorController.writeOutput(expectedPropertyDefinition, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPropertyDefinition, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - PropertyDefinition actualPropertyDefiniton = translatorController.getFirstObject(PropertyDefinition.class); + PropertyDefinition actualPropertyDefinition = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + PropertyDefinitionInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); - assertEquals(expectedPropertyDefinition, actualPropertyDefiniton); + assertEquals(expectedPropertyDefinition, actualPropertyDefinition); } } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translationSpecs/AT_PropertyDefinitionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/specs/AT_PropertyDefinitionTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translationSpecs/AT_PropertyDefinitionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/specs/AT_PropertyDefinitionTranslationSpec.java index 2f0addf..bd2edb2 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translationSpecs/AT_PropertyDefinitionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/translation/specs/AT_PropertyDefinitionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,9 +7,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.properties.support.PropertyDefinition; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.support.input.PropertyDefinitionInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -24,13 +25,13 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(PropertiesTranslator.getTranslator()) .build(); PropertyDefinitionTranslationSpec translationSpec = new PropertyDefinitionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); PropertyDefinition expectedAppValue = PropertyDefinition.builder() .setDefaultValue("defaultValue") @@ -38,21 +39,21 @@ public void testConvertObject() { .setType(String.class) .build(); - PropertyDefinitionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PropertyDefinitionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PropertyDefinition actualAppValue = translationSpec.convertInputObject(inputValue); + PropertyDefinition actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); expectedAppValue = PropertyDefinition.builder().setPropertyValueMutability(true).setType(String.class).build(); - inputValue = translationSpec.convertAppObject(expectedAppValue); - actualAppValue = translationSpec.convertInputObject(inputValue); + inputValue = translationSpec.translateAppObject(expectedAppValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertThrows(RuntimeException.class, () -> { - translationSpec.convertInputObject( + translationSpec.translateInputObject( PropertyDefinitionInput.getDefaultInstance().toBuilder().setType("Foo").build()); }); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslator.java deleted file mode 100644 index 7a5ad0c..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslator.java +++ /dev/null @@ -1,75 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_RegionsTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = RegionsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = RegionsTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(RegionsTranslatorId.TRANSLATOR_ID) - .addDependency(PeopleTranslatorId.TRANSLATOR_ID) - .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, RegionsTranslator.getTranslator()); - } - -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/AT_RegionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/AT_RegionsTranslator.java new file mode 100644 index 0000000..af76542 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/AT_RegionsTranslator.java @@ -0,0 +1,44 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_RegionsTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(RegionsTranslator.class, + RegionsTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = RegionsTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(RegionsTranslatorId.TRANSLATOR_ID) + .addDependency(PeopleTranslatorId.TRANSLATOR_ID) + .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, RegionsTranslator.getTranslator()); + } + +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/AT_RegionsTranslatorId.java similarity index 84% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/AT_RegionsTranslatorId.java index 70331f3..96cb34d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/AT_RegionsTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/AT_RegionsTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/IT_RegionsTranslator.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/IT_RegionsTranslator.java index 9a002e4..011f5f0 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/IT_RegionsTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -22,15 +22,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.data.input.RegionsPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.reports.input.RegionPropertyReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.reports.input.RegionTransferReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -46,15 +46,13 @@ public void testRegionsTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), RegionsPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 524805676405822016L; @@ -68,11 +66,11 @@ public void testRegionsTranslator() { RegionsPluginData expectedPluginData = RegionsTestPluginFactory.getStandardRegionsPluginData(people, true, seed); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - RegionsPluginData actualPluginData = translatorController.getFirstObject(RegionsPluginData.class); + RegionsPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + RegionsPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -85,15 +83,13 @@ public void testRegionPropertyReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), RegionPropertyReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 524805676405822016L; @@ -118,12 +114,12 @@ public void testRegionPropertyReportTranslatorSpec() { RegionPropertyReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - RegionPropertyReportPluginData actualPluginData = translatorController - .getFirstObject(RegionPropertyReportPluginData.class); + RegionPropertyReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), RegionPropertyReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -136,15 +132,13 @@ public void testRegionTransferReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), RegionTransferReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); ReportLabel reportLabel = new SimpleReportLabel("region transfer report label"); @@ -156,12 +150,12 @@ public void testRegionTransferReportTranslatorSpec() { RegionTransferReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - RegionTransferReportPluginData actualPluginData = translatorController - .getFirstObject(RegionTransferReportPluginData.class); + RegionTransferReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), RegionTransferReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionFilterTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionFilterTranslationSpec.java index 1f86513..9728774 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionFilterInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -36,13 +37,13 @@ public void testConvertObject() { .build(); RegionFilterTranslationSpec translationSpec = new RegionFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); RegionFilter expectedAppValue = new RegionFilter(TestRegionId.values()); - RegionFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RegionFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RegionFilter actualAppValue = translationSpec.convertInputObject(inputValue); + RegionFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionIdTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionIdTranslationSpec.java index acc57ef..9812521 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionId; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -36,13 +37,13 @@ public void testConvertObject() { .build(); RegionIdTranslationSpec translationSpec = new RegionIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); RegionId expectedAppValue = TestRegionId.REGION_1; - RegionIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RegionIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RegionId actualAppValue = translationSpec.convertInputObject(inputValue); + RegionId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyDimensionTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyDimensionTranslationSpec.java similarity index 78% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyDimensionTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyDimensionTranslationSpec.java index 239dc5b..e52432b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyDimensionTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyDimensionTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,12 +8,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionPropertyDimension; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionId; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionPropertyDimensionInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -37,7 +38,7 @@ public void testConvertObject() { .build(); RegionPropertyDimensionTranslationSpec translationSpec = new RegionPropertyDimensionTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); RegionPropertyDimension expectedAppValue = RegionPropertyDimension.builder() .setRegionId(TestRegionId.REGION_1) @@ -47,9 +48,9 @@ public void testConvertObject() { .addValue(15000.5) .build(); - RegionPropertyDimensionInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RegionPropertyDimensionInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RegionPropertyDimension actualAppValue = translationSpec.convertInputObject(inputValue); + RegionPropertyDimension actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyIdTranslationSpec.java similarity index 71% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyIdTranslationSpec.java index 2cbb5d6..cef5c9d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,12 +7,13 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.RegionPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.RegionPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -36,13 +37,13 @@ public void testConvertObject() { .build(); RegionPropertyIdTranslationSpec translationSpec = new RegionPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); RegionPropertyId expectedAppValue = TestRegionPropertyId.REGION_PROPERTY_1_BOOLEAN_MUTABLE; - RegionPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RegionPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RegionPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + RegionPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyReportPluginDataTranslationSpec.java similarity index 79% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyReportPluginDataTranslationSpec.java index b4fbc4a..a648c0e 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionPropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionPropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -16,13 +16,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionPropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.reports.input.RegionPropertyReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -39,8 +40,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -48,7 +49,7 @@ public void testConvertObject() { .build(); RegionPropertyReportPluginDataTranslationSpec translationSpec = new RegionPropertyReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 524805676405822016L; ReportLabel reportLabel = new SimpleReportLabel("region property report label"); @@ -72,9 +73,9 @@ public void testConvertObject() { RegionPropertyReportPluginData expectedAppValue = builder.build(); - RegionPropertyReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RegionPropertyReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RegionPropertyReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + RegionPropertyReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -82,10 +83,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(RegionPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(RegionPropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionTransferReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionTransferReportPluginDataTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionTransferReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionTransferReportPluginDataTranslationSpec.java index 0041d17..2fe289a 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionTransferReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionTransferReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -10,13 +10,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.reports.input.RegionTransferReportPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -32,8 +33,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -41,7 +42,7 @@ public void testConvertObject() { .build(); RegionTransferReportPluginDataTranslationSpec translationSpec = new RegionTransferReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ReportLabel reportLabel = new SimpleReportLabel("region transfer report label"); ReportPeriod reportPeriod = ReportPeriod.DAILY; @@ -52,9 +53,9 @@ public void testConvertObject() { RegionTransferReportPluginData expectedAppValue = builder.build(); - RegionTransferReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RegionTransferReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RegionTransferReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + RegionTransferReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -62,10 +63,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(RegionTransferReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(RegionTransferReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionsPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionsPluginDataTranslationSpec.java similarity index 71% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionsPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionsPluginDataTranslationSpec.java index 5cbfbb3..f917ebb 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_RegionsPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_RegionsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -12,13 +12,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.datamanagers.RegionsPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.RegionsTestPluginFactory; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.data.input.RegionsPluginDataInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -34,8 +35,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -43,7 +44,7 @@ public void testConvertObject() { .build(); RegionsPluginDataTranslationSpec translationSpec = new RegionsPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 524805676405822016L; int initialPopulation = 100; @@ -55,18 +56,18 @@ public void testConvertObject() { RegionsPluginData expectedAppValue = RegionsTestPluginFactory.getStandardRegionsPluginData(people, true, seed); - RegionsPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RegionsPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RegionsPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + RegionsPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); expectedAppValue = RegionsTestPluginFactory.getStandardRegionsPluginData(people, false, seed); - inputValue = translationSpec.convertAppObject(expectedAppValue); + inputValue = translationSpec.translateAppObject(expectedAppValue); - actualAppValue = translationSpec.convertInputObject(inputValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -74,10 +75,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(RegionsPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(RegionsPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_SimpleRegionIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_SimpleRegionIdTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_SimpleRegionIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_SimpleRegionIdTranslationSpec.java index fbc147c..2216578 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_SimpleRegionIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_SimpleRegionIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.SimpleRegionId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.SimpleRegionIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); SimpleRegionIdTranslationSpec translationSpec = new SimpleRegionIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); SimpleRegionId expectedAppValue = new SimpleRegionId("test"); - SimpleRegionIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + SimpleRegionIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - SimpleRegionId actualAppValue = translationSpec.convertInputObject(inputValue); + SimpleRegionId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_SimpleRegionPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_SimpleRegionPropertyIdTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_SimpleRegionPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_SimpleRegionPropertyIdTranslationSpec.java index cbab2e1..2f4044d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_SimpleRegionPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_SimpleRegionPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.support.SimpleRegionPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.support.input.SimpleRegionPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); SimpleRegionPropertyIdTranslationSpec translationSpec = new SimpleRegionPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); SimpleRegionPropertyId expectedAppValue = new SimpleRegionPropertyId("test"); - SimpleRegionPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + SimpleRegionPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - SimpleRegionPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + SimpleRegionPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_TestRegionIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_TestRegionIdTranslationSpec.java similarity index 69% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_TestRegionIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_TestRegionIdTranslationSpec.java index 405f9ac..8afdc4e 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_TestRegionIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_TestRegionIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.testsupport.input.TestRegionIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); TestRegionIdTranslationSpec translationSpec = new TestRegionIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestRegionId expectedAppValue = TestRegionId.REGION_1; - TestRegionIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestRegionIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestRegionId actualAppValue = translationSpec.convertInputObject(inputValue); + TestRegionId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_TestRegionPropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_TestRegionPropertyIdTranslationSpec.java similarity index 71% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_TestRegionPropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_TestRegionPropertyIdTranslationSpec.java index 6b9b24b..a23c687 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translationSpecs/AT_TestRegionPropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/translation/specs/AT_TestRegionPropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,12 +6,13 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.regions.testsupport.TestRegionPropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.testsupport.input.TestRegionPropertyIdInput; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -26,8 +27,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -35,13 +36,13 @@ public void testConvertObject() { .build(); TestRegionPropertyIdTranslationSpec translationSpec = new TestRegionPropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestRegionPropertyId expectedAppValue = TestRegionPropertyId.REGION_PROPERTY_1_BOOLEAN_MUTABLE; - TestRegionPropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestRegionPropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestRegionPropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + TestRegionPropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslator.java deleted file mode 100644 index deba795..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslator.java +++ /dev/null @@ -1,68 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_ReportsTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = ReportsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = ReportsTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, ReportsTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java deleted file mode 100644 index c752abb..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java +++ /dev/null @@ -1,47 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.nio.file.Path; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; -import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; - -public class IT_ReportsTranslator { - Path basePath = ResourceHelper.getResourceDir(this.getClass()); - Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); - - @Test - @UnitTestForCoverage - public void testReportLabelTranslatorSpec() { - String fileName = "reportLabel.json"; - - ResourceHelper.createFile(filePath, fileName); - - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine( - ProtobufTranslationEngine.builder().addTranslator(ReportsTranslator.getTranslator()).build()) - .addInputFilePath(filePath.resolve(fileName), ReportLabelInput.class, TranslationEngineType.PROTOBUF) - .build(); - - ReportLabel expecetdReportLabel = new SimpleReportLabel("report label"); - - translatorController.writeOutput(expecetdReportLabel, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - - translatorController.readInput(); - - ReportLabel actualReportLabel = translatorController.getFirstObject(ReportLabel.class); - - assertEquals(expecetdReportLabel, actualReportLabel); - - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/AT_ReportsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/AT_ReportsTranslator.java new file mode 100644 index 0000000..f3d2961 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/AT_ReportsTranslator.java @@ -0,0 +1,37 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_ReportsTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(ReportsTranslator.class, + ReportsTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = ReportsTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, ReportsTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/AT_ReportsTranslatorId.java similarity index 84% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/AT_ReportsTranslatorId.java index 93bfeb6..98dce9d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/AT_ReportsTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/AT_ReportsTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/IT_ReportsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/IT_ReportsTranslator.java new file mode 100644 index 0000000..3200a93 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/IT_ReportsTranslator.java @@ -0,0 +1,45 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.nio.file.Path; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; +import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.SimpleReportLabelInput; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; + +public class IT_ReportsTranslator { + Path basePath = ResourceHelper.getResourceDir(this.getClass()); + Path filePath = ResourceHelper.createDirectory(basePath, "test-output"); + + @Test + @UnitTestForCoverage + public void testReportLabelTranslatorSpec() { + String fileName = "reportLabel.json"; + + ResourceHelper.createFile(filePath, fileName); + + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine( + ProtobufJsonTaskitEngine.builder().addTranslator(ReportsTranslator.getTranslator()).build()) + .build(); + + ReportLabel expectedReportLabel = new SimpleReportLabel("report label"); + + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedReportLabel, + ProtobufTaskitEngineId.JSON_ENGINE_ID); + + ReportLabel actualReportLabel = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + SimpleReportLabelInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); + + assertEquals(expectedReportLabel, actualReportLabel); + + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_ReportLabelTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_ReportLabelTranslationSpec.java similarity index 76% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_ReportLabelTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_ReportLabelTranslationSpec.java index 89fd1ac..7225a3a 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_ReportLabelTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_ReportLabelTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,9 +7,10 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportLabelInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -24,19 +25,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ReportsTranslator.getTranslator()) .build(); ReportLabelTranslationSpec translationSpec = new ReportLabelTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ReportLabel expectedAppValue = new SimpleReportLabel("report label"); - ReportLabelInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ReportLabelInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ReportLabel actualAppValue = translationSpec.convertInputObject(inputValue); + ReportLabel actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_ReportPeriodTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_ReportPeriodTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_ReportPeriodTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_ReportPeriodTranslationSpec.java index 8335ef1..9854bf2 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_ReportPeriodTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_ReportPeriodTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportPeriod; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.ReportPeriodInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,19 +24,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ReportsTranslator.getTranslator()) .build(); ReportPeriodTranslationSpec translationSpec = new ReportPeriodTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ReportPeriod expectedAppValue = ReportPeriod.DAILY; - ReportPeriodInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ReportPeriodInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ReportPeriod actualAppValue = translationSpec.convertInputObject(inputValue); + ReportPeriod actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_SimpleReportLabelTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_SimpleReportLabelTranslationSpec.java similarity index 75% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_SimpleReportLabelTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_SimpleReportLabelTranslationSpec.java index 8374c69..f23f125 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translationSpecs/AT_SimpleReportLabelTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/translation/specs/AT_SimpleReportLabelTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.support.input.SimpleReportLabelInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,19 +24,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ReportsTranslator.getTranslator()) .build(); SimpleReportLabelTranslationSpec translationSpec = new SimpleReportLabelTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); SimpleReportLabel expectedAppValue = new SimpleReportLabel("report label"); - SimpleReportLabelInput inputValue = translationSpec.convertAppObject(expectedAppValue); + SimpleReportLabelInput inputValue = translationSpec.translateAppObject(expectedAppValue); - SimpleReportLabel actualAppValue = translationSpec.convertInputObject(inputValue); + SimpleReportLabel actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslator.java deleted file mode 100644 index 76179bb..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslator.java +++ /dev/null @@ -1,77 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslatorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslatorId; -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_ResourcesTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = ResourcesTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = ResourcesTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(ResourcesTranslatorId.TRANSLATOR_ID) - .addDependency(PeopleTranslatorId.TRANSLATOR_ID) - .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) - .addDependency(RegionsTranslatorId.TRANSLATOR_ID) - .addDependency(ReportsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, ResourcesTranslator.getTranslator()); - } - -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/AT_ResourcesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/AT_ResourcesTranslator.java new file mode 100644 index 0000000..118ebf2 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/AT_ResourcesTranslator.java @@ -0,0 +1,46 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslatorId; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslatorId; +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_ResourcesTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(ResourcesTranslator.class, + ResourcesTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = ResourcesTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(ResourcesTranslatorId.TRANSLATOR_ID) + .addDependency(PeopleTranslatorId.TRANSLATOR_ID) + .addDependency(PropertiesTranslatorId.TRANSLATOR_ID) + .addDependency(RegionsTranslatorId.TRANSLATOR_ID) + .addDependency(ReportsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, ResourcesTranslator.getTranslator()); + } + +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/AT_ResourcesTranslatorId.java similarity index 83% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/AT_ResourcesTranslatorId.java index 9a6d559..a6fcc37 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/AT_ResourcesTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/AT_ResourcesTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/IT_ResourcesTranslator.java similarity index 71% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/IT_ResourcesTranslator.java index eca7dbc..03ddd79 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/IT_ResourcesTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -23,17 +23,17 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.ResourcesTestPluginFactory; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.data.input.ResourcesPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.PersonResourceReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.ResourcePropertyReportPluginDataInput; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.ResourceReportPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.random.RandomGeneratorProvider; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -49,16 +49,14 @@ public void testResourcesTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), ResourcesPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 524805676405822016L; @@ -72,11 +70,11 @@ public void testResourcesTranslator() { ResourcesPluginData expectedPluginData = ResourcesTestPluginFactory.getStandardResourcesPluginData(people, seed); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - ResourcesPluginData actualPluginData = translatorController.getFirstObject(ResourcesPluginData.class); + ResourcesPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + ResourcesPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -89,16 +87,14 @@ public void testPersonResourceReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), PersonResourceReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 524805676405822016L; @@ -124,12 +120,12 @@ public void testPersonResourceReportTranslatorSpec() { PersonResourceReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - PersonResourceReportPluginData actualPluginData = translatorController - .getFirstObject(PersonResourceReportPluginData.class); + PersonResourceReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), PersonResourceReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -142,16 +138,14 @@ public void testResourcePropertyReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), ResourcePropertyReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); ReportLabel reportLabel = new SimpleReportLabel("resource property report label"); @@ -162,12 +156,12 @@ public void testResourcePropertyReportTranslatorSpec() { ResourcePropertyReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - ResourcePropertyReportPluginData actualPluginData = translatorController - .getFirstObject(ResourcePropertyReportPluginData.class); + ResourcePropertyReportPluginData actualPluginData = taskitEngineManager.readAndTranslate( + filePath.resolve(fileName), ResourcePropertyReportPluginDataInput.class, + ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); @@ -180,16 +174,14 @@ public void testResourceReportTranslatorSpec() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine(ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) .addTranslator(RegionsTranslator.getTranslator()) .addTranslator(ReportsTranslator.getTranslator()) .build()) - .addInputFilePath(filePath.resolve(fileName), ResourceReportPluginDataInput.class, - TranslationEngineType.PROTOBUF) .build(); long seed = 524805676405822016L; @@ -215,11 +207,11 @@ public void testResourceReportTranslatorSpec() { ResourceReportPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - ResourceReportPluginData actualPluginData = translatorController.getFirstObject(ResourceReportPluginData.class); + ResourceReportPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + ResourceReportPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_PersonResourceReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_PersonResourceReportPluginDataTranslationSpec.java similarity index 78% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_PersonResourceReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_PersonResourceReportPluginDataTranslationSpec.java index adbe88f..ba49058 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_PersonResourceReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_PersonResourceReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -17,14 +17,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.reports.PersonResourceReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.PersonResourceReportPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -41,8 +42,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -51,7 +52,7 @@ public void testConvertObject() { .build(); PersonResourceReportPluginDataTranslationSpec translationSpec = new PersonResourceReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 524805676405822016L; RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(seed); @@ -76,9 +77,9 @@ public void testConvertObject() { PersonResourceReportPluginData expectedAppValue = builder.build(); - PersonResourceReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + PersonResourceReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - PersonResourceReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + PersonResourceReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -86,10 +87,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(PersonResourceReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject( + PersonResourceReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceFilterTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceFilterTranslationSpec.java similarity index 69% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceFilterTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceFilterTranslationSpec.java index 8319e11..197750b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceFilterTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceFilterTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -8,14 +8,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.partitions.support.Equality; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceFilter; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.PartitionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.partitions.translation.PartitionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceFilterInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -30,8 +31,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -41,13 +42,13 @@ public void testConvertObject() { .build(); ResourceFilterTranslationSpec translationSpec = new ResourceFilterTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ResourceFilter expectedAppValue = new ResourceFilter(TestResourceId.RESOURCE_1, Equality.EQUAL, 100L); - ResourceFilterInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ResourceFilterInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ResourceFilter actualAppValue = translationSpec.convertInputObject(inputValue); + ResourceFilter actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceIdTranslationSpec.java similarity index 68% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceIdTranslationSpec.java index 32f8368..bd4fd1d 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,13 +7,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -38,13 +39,13 @@ public void testConvertObject() { .build(); ResourceIdTranslationSpec translationSpec = new ResourceIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ResourceId expectedAppValue = TestResourceId.RESOURCE_1; - ResourceIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ResourceIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ResourceId actualAppValue = translationSpec.convertInputObject(inputValue); + ResourceId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceInitializationTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceInitializationTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceInitializationTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceInitializationTranslationSpec.java index 5a02092..3aa787b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceInitializationTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceInitializationTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,13 +7,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceInitialization; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourceInitializationInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -38,13 +39,13 @@ public void testConvertObject() { .build(); ResourceInitializationTranslationSpec translationSpec = new ResourceInitializationTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ResourceInitialization expectedAppValue = new ResourceInitialization(TestResourceId.RESOURCE_1, 100L); - ResourceInitializationInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ResourceInitializationInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ResourceInitialization actualAppValue = translationSpec.convertInputObject(inputValue); + ResourceInitialization actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcePropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcePropertyIdTranslationSpec.java similarity index 70% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcePropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcePropertyIdTranslationSpec.java index 6566767..be99328 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcePropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcePropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,13 +7,14 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourcePropertyId; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourcePropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.support.input.ResourcePropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -28,8 +29,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -38,13 +39,13 @@ public void testConvertObject() { .build(); ResourcePropertyIdTranslationSpec translationSpec = new ResourcePropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ResourcePropertyId expectedAppValue = TestResourcePropertyId.ResourceProperty_1_2_INTEGER_MUTABLE; - ResourcePropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ResourcePropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ResourcePropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + ResourcePropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcePropertyReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcePropertyReportPluginDataTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcePropertyReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcePropertyReportPluginDataTranslationSpec.java index 3216824..756163e 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcePropertyReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcePropertyReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,14 +9,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.ReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.reports.support.SimpleReportLabel; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.reports.ResourcePropertyReportPluginData; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.ResourcePropertyReportPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -32,8 +33,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -42,7 +43,7 @@ public void testConvertObject() { .build(); ResourcePropertyReportPluginDataTranslationSpec translationSpec = new ResourcePropertyReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); ReportLabel reportLabel = new SimpleReportLabel("resource property report label"); @@ -52,9 +53,9 @@ public void testConvertObject() { ResourcePropertyReportPluginData expectedAppValue = builder.build(); - ResourcePropertyReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ResourcePropertyReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ResourcePropertyReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + ResourcePropertyReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -62,10 +63,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(ResourcePropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(ResourcePropertyReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceReportPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceReportPluginDataTranslationSpec.java similarity index 78% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceReportPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceReportPluginDataTranslationSpec.java index 77ce315..7c4d4d3 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourceReportPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourceReportPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -17,14 +17,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.reports.ResourceReportPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.support.ResourceId; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.reports.input.ResourceReportPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -41,8 +42,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -51,7 +52,7 @@ public void testConvertObject() { .build(); ResourceReportPluginDataTranslationSpec translationSpec = new ResourceReportPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 524805676405822016L; RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(seed); @@ -76,9 +77,9 @@ public void testConvertObject() { ResourceReportPluginData expectedAppValue = builder.build(); - ResourceReportPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ResourceReportPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ResourceReportPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + ResourceReportPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -86,10 +87,11 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(ResourceReportPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec + .translateInputObject(ResourceReportPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcesPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcesPluginDataTranslationSpec.java similarity index 71% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcesPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcesPluginDataTranslationSpec.java index 5c93781..c5fb083 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_ResourcesPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_ResourcesPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -12,14 +12,15 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.people.support.PersonId; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.datamanagers.ResourcesPluginData; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.ResourcesTestPluginFactory; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.data.input.ResourcesPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -35,8 +36,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -45,7 +46,7 @@ public void testConvertObject() { .build(); ResourcesPluginDataTranslationSpec translationSpec = new ResourcesPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 524805676405822016L; @@ -58,9 +59,9 @@ public void testConvertObject() { ResourcesPluginData expectedAppValue = ResourcesTestPluginFactory.getStandardResourcesPluginData(people, seed); - ResourcesPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + ResourcesPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - ResourcesPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + ResourcesPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -68,10 +69,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(ResourcesPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(ResourcesPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_TestResourceIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_TestResourceIdTranslationSpec.java similarity index 68% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_TestResourceIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_TestResourceIdTranslationSpec.java index 0aed519..8ac92e7 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_TestResourceIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_TestResourceIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,13 +6,14 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourceId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.testsupport.input.TestResourceIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -37,13 +38,13 @@ public void testConvertObject() { .build(); TestResourceIdTranslationSpec translationSpec = new TestResourceIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestResourceId expectedAppValue = TestResourceId.RESOURCE_1; - TestResourceIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestResourceIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestResourceId actualAppValue = translationSpec.convertInputObject(inputValue); + TestResourceId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_TestResourcePropertyIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_TestResourcePropertyIdTranslationSpec.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_TestResourcePropertyIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_TestResourcePropertyIdTranslationSpec.java index f4942cb..642d8ff 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translationSpecs/AT_TestResourcePropertyIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/translation/specs/AT_TestResourcePropertyIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,13 +6,14 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.resources.testsupport.TestResourcePropertyId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.PeopleTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.PropertiesTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.RegionsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.ResourcesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.people.translation.PeopleTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.properties.translation.PropertiesTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.regions.translation.RegionsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.testsupport.input.TestResourcePropertyIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.resources.translation.ResourcesTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -27,8 +28,8 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ResourcesTranslator.getTranslator()) .addTranslator(PropertiesTranslator.getTranslator()) .addTranslator(PeopleTranslator.getTranslator()) @@ -37,13 +38,13 @@ public void testConvertObject() { .build(); TestResourcePropertyIdTranslationSpec translationSpec = new TestResourcePropertyIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestResourcePropertyId expectedAppValue = TestResourcePropertyId.ResourceProperty_1_1_BOOLEAN_MUTABLE; - TestResourcePropertyIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestResourcePropertyIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestResourcePropertyId actualAppValue = translationSpec.convertInputObject(inputValue); + TestResourcePropertyId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslator.java deleted file mode 100644 index 6623dde..0000000 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslator.java +++ /dev/null @@ -1,68 +0,0 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import gov.hhs.aspr.ms.taskit.core.TranslationSpec; -import gov.hhs.aspr.ms.taskit.core.Translator; -import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; -import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; - -public class AT_StochasticsTranslator { - - @Test - @UnitTestForCoverage - public void testGetTranslationSpecs() throws ClassNotFoundException { - List> translationSpecs = StochasticsTranslator.getTranslationSpecs(); - List> translationSpecClasses = new ArrayList<>(); - - for (TranslationSpec translationSpec : translationSpecs) { - translationSpecClasses.add(translationSpec.getClass()); - } - - String packageName = this.getClass().getPackageName() + ".translationSpecs"; - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - URL packageURL; - - packageURL = classLoader.getResource(packageName.replaceAll("[.]", "/")); - - if (packageURL != null) { - String packagePath = packageURL.getPath(); - if (packagePath != null) { - packagePath = packagePath.replaceAll("test-classes", "classes"); - File packageDir = new File(packagePath); - if (packageDir.isDirectory()) { - File[] files = packageDir.listFiles(); - for (File file : files) { - String className = file.getName(); - if (className.endsWith(".class")) { - className = packageName + "." + className.substring(0, className.length() - 6); - Class classRef = classLoader.loadClass(className); - - assertTrue(translationSpecClasses.contains(classRef), classRef.getSimpleName()); - } - } - } - } - } - } - - @Test - @UnitTestMethod(target = StochasticsTranslator.class, name = "getTranslator", args = {}) - public void testGetTranslator() { - Translator expectedTranslator = Translator.builder() - .setTranslatorId(StochasticsTranslatorId.TRANSLATOR_ID) - .setInitializer((translatorContext) -> { - }) - .build(); - - assertEquals(expectedTranslator, StochasticsTranslator.getTranslator()); - } -} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/AT_StochasticsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/AT_StochasticsTranslator.java new file mode 100644 index 0000000..c895c96 --- /dev/null +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/AT_StochasticsTranslator.java @@ -0,0 +1,37 @@ +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import gov.hhs.aspr.ms.taskit.core.testsupport.TranslatorTestSupport; +import gov.hhs.aspr.ms.taskit.core.translation.Translator; +import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; +import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; + +public class AT_StochasticsTranslator { + + @Test + @UnitTestForCoverage + public void testGetTranslationSpecs() throws ClassNotFoundException { + Set missing = TranslatorTestSupport.testGetTranslationSpecs(StochasticsTranslator.class, + StochasticsTranslator.getTranslationSpecs()); + + assertTrue(missing.isEmpty(), missing.toString()); + } + + @Test + @UnitTestMethod(target = StochasticsTranslator.class, name = "getTranslator", args = {}) + public void testGetTranslator() { + Translator expectedTranslator = Translator.builder() + .setTranslatorId(StochasticsTranslatorId.TRANSLATOR_ID) + .setInitializer((translatorContext) -> { + }) + .build(); + + assertEquals(expectedTranslator, StochasticsTranslator.getTranslator()); + } +} diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslatorId.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/AT_StochasticsTranslatorId.java similarity index 83% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslatorId.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/AT_StochasticsTranslatorId.java index 7ff1590..53e264f 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/AT_StochasticsTranslatorId.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/AT_StochasticsTranslatorId.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/IT_StochasticsTranslator.java similarity index 73% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/IT_StochasticsTranslator.java index 39f26b8..6a3c9c8 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/IT_StochasticsTranslator.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -14,9 +14,9 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.testsupport.StochasticsTestPluginFactory; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.testsupport.TestRandomGeneratorId; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.data.input.StochasticsPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.TranslationController; -import gov.hhs.aspr.ms.taskit.core.TranslationEngineType; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitEngineManager; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngineId; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.resourcehelper.ResourceHelper; @@ -31,12 +31,9 @@ public void testStochasticsTranslator() { ResourceHelper.createFile(filePath, fileName); - TranslationController translatorController = TranslationController.builder() - .addTranslationEngine(ProtobufTranslationEngine.builder() - .addTranslator(StochasticsTranslator.getTranslator()) - .build()) - .addInputFilePath(filePath.resolve(fileName), StochasticsPluginDataInput.class, - TranslationEngineType.PROTOBUF) + TaskitEngineManager taskitEngineManager = TaskitEngineManager.builder() + .addTaskitEngine( + ProtobufJsonTaskitEngine.builder().addTranslator(StochasticsTranslator.getTranslator()).build()) .build(); long seed = 524805676405822016L; @@ -62,11 +59,11 @@ public void testStochasticsTranslator() { StochasticsPluginData expectedPluginData = builder.build(); - translatorController.writeOutput(expectedPluginData, filePath.resolve(fileName), - TranslationEngineType.PROTOBUF); - translatorController.readInput(); + taskitEngineManager.translateAndWrite(filePath.resolve(fileName), expectedPluginData, + ProtobufTaskitEngineId.JSON_ENGINE_ID); - StochasticsPluginData actualPluginData = translatorController.getFirstObject(StochasticsPluginData.class); + StochasticsPluginData actualPluginData = taskitEngineManager.readAndTranslate(filePath.resolve(fileName), + StochasticsPluginDataInput.class, ProtobufTaskitEngineId.JSON_ENGINE_ID); assertEquals(expectedPluginData, actualPluginData); assertEquals(expectedPluginData.toString(), actualPluginData.toString()); diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_RandomNumberGeneratorIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_RandomNumberGeneratorIdTranslationSpec.java similarity index 81% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_RandomNumberGeneratorIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_RandomNumberGeneratorIdTranslationSpec.java index 2ea9e41..8c61164 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_RandomNumberGeneratorIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_RandomNumberGeneratorIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,9 +7,10 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.RandomNumberGeneratorId; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.testsupport.TestRandomGeneratorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.StochasticsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.RandomNumberGeneratorIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.StochasticsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -24,19 +25,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(StochasticsTranslator.getTranslator()) .build(); RandomNumberGeneratorIdTranslationSpec translationSpec = new RandomNumberGeneratorIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); RandomNumberGeneratorId expectedAppValue = TestRandomGeneratorId.BLITZEN; - RandomNumberGeneratorIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + RandomNumberGeneratorIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - RandomNumberGeneratorId actualAppValue = translationSpec.convertInputObject(inputValue); + RandomNumberGeneratorId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java similarity index 81% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java index 2a28d3d..fe39b67 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_SimpleRandomNumberGeneratorIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.SimpleRandomNumberGeneratorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.ReportsTranslator; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.reports.translation.ReportsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.SimpleRandomNumberGeneratorIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,19 +24,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(ReportsTranslator.getTranslator()) .build(); SimpleRandomNumberGeneratorIdTranslationSpec translationSpec = new SimpleRandomNumberGeneratorIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); SimpleRandomNumberGeneratorId expectedAppValue = new SimpleRandomNumberGeneratorId("report label"); - SimpleRandomNumberGeneratorIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + SimpleRandomNumberGeneratorIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - SimpleRandomNumberGeneratorId actualAppValue = translationSpec.convertInputObject(inputValue); + SimpleRandomNumberGeneratorId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_StochasticsPluginDataTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_StochasticsPluginDataTranslationSpec.java similarity index 82% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_StochasticsPluginDataTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_StochasticsPluginDataTranslationSpec.java index 7f6f5d8..2833790 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_StochasticsPluginDataTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_StochasticsPluginDataTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -13,10 +13,11 @@ import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.WellState; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.testsupport.StochasticsTestPluginFactory; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.testsupport.TestRandomGeneratorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.StochasticsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.data.input.StochasticsPluginDataInput; -import gov.hhs.aspr.ms.taskit.core.CoreTranslationError; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.StochasticsTranslator; +import gov.hhs.aspr.ms.taskit.core.engine.TaskitError; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -32,13 +33,13 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(StochasticsTranslator.getTranslator()) .build(); StochasticsPluginDataTranslationSpec translationSpec = new StochasticsPluginDataTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); long seed = 524805676405822016L; @@ -63,9 +64,9 @@ public void testConvertObject() { StochasticsPluginData expectedAppValue = builder.build(); - StochasticsPluginDataInput inputValue = translationSpec.convertAppObject(expectedAppValue); + StochasticsPluginDataInput inputValue = translationSpec.translateAppObject(expectedAppValue); - StochasticsPluginData actualAppValue = translationSpec.convertInputObject(inputValue); + StochasticsPluginData actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); assertEquals(expectedAppValue.toString(), actualAppValue.toString()); @@ -73,10 +74,10 @@ public void testConvertObject() { // preconditions // version is not supported ContractException contractException = assertThrows(ContractException.class, () -> { - translationSpec.convertInputObject(StochasticsPluginDataInput.newBuilder().setVersion("badversion").build()); + translationSpec.translateInputObject(StochasticsPluginDataInput.newBuilder().setVersion("badversion").build()); }); - assertEquals(CoreTranslationError.UNSUPPORTED_VERSION, contractException.getErrorType()); + assertEquals(TaskitError.UNSUPPORTED_VERSION, contractException.getErrorType()); } @Test diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_TestRandomGeneratorIdTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_TestRandomGeneratorIdTranslationSpec.java similarity index 78% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_TestRandomGeneratorIdTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_TestRandomGeneratorIdTranslationSpec.java index ad223be..f7d868b 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_TestRandomGeneratorIdTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_TestRandomGeneratorIdTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.testsupport.TestRandomGeneratorId; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.StochasticsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.testsupport.input.TestRandomGeneratorIdInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.StochasticsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,19 +24,19 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(StochasticsTranslator.getTranslator()) .build(); TestRandomGeneratorIdTranslationSpec translationSpec = new TestRandomGeneratorIdTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); TestRandomGeneratorId expectedAppValue = TestRandomGeneratorId.BLITZEN; - TestRandomGeneratorIdInput inputValue = translationSpec.convertAppObject(expectedAppValue); + TestRandomGeneratorIdInput inputValue = translationSpec.translateAppObject(expectedAppValue); - TestRandomGeneratorId actualAppValue = translationSpec.convertInputObject(inputValue); + TestRandomGeneratorId actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); } diff --git a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_WellStateTranslationSpec.java b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_WellStateTranslationSpec.java similarity index 74% rename from protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_WellStateTranslationSpec.java rename to protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_WellStateTranslationSpec.java index 9bfaf40..65f2346 100644 --- a/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translationSpecs/AT_WellStateTranslationSpec.java +++ b/protobuf/src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/translation/specs/AT_WellStateTranslationSpec.java @@ -1,4 +1,4 @@ -package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translationSpecs; +package gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.specs; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,9 +6,10 @@ import org.junit.jupiter.api.Test; import gov.hhs.aspr.ms.gcm.simulation.plugins.stochastics.support.WellState; -import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.StochasticsTranslator; import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.support.input.WellStateInput; -import gov.hhs.aspr.ms.taskit.protobuf.ProtobufTranslationEngine; +import gov.hhs.aspr.ms.gcm.taskit.protobuf.plugins.stochastics.translation.StochasticsTranslator; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufJsonTaskitEngine; +import gov.hhs.aspr.ms.taskit.protobuf.engine.ProtobufTaskitEngine; import gov.hhs.aspr.ms.util.annotations.UnitTestConstructor; import gov.hhs.aspr.ms.util.annotations.UnitTestForCoverage; import gov.hhs.aspr.ms.util.annotations.UnitTestMethod; @@ -23,25 +24,25 @@ public void testConstructor() { @Test @UnitTestForCoverage - public void testConvertObject() { - ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder() + public void testTranslateObject() { + ProtobufTaskitEngine protobufTaskitEngine = ProtobufJsonTaskitEngine.builder() .addTranslator(StochasticsTranslator.getTranslator()) .build(); WellStateTranslationSpec translationSpec = new WellStateTranslationSpec(); - translationSpec.init(protobufTranslationEngine); + translationSpec.init(protobufTaskitEngine); WellState expectedAppValue = WellState.builder().setSeed(524805676405822016L).build(); - WellStateInput inputValue = translationSpec.convertAppObject(expectedAppValue); + WellStateInput inputValue = translationSpec.translateAppObject(expectedAppValue); - WellState actualAppValue = translationSpec.convertInputObject(inputValue); + WellState actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); inputValue = inputValue.toBuilder().clearVArray().build(); - actualAppValue = translationSpec.convertInputObject(inputValue); + actualAppValue = translationSpec.translateInputObject(inputValue); assertEquals(expectedAppValue, actualAppValue); }