From d2e4936adff440395a5b6c50b3a9841e61191459 Mon Sep 17 00:00:00 2001
From: Zachary Bischoff <116595361+bischoffz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 16:32:52 -0400
Subject: [PATCH] Protobuf Translation 1.0.0 (#62)
* fix compile errors
* refactor of enum
* rename
* groupid update
* move folder
* move gitignore
* add back ignore sub gitignores
* add vscode folder to gitignore
* update demo with new changes
* remove flattened-poms
* update gitignore
* reorganization based on new groupid
* update proto with new package
* update input imports
update dependencies
* move app into test
* groups translator basic test
* refactor
* add basic test for materials
* add basic test for simulation time
* add basic test for people translator
* add basic test for person properties translator
* add basic test for properties plugin translator
* add basic test for regions translator
* clean up imports
* add basic test for resources translator
* move deep merge into util for safe keeping
* add basic test for stochastics translator
* update tests to run with maven
* add assembly jar to include all translators
* update demo
* remove commented out code
* 1.0.0 RC
---
demos/demo1/.gitignore | 5 +-
demos/demo1/pom.xml | 34 +-
.../lesson/SerializationDemonstration.java | 50 +-
.../GlobalPropertyTranslatorSpec.java | 27 +-
.../PersonPropertyTranslatorSpec.java | 30 +-
.../translatorSpecs/RegionTranslatorSpec.java | 19 +-
demos/demo1/src/main/proto/lesson.proto | 2 +-
.../main/resources/globalPropertiesInput.json | 32 +-
.../main/resources/personPropertiesInput.json | 20020 ++++++++--------
.../src/main/resources/regionsInput.json | 2010 +-
gcm-protobuf/.flattened-pom.xml | 41 -
gcm-protobuf/core/.flattened-pom.xml | 40 -
.../translation/core/AEnumTranslatorSpec.java | 62 -
.../core/AObjectTranslatorSpec.java | 58 -
.../gcm/translation/core/ITranslatorSpec.java | 14 -
.../PrimitiveTranslatorSpecs.java | 72 -
.../.flattened-pom.xml | 46 -
.../plugins/globalproperties/App.java | 94 -
.../TestGlobalPropertyIdTranslatorSpec.java | 52 -
.../plugins/globalproperties/AppTest.java | 12 -
gcm-protobuf/groups-plugin/.flattened-pom.xml | 58 -
.../gcm/translation/plugins/groups/App.java | 200 -
.../GroupIdTranslatorSpec.java | 41 -
.../SimpleGroupTypeIdTranslatorSpec.java | 41 -
.../TestGroupPropertyIdTranslatorSpec.java | 52 -
.../TestGroupTypeIdTranslatorSpec.java | 51 -
.../BatchIdTranslatorSpec.java | 42 -
.../BatchPropertyIdTranslatorSpec.java | 42 -
.../MaterialIdTranslatorSpec.java | 42 -
.../MaterialsPluginDataTranslatorSpec.java | 304 -
.../MaterialsProducerIdTranslatorSpec.java | 42 -
...rialsProducerPropertyIdTranslatorSpec.java | 42 -
.../StageIdTranslatorSpec.java | 42 -
.../TestBatchPropertyIdTranslatorSpec.java | 52 -
.../TestMaterialIdTranslatorSpec.java | 52 -
...TestMaterialsProducerIdTranslatorSpec.java | 52 -
...rialsProducerPropertyIdTranslatorSpec.java | 52 -
.../plugins/materials/AppTest.java | 13 -
.../hss/aspr/gcm/translation/nucleus/App.java | 32 -
.../aspr/gcm/translation/nucleus/AppTest.java | 13 -
gcm-protobuf/people-plugin/.flattened-pom.xml | 46 -
.../gcm/translation/plugins/people/App.java | 94 -
.../gcmprotobuf/plugins/people/AppTest.java | 12 -
.../.flattened-pom.xml | 58 -
.../plugins/personproperties/App.java | 143 -
.../TestPersonPropertyIdTranslatorSpec.java | 52 -
.../plugins/globalproperties/AppTest.java | 12 -
.../properties-plugin/.flattened-pom.xml | 46 -
.../translation/plugins/properties/App.java | 77 -
.../properties/PropertiesTranslator.java | 29 -
.../simobjects/Layer1SimObject.java | 31 -
.../simobjects/TestMessageSimObject.java | 13 -
.../TestMessageTranslatorSpec.java | 51 -
.../TimeTrackingPolicyTranslatorSpec.java | 51 -
.../plugins/properties/AppTest.java | 13 -
.../regions-plugin/.flattened-pom.xml | 58 -
.../gcm/translation/plugins/regions/App.java | 165 -
.../RegionIdTranslatorSpec.java | 41 -
.../RegionPropertyIdTranslatorSpec.java | 41 -
.../SimpleRegionIdTranslatorSpec.java | 41 -
.../SimpleRegionPropertyIdTranslatorSpec.java | 41 -
.../TestRegionIdTranslatorSpec.java | 51 -
.../TestRegionPropertyIdTranslatorSpec.java | 51 -
.../src/main/resources/json/input.json | 1467 --
.../gcmprotobuf/plugins/regions/AppTest.java | 13 -
.../resources-plugin/.flattened-pom.xml | 46 -
.../translation/plugins/resources/App.java | 209 -
.../ResourceIdTranslatorSpec.java | 41 -
.../ResourcePropertyIdTranslatorSpec.java | 41 -
.../ResourcesPluginDataTranslatorSpec.java | 231 -
.../TestResourceIdTranslatorSpec.java | 52 -
.../TestResourcePropertyIdTranslatorSpec.java | 52 -
.../src/main/resources/json/input.json | 5813 -----
.../plugins/resources/AppTest.java | 13 -
.../stochastics-plugin/.flattened-pom.xml | 46 -
.../translation/plugins/stochastics/App.java | 88 -
.../TestRandomGeneratorIdTranslatorSpec.java | 52 -
.../src/main/resources/json/input.json | 61 -
.../plugins/stochastics/AppTest.java | 12 -
.../protobuf}/.gitignore | 6 +-
.../protobuf}/core/pom.xml | 10 +-
.../protobuf/core/AbstractTranslatorSpec.java | 43 +
.../protobuf/core/ITranslatorSpec.java | 7 +
.../protobuf}/core/ReaderContext.java | 2 +-
.../protobuf}/core/Translator.java | 2 +-
.../protobuf}/core/TranslatorContext.java | 10 +-
.../protobuf}/core/TranslatorController.java | 34 +-
.../protobuf}/core/TranslatorCore.java | 104 +-
.../protobuf}/core/TranslatorId.java | 2 +-
.../gcm/translation/protobuf/core/Util.java | 30 +
.../protobuf}/core/WriterContext.java | 2 +-
.../BooleanTranslatorSpec.java | 16 +-
.../translatorSpecs/DateTranslatorSpec.java | 16 +-
.../translatorSpecs/DoubleTranslatorSpec.java | 19 +-
.../translatorSpecs/FloatTranslatorSpec.java | 19 +-
.../translatorSpecs/Int32TranslatorSpec.java | 19 +-
.../translatorSpecs/Int64TranslatorSpec.java | 19 +-
.../PrimitiveTranslatorSpecs.java | 70 +
.../translatorSpecs/StringTranslatorSpec.java | 19 +-
.../translatorSpecs/UInt32TranslatorSpec.java | 19 +-
.../translatorSpecs/UInt64TranslatorSpec.java | 19 +-
.../aspr/gcm/gcmprotobuf/core/AppTest.java | 0
.../pom.xml | 21 +-
.../GlobalPropertiesTranslator.java | 12 +-
.../GlobalPropertiesTranslatorId.java | 4 +-
...balPropertiesPluginDataTranslatorSpec.java | 25 +-
.../GlobalPropertyIdTranslatorSpec.java | 21 +-
.../TestGlobalPropertyIdTranslatorSpec.java | 35 +
.../src/main/resources/json/input.json | 24 +-
.../plugins/globalproperties/AppTest.java | 60 +
.../groups-plugin-translator}/pom.xml | 32 +-
.../plugins/groups/GroupsTranslator.java | 22 +-
.../plugins/groups/GroupsTranslatorId.java | 4 +-
.../plugins/groups/simobjects/Group.java | 2 +-
.../groups/simobjects/SimpleGroupTypeId.java | 2 +-
.../GroupIdTranslatorSpec.java | 34 +
.../GroupPropertyIdTranslatorSpec.java | 21 +-
.../GroupTypeIdTranslatorSpec.java | 19 +-
.../GroupsPluginDataTranslatorSpec.java | 39 +-
.../SimpleGroupTypeIdTranslatorSpec.java | 34 +
.../TestGroupPropertyIdTranslatorSpec.java | 35 +
.../TestGroupTypeIdTranslatorSpec.java | 34 +
.../src/main/resources/json/input.json | 158 +-
.../protobuf/plugins/groups/AppTest.java | 148 +
.../materials-plugin-translator}/pom.xml | 45 +-
.../materials/MaterialsTranslator.java | 28 +-
.../materials/MaterialsTranslatorId.java | 4 +-
.../BatchIdTranslatorSpec.java | 34 +
.../BatchPropertyIdTranslatorSpec.java | 34 +
.../MaterialIdTranslatorSpec.java | 34 +
.../MaterialsPluginDataTranslatorSpec.java | 328 +
.../MaterialsProducerIdTranslatorSpec.java | 35 +
...rialsProducerPropertyIdTranslatorSpec.java | 35 +
.../StageIdTranslatorSpec.java | 34 +
.../TestBatchPropertyIdTranslatorSpec.java | 35 +
.../TestMaterialIdTranslatorSpec.java | 35 +
...TestMaterialsProducerIdTranslatorSpec.java | 35 +
...rialsProducerPropertyIdTranslatorSpec.java | 35 +
.../src/main/resources/json/input.json | 2608 +-
.../protobuf/plugins/materials/AppTest.java | 105 +-
.../protobuf/nucleus-translator}/pom.xml | 16 +-
.../protobuf}/nucleus/NucleusTranslator.java | 8 +-
.../nucleus/NucleusTranslatorId.java | 4 +-
.../SimulationTimeTranslatorSpec.java | 18 +-
.../resources/json/simulationTimeInput.json | 0
.../translation/protobuf/nucleus/AppTest.java | 50 +
.../people-plugin-translator}/pom.xml | 13 +-
.../plugins/people/PeopleTranslator.java | 12 +-
.../plugins/people/PeopleTranslatorId.java | 4 +-
.../PeoplePluginDataTranslatorSpec.java | 21 +-
.../PersonIdTranslatorSpec.java | 19 +-
.../src/main/resources/json/input.json | 0
.../protobuf/plugins/people/AppTest.java | 60 +
.../pom.xml | 32 +-
.../PersonPropertiesTranslator.java | 14 +-
.../PersonPropertiesTranslatorId.java | 4 +-
...sonPropertiesPluginDataTranslatorSpec.java | 29 +-
.../PersonPropertyIdTranslatorSpec.java | 21 +-
.../TestPersonPropertyIdTranslatorSpec.java | 35 +
.../src/main/resources/json/input.json | 2032 +-
.../plugins/personproperties/AppTest.java | 104 +
.../plugin-translators-all/assembly.xml | 23 +
.../protobuf/plugin-translators-all/pom.xml | 99 +
.../protobuf}/pom.xml | 41 +-
.../properties-plugin-translator}/pom.xml | 13 +-
.../properties/PropertiesTranslator.java | 33 +
.../properties/PropertiesTranslatorId.java | 4 +-
.../simobjects/PropertyDefinitionMap.java | 2 +-
.../simobjects/PropertyValueMap.java | 2 +-
.../simobjects/Layer1SimObject.java | 64 +
.../simobjects/TestMessageSimObject.java | 40 +
.../translatorSpecs/Layer1TranslatorSpec.java | 21 +-
.../TestMessageTranslatorSpec.java | 44 +
.../PropertyDefinitionMapTranslatorSpec.java | 23 +-
.../PropertyDefinitionTranslatorSpec.java | 19 +-
.../PropertyValueMapTranslatorSpec.java | 21 +-
.../TimeTrackingPolicyTranslatorSpec.java | 35 +
.../src/main/resources/json/input.json | 2 +-
.../protobuf/plugins/properties/AppTest.java | 64 +
.../protobuf}/proto/pom.xml | 28 +-
.../gcm/translation/protobuf}/core/core.proto | 4 +-
.../gcm/translation/protobuf}/core/date.proto | 0
.../globalproperties-plugin.proto | 4 +-
.../protobuf}/groups/groups-plugin.proto | 4 +-
.../materials/materials-plugin.proto | 4 +-
.../protobuf}/nucleus/nucleus.proto | 4 +-
.../protobuf}/people/people-plugin.proto | 4 +-
.../personproperties-plugin.proto | 4 +-
.../properties/properties-plugin-test.proto | 4 +-
.../properties/properties-plugin.proto | 4 +-
.../protobuf}/regions/regions-plugin.proto | 4 +-
.../resources/resources-plugin.proto | 4 +-
.../stochastics/stochastics-plugin.proto | 4 +-
.../regions-plugin-translator}/pom.xml | 32 +-
.../plugins/regions/RegionsTranslator.java | 22 +-
.../plugins/regions/RegionsTranslatorId.java | 4 +-
.../RegionIdTranslatorSpec.java | 34 +
.../RegionPropertyIdTranslatorSpec.java | 34 +
.../RegionsPluginDataTranslatorSpec.java | 37 +-
.../SimpleRegionIdTranslatorSpec.java | 35 +
.../SimpleRegionPropertyIdTranslatorSpec.java | 36 +
.../TestRegionIdTranslatorSpec.java | 34 +
.../TestRegionPropertyIdTranslatorSpec.java | 35 +
.../src/main/resources/json/input.json | 1467 ++
.../protobuf/plugins/regions/AppTest.java | 111 +
.../resources-plugin-translator}/pom.xml | 37 +-
.../resources/ResourcesTranslator.java | 22 +-
.../resources/ResourcesTranslatorId.java | 4 +-
.../ResourceIdTranslatorSpec.java | 34 +
.../ResourceInitializationTranslatorSpec.java | 21 +-
.../ResourcePropertyIdTranslatorSpec.java | 35 +
.../ResourcesPluginDataTranslatorSpec.java | 239 +
.../TestResourceIdTranslatorSpec.java | 34 +
.../TestResourcePropertyIdTranslatorSpec.java | 35 +
.../src/main/resources/json/input.json | 5813 +++++
.../protobuf/plugins/resources/AppTest.java | 102 +
.../stochastics-plugin-translator}/pom.xml | 13 +-
.../stochastics/StochasticsTranslator.java | 10 +-
.../stochastics/StochasticsTranslatorId.java | 4 +-
.../RandomGeneratorIdTranslatorSpec.java | 22 +-
.../StochasticsPluginDataTranslatorSpec.java | 21 +-
.../TestRandomGeneratorIdTranslatorSpec.java | 35 +
.../src/main/resources/json/input.json | 61 +
.../protobuf/plugins/stochastics/AppTest.java | 57 +
224 files changed, 24222 insertions(+), 25556 deletions(-)
delete mode 100644 gcm-protobuf/.flattened-pom.xml
delete mode 100644 gcm-protobuf/core/.flattened-pom.xml
delete mode 100644 gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/core/AEnumTranslatorSpec.java
delete mode 100644 gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/core/AObjectTranslatorSpec.java
delete mode 100644 gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/core/ITranslatorSpec.java
delete mode 100644 gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/core/translatorSpecs/PrimitiveTranslatorSpecs.java
delete mode 100644 gcm-protobuf/globalproperties-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/globalproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/globalproperties/App.java
delete mode 100644 gcm-protobuf/globalproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/globalproperties/translatorSpecs/TestGlobalPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/globalproperties-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/globalproperties/AppTest.java
delete mode 100644 gcm-protobuf/groups-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/groups/App.java
delete mode 100644 gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/groups/translatorSpecs/GroupIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/groups/translatorSpecs/SimpleGroupTypeIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/groups/translatorSpecs/TestGroupPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/groups/translatorSpecs/TestGroupTypeIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/BatchIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/BatchPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/MaterialIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/MaterialsPluginDataTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/MaterialsProducerIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/MaterialsProducerPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/StageIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/TestBatchPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/TestMaterialIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/TestMaterialsProducerIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/translatorSpecs/TestMaterialsProducerPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/materials-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/materials/AppTest.java
delete mode 100644 gcm-protobuf/nucleus/src/main/java/gov/hss/aspr/gcm/translation/nucleus/App.java
delete mode 100644 gcm-protobuf/nucleus/src/test/java/gov/hss/aspr/gcm/translation/nucleus/AppTest.java
delete mode 100644 gcm-protobuf/people-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/people-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/people/App.java
delete mode 100644 gcm-protobuf/people-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/people/AppTest.java
delete mode 100644 gcm-protobuf/personproperties-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/personproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/personproperties/App.java
delete mode 100644 gcm-protobuf/personproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/personproperties/translatorSpecs/TestPersonPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/personproperties-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/globalproperties/AppTest.java
delete mode 100644 gcm-protobuf/properties-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/properties/App.java
delete mode 100644 gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/properties/PropertiesTranslator.java
delete mode 100644 gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/properties/testsupport/simobjects/Layer1SimObject.java
delete mode 100644 gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/properties/testsupport/simobjects/TestMessageSimObject.java
delete mode 100644 gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/properties/testsupport/translatorSpecs/TestMessageTranslatorSpec.java
delete mode 100644 gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/properties/translatorSpecs/TimeTrackingPolicyTranslatorSpec.java
delete mode 100644 gcm-protobuf/properties-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/properties/AppTest.java
delete mode 100644 gcm-protobuf/regions-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/regions/App.java
delete mode 100644 gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/regions/translatorSpecs/RegionIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/regions/translatorSpecs/RegionPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/regions/translatorSpecs/SimpleRegionIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/regions/translatorSpecs/SimpleRegionPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/regions/translatorSpecs/TestRegionIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/regions/translatorSpecs/TestRegionPropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/regions-plugin/src/main/resources/json/input.json
delete mode 100644 gcm-protobuf/regions-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/regions/AppTest.java
delete mode 100644 gcm-protobuf/resources-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/resources/App.java
delete mode 100644 gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/resources/translatorSpecs/ResourceIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/resources/translatorSpecs/ResourcePropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/resources/translatorSpecs/ResourcesPluginDataTranslatorSpec.java
delete mode 100644 gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/resources/translatorSpecs/TestResourceIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/resources/translatorSpecs/TestResourcePropertyIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/resources-plugin/src/main/resources/json/input.json
delete mode 100644 gcm-protobuf/resources-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/resources/AppTest.java
delete mode 100644 gcm-protobuf/stochastics-plugin/.flattened-pom.xml
delete mode 100644 gcm-protobuf/stochastics-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/stochastics/App.java
delete mode 100644 gcm-protobuf/stochastics-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/stochastics/translatorSpecs/TestRandomGeneratorIdTranslatorSpec.java
delete mode 100644 gcm-protobuf/stochastics-plugin/src/main/resources/json/input.json
delete mode 100644 gcm-protobuf/stochastics-plugin/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/plugins/stochastics/AppTest.java
rename {gcm-protobuf => translation/protobuf}/.gitignore (99%)
rename {gcm-protobuf => translation/protobuf}/core/pom.xml (94%)
create mode 100644 translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/core/AbstractTranslatorSpec.java
create mode 100644 translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/core/ITranslatorSpec.java
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/ReaderContext.java (92%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/Translator.java (99%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/TranslatorContext.java (56%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/TranslatorController.java (90%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/TranslatorCore.java (75%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/TranslatorId.java (86%)
create mode 100644 translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/core/Util.java
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/WriterContext.java (94%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/BooleanTranslatorSpec.java (51%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/DateTranslatorSpec.java (61%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/DoubleTranslatorSpec.java (51%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/FloatTranslatorSpec.java (51%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/Int32TranslatorSpec.java (51%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/Int64TranslatorSpec.java (51%)
create mode 100644 translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/core/translatorSpecs/PrimitiveTranslatorSpecs.java
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/StringTranslatorSpec.java (51%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/UInt32TranslatorSpec.java (51%)
rename {gcm-protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/core/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/core/translatorSpecs/UInt64TranslatorSpec.java (51%)
rename {gcm-protobuf => translation/protobuf}/core/src/test/java/gov/hhs/aspr/gcm/gcmprotobuf/core/AppTest.java (100%)
rename {gcm-protobuf/globalproperties-plugin => translation/protobuf/globalproperties-plugin-translator}/pom.xml (87%)
rename {gcm-protobuf/globalproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/globalproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/globalproperties/GlobalPropertiesTranslator.java (72%)
rename {gcm-protobuf/globalproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/globalproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/globalproperties/GlobalPropertiesTranslatorId.java (61%)
rename {gcm-protobuf/globalproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/globalproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/globalproperties/translatorSpecs/GlobalPropertiesPluginDataTranslatorSpec.java (78%)
rename {gcm-protobuf/globalproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/globalproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/globalproperties/translatorSpecs/GlobalPropertyIdTranslatorSpec.java (52%)
create mode 100644 translation/protobuf/globalproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/globalproperties/translatorSpecs/TestGlobalPropertyIdTranslatorSpec.java
rename {gcm-protobuf/globalproperties-plugin => translation/protobuf/globalproperties-plugin-translator}/src/main/resources/json/input.json (64%)
create mode 100644 translation/protobuf/globalproperties-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/globalproperties/AppTest.java
rename {gcm-protobuf/groups-plugin => translation/protobuf/groups-plugin-translator}/pom.xml (84%)
rename {gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/groups/GroupsTranslator.java (67%)
rename {gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/groups/GroupsTranslatorId.java (59%)
rename {gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/groups/simobjects/Group.java (87%)
rename {gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/groups/simobjects/SimpleGroupTypeId.java (78%)
create mode 100644 translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/groups/translatorSpecs/GroupIdTranslatorSpec.java
rename {gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/groups/translatorSpecs/GroupPropertyIdTranslatorSpec.java (52%)
rename {gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/groups/translatorSpecs/GroupTypeIdTranslatorSpec.java (53%)
rename {gcm-protobuf/groups-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/groups/translatorSpecs/GroupsPluginDataTranslatorSpec.java (85%)
create mode 100644 translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/groups/translatorSpecs/SimpleGroupTypeIdTranslatorSpec.java
create mode 100644 translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/groups/translatorSpecs/TestGroupPropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/groups-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/groups/translatorSpecs/TestGroupTypeIdTranslatorSpec.java
rename {gcm-protobuf/groups-plugin => translation/protobuf/groups-plugin-translator}/src/main/resources/json/input.json (72%)
create mode 100644 translation/protobuf/groups-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/groups/AppTest.java
rename {gcm-protobuf/materials-plugin => translation/protobuf/materials-plugin-translator}/pom.xml (75%)
rename {gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/materials/MaterialsTranslator.java (63%)
rename {gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/materials/MaterialsTranslatorId.java (59%)
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/BatchIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/BatchPropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/MaterialIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/MaterialsPluginDataTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/MaterialsProducerIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/MaterialsProducerPropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/StageIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/TestBatchPropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/TestMaterialIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/TestMaterialsProducerIdTranslatorSpec.java
create mode 100644 translation/protobuf/materials-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/translatorSpecs/TestMaterialsProducerPropertyIdTranslatorSpec.java
rename {gcm-protobuf/materials-plugin => translation/protobuf/materials-plugin-translator}/src/main/resources/json/input.json (53%)
rename gcm-protobuf/materials-plugin/src/main/java/gov/hhs/aspr/gcm/translation/plugins/materials/App.java => translation/protobuf/materials-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/materials/AppTest.java (71%)
rename {gcm-protobuf/nucleus => translation/protobuf/nucleus-translator}/pom.xml (91%)
rename {gcm-protobuf/nucleus/src/main/java/gov/hss/aspr/gcm/translation => translation/protobuf/nucleus-translator/src/main/java/gov/hss/aspr/gcm/translation/protobuf}/nucleus/NucleusTranslator.java (72%)
rename {gcm-protobuf/nucleus/src/main/java/gov/hss/aspr/gcm/translation => translation/protobuf/nucleus-translator/src/main/java/gov/hss/aspr/gcm/translation/protobuf}/nucleus/NucleusTranslatorId.java (60%)
rename {gcm-protobuf/nucleus/src/main/java/gov/hss/aspr/gcm/translation => translation/protobuf/nucleus-translator/src/main/java/gov/hss/aspr/gcm/translation/protobuf}/nucleus/translatorSpecs/SimulationTimeTranslatorSpec.java (66%)
rename {gcm-protobuf/nucleus => translation/protobuf/nucleus-translator}/src/main/resources/json/simulationTimeInput.json (100%)
create mode 100644 translation/protobuf/nucleus-translator/src/test/java/gov/hss/aspr/gcm/translation/protobuf/nucleus/AppTest.java
rename {gcm-protobuf/people-plugin => translation/protobuf/people-plugin-translator}/pom.xml (92%)
rename {gcm-protobuf/people-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/people-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/people/PeopleTranslator.java (74%)
rename {gcm-protobuf/people-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/people-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/people/PeopleTranslatorId.java (60%)
rename {gcm-protobuf/people-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/people-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/people/translatorSpecs/PeoplePluginDataTranslatorSpec.java (66%)
rename {gcm-protobuf/people-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/people-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/people/translatorSpecs/PersonIdTranslatorSpec.java (50%)
rename {gcm-protobuf/people-plugin => translation/protobuf/people-plugin-translator}/src/main/resources/json/input.json (100%)
create mode 100644 translation/protobuf/people-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/people/AppTest.java
rename {gcm-protobuf/personproperties-plugin => translation/protobuf/personproperties-plugin-translator}/pom.xml (85%)
rename {gcm-protobuf/personproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/personproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/personproperties/PersonPropertiesTranslator.java (70%)
rename {gcm-protobuf/personproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/personproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/personproperties/PersonPropertiesTranslatorId.java (61%)
rename {gcm-protobuf/personproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/personproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/personproperties/translatorSpecs/PersonPropertiesPluginDataTranslatorSpec.java (80%)
rename {gcm-protobuf/personproperties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/personproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/personproperties/translatorSpecs/PersonPropertyIdTranslatorSpec.java (52%)
create mode 100644 translation/protobuf/personproperties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/personproperties/translatorSpecs/TestPersonPropertyIdTranslatorSpec.java
rename {gcm-protobuf/personproperties-plugin => translation/protobuf/personproperties-plugin-translator}/src/main/resources/json/input.json (57%)
create mode 100644 translation/protobuf/personproperties-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/personproperties/AppTest.java
create mode 100644 translation/protobuf/plugin-translators-all/assembly.xml
create mode 100644 translation/protobuf/plugin-translators-all/pom.xml
rename {gcm-protobuf => translation/protobuf}/pom.xml (87%)
rename {gcm-protobuf/properties-plugin => translation/protobuf/properties-plugin-translator}/pom.xml (92%)
create mode 100644 translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/properties/PropertiesTranslator.java
rename {gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/properties/PropertiesTranslatorId.java (60%)
rename {gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/properties/simobjects/PropertyDefinitionMap.java (88%)
rename {gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/properties/simobjects/PropertyValueMap.java (84%)
create mode 100644 translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/properties/testsupport/simobjects/Layer1SimObject.java
create mode 100644 translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/properties/testsupport/simobjects/TestMessageSimObject.java
rename {gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/properties/testsupport/translatorSpecs/Layer1TranslatorSpec.java (51%)
create mode 100644 translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/properties/testsupport/translatorSpecs/TestMessageTranslatorSpec.java
rename {gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/properties/translatorSpecs/PropertyDefinitionMapTranslatorSpec.java (62%)
rename {gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/properties/translatorSpecs/PropertyDefinitionTranslatorSpec.java (76%)
rename {gcm-protobuf/properties-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/properties/translatorSpecs/PropertyValueMapTranslatorSpec.java (60%)
create mode 100644 translation/protobuf/properties-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/properties/translatorSpecs/TimeTrackingPolicyTranslatorSpec.java
rename {gcm-protobuf/properties-plugin => translation/protobuf/properties-plugin-translator}/src/main/resources/json/input.json (72%)
create mode 100644 translation/protobuf/properties-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/properties/AppTest.java
rename {gcm-protobuf => translation/protobuf}/proto/pom.xml (76%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/core/core.proto (52%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/core/date.proto (100%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/globalproperties/globalproperties-plugin.proto (82%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/groups/groups-plugin.proto (93%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/materials/materials-plugin.proto (96%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/nucleus/nucleus.proto (59%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/people/people-plugin.proto (57%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/personproperties/personproperties-plugin.proto (88%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/properties/properties-plugin-test.proto (53%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/properties/properties-plugin.proto (81%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/regions/regions-plugin.proto (91%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/resources/resources-plugin.proto (94%)
rename {gcm-protobuf/proto/src/gov/hhs/aspr/gcm => translation/protobuf/proto/src/gov/hhs/aspr/gcm/translation/protobuf}/stochastics/stochastics-plugin.proto (77%)
rename {gcm-protobuf/regions-plugin => translation/protobuf/regions-plugin-translator}/pom.xml (85%)
rename {gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/regions/RegionsTranslator.java (65%)
rename {gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/regions/RegionsTranslatorId.java (58%)
create mode 100644 translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/regions/translatorSpecs/RegionIdTranslatorSpec.java
create mode 100644 translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/regions/translatorSpecs/RegionPropertyIdTranslatorSpec.java
rename {gcm-protobuf/regions-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/regions/translatorSpecs/RegionsPluginDataTranslatorSpec.java (83%)
create mode 100644 translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/regions/translatorSpecs/SimpleRegionIdTranslatorSpec.java
create mode 100644 translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/regions/translatorSpecs/SimpleRegionPropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/regions/translatorSpecs/TestRegionIdTranslatorSpec.java
create mode 100644 translation/protobuf/regions-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/regions/translatorSpecs/TestRegionPropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/regions-plugin-translator/src/main/resources/json/input.json
create mode 100644 translation/protobuf/regions-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/regions/AppTest.java
rename {gcm-protobuf/resources-plugin => translation/protobuf/resources-plugin-translator}/pom.xml (78%)
rename {gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/resources/ResourcesTranslator.java (65%)
rename {gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/resources/ResourcesTranslatorId.java (58%)
create mode 100644 translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/resources/translatorSpecs/ResourceIdTranslatorSpec.java
rename {gcm-protobuf/resources-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/resources/translatorSpecs/ResourceInitializationTranslatorSpec.java (62%)
create mode 100644 translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/resources/translatorSpecs/ResourcePropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/resources/translatorSpecs/ResourcesPluginDataTranslatorSpec.java
create mode 100644 translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/resources/translatorSpecs/TestResourceIdTranslatorSpec.java
create mode 100644 translation/protobuf/resources-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/resources/translatorSpecs/TestResourcePropertyIdTranslatorSpec.java
create mode 100644 translation/protobuf/resources-plugin-translator/src/main/resources/json/input.json
create mode 100644 translation/protobuf/resources-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/resources/AppTest.java
rename {gcm-protobuf/stochastics-plugin => translation/protobuf/stochastics-plugin-translator}/pom.xml (92%)
rename {gcm-protobuf/stochastics-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/stochastics-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/stochastics/StochasticsTranslator.java (75%)
rename {gcm-protobuf/stochastics-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/stochastics-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/stochastics/StochasticsTranslatorId.java (61%)
rename {gcm-protobuf/stochastics-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/stochastics-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/stochastics/translatorSpecs/RandomGeneratorIdTranslatorSpec.java (53%)
rename {gcm-protobuf/stochastics-plugin/src/main/java/gov/hhs/aspr/gcm/translation => translation/protobuf/stochastics-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf}/plugins/stochastics/translatorSpecs/StochasticsPluginDataTranslatorSpec.java (70%)
create mode 100644 translation/protobuf/stochastics-plugin-translator/src/main/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/stochastics/translatorSpecs/TestRandomGeneratorIdTranslatorSpec.java
create mode 100644 translation/protobuf/stochastics-plugin-translator/src/main/resources/json/input.json
create mode 100644 translation/protobuf/stochastics-plugin-translator/src/test/java/gov/hhs/aspr/gcm/translation/protobuf/plugins/stochastics/AppTest.java
diff --git a/demos/demo1/.gitignore b/demos/demo1/.gitignore
index 3863064f6..b554593a2 100644
--- a/demos/demo1/.gitignore
+++ b/demos/demo1/.gitignore
@@ -321,4 +321,7 @@ Temporary Items
###################################
# END MacOS
-###################################
\ No newline at end of file
+###################################
+
+
+.vscode
\ No newline at end of file
diff --git a/demos/demo1/pom.xml b/demos/demo1/pom.xml
index b2b32e63e..57b755c73 100644
--- a/demos/demo1/pom.xml
+++ b/demos/demo1/pom.xml
@@ -62,38 +62,8 @@
${protobuf.version}
- gov.hhs.aspr.gcm.translation
- core
- ${gcm.proto-definitions.version}
-
-
- gov.hhs.aspr.gcm.translation
- nucleus-translator
- ${gcm.proto-definitions.version}
-
-
- gov.hhs.aspr.gcm.translation
- regions-plugin-translator
- ${gcm.proto-definitions.version}
-
-
- gov.hhs.aspr.gcm.translation
- people-plugin-translator
- ${gcm.proto-definitions.version}
-
-
- gov.hhs.aspr.gcm.translation
- stochastics-plugin-translator
- ${gcm.proto-definitions.version}
-
-
- gov.hhs.aspr.gcm.translation
- globalproperties-plugin-translator
- ${gcm.proto-definitions.version}
-
-
- gov.hhs.aspr.gcm.translation
- personproperties-plugin-translator
+ gov.hhs.aspr.gcm.translation.protobuf
+ plugin-translators-all
${gcm.proto-definitions.version}
diff --git a/demos/demo1/src/main/java/lesson/SerializationDemonstration.java b/demos/demo1/src/main/java/lesson/SerializationDemonstration.java
index e64667c49..7b882a91c 100644
--- a/demos/demo1/src/main/java/lesson/SerializationDemonstration.java
+++ b/demos/demo1/src/main/java/lesson/SerializationDemonstration.java
@@ -9,15 +9,15 @@
import org.apache.commons.math3.random.RandomGenerator;
-import gov.hhs.aspr.gcm.translation.core.Translator;
-import gov.hhs.aspr.gcm.translation.core.TranslatorController;
-import gov.hhs.aspr.gcm.translation.plugins.globalproperties.GlobalPropertiesTranslator;
-import gov.hhs.aspr.gcm.translation.plugins.people.PeopleTranslator;
-import gov.hhs.aspr.gcm.translation.plugins.personproperties.PersonPropertiesTranslator;
-import gov.hhs.aspr.gcm.translation.plugins.properties.PropertiesTranslator;
-import gov.hhs.aspr.gcm.translation.plugins.regions.RegionsTranslator;
-import gov.hhs.aspr.gcm.translation.plugins.stochastics.StochasticsTranslator;
-import gov.hss.aspr.gcm.translation.nucleus.NucleusTranslator;
+import gov.hhs.aspr.gcm.translation.protobuf.core.Translator;
+import gov.hhs.aspr.gcm.translation.protobuf.core.TranslatorController;
+import gov.hhs.aspr.gcm.translation.protobuf.plugins.globalproperties.GlobalPropertiesTranslator;
+import gov.hhs.aspr.gcm.translation.protobuf.plugins.people.PeopleTranslator;
+import gov.hhs.aspr.gcm.translation.protobuf.plugins.personproperties.PersonPropertiesTranslator;
+import gov.hhs.aspr.gcm.translation.protobuf.plugins.properties.PropertiesTranslator;
+import gov.hhs.aspr.gcm.translation.protobuf.plugins.regions.RegionsTranslator;
+import gov.hhs.aspr.gcm.translation.protobuf.plugins.stochastics.StochasticsTranslator;
+import gov.hss.aspr.gcm.translation.protobuf.nucleus.NucleusTranslator;
import lesson.plugins.model.GlobalProperty;
import lesson.plugins.model.ModelPlugin;
import lesson.plugins.model.ModelReportLabel;
@@ -42,14 +42,11 @@
import plugins.people.PeoplePluginData;
import plugins.personproperties.PersonPropertiesPlugin;
import plugins.personproperties.PersonPropertiesPluginData;
-import plugins.personproperties.reports.PersonPropertyReport;
-import plugins.personproperties.reports.PersonPropertyReportPluginData;
import plugins.regions.RegionsPlugin;
import plugins.regions.RegionsPluginData;
import plugins.reports.ReportsPlugin;
import plugins.reports.ReportsPluginData;
import plugins.reports.support.NIOReportItemHandler;
-import plugins.reports.support.ReportPeriod;
import plugins.stochastics.StochasticsPlugin;
import plugins.stochastics.StochasticsPluginData;
import plugins.util.properties.PropertyDefinition;
@@ -84,7 +81,7 @@ private SerializationDemonstration(Path outputDirectory) {
.addTranslatorSpec(new PersonPropertyTranslatorSpec())
.addTranslatorSpec(new GlobalPropertyTranslatorSpec())
.addTranslatorSpec(new RegionTranslatorSpec())
- .build().init();
+ .build();
}
private RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(524055747550937602L);
@@ -92,15 +89,6 @@ private SerializationDemonstration(Path outputDirectory) {
private Plugin getReportsPlugin() {
ReportsPluginData reportsPluginData = //
ReportsPluginData.builder()//
- .addReport(() -> {
- PersonPropertyReportPluginData personPropertyReportPluginData = PersonPropertyReportPluginData
- .builder()//
- .setReportLabel(ModelReportLabel.PERSON_PROPERTY_REPORT)//
- .setReportPeriod(ReportPeriod.END_OF_SIMULATION)//
- .setDefaultInclusion(true)//
- .build();//
- return new PersonPropertyReport(personPropertyReportPluginData)::init;
- })//
.addReport(() -> {
return new VaccineReport(ModelReportLabel.VACCINATION)::init;
})//
@@ -154,7 +142,8 @@ private Plugin getPersonPropertiesPlugin() {
builder.definePersonProperty(PersonProperty.VACCINATED, propertyDefinition);
PersonPropertiesPluginData personPropertiesPluginData = builder.build();
- return PersonPropertiesPlugin.getPersonPropertyPlugin(personPropertiesPluginData);
+ return PersonPropertiesPlugin.builder().setPersonPropertiesPluginData(personPropertiesPluginData)
+ .getPersonPropertyPlugin();
}
private Plugin getStochasticsPlugin() {
@@ -248,7 +237,8 @@ private Plugin getGlobalPropertiesPlugin() {
GlobalPropertiesPluginData globalPropertiesPluginData = builder.build();
- return GlobalPropertiesPlugin.getGlobalPropertiesPlugin(globalPropertiesPluginData);
+ return GlobalPropertiesPlugin.builder().setGlobalPropertiesPluginData(globalPropertiesPluginData)
+ .getGlobalPropertiesPlugin();
}
private void execute() {
@@ -293,8 +283,9 @@ private void execute() {
continue;
}
if (pluginData instanceof PersonPropertiesPluginData) {
- personPropertiesPlugin = PersonPropertiesPlugin
- .getPersonPropertyPlugin((PersonPropertiesPluginData) pluginData);
+ personPropertiesPlugin = PersonPropertiesPlugin.builder()
+ .setPersonPropertiesPluginData((PersonPropertiesPluginData) pluginData)
+ .getPersonPropertyPlugin();
continue;
}
@@ -304,8 +295,9 @@ private void execute() {
}
if (pluginData instanceof GlobalPropertiesPluginData) {
- globalPropertiesPlugin = GlobalPropertiesPlugin
- .getGlobalPropertiesPlugin((GlobalPropertiesPluginData) pluginData);
+ globalPropertiesPlugin = GlobalPropertiesPlugin.builder()
+ .setGlobalPropertiesPluginData((GlobalPropertiesPluginData) pluginData)
+ .getGlobalPropertiesPlugin();
continue;
}
@@ -402,8 +394,6 @@ private void handleExperiementOpen(ExperimentContext experimentContext) {
.addTranslatorSpec(new RegionTranslatorSpec());
this.writingTranslatorController = translatorControllerBuilder.build();
-
- this.writingTranslatorController.init();
}
private void handleSimulationStateCollection(Integer scenarioId, List