Protobuf Translation 1.0.0

demos/demo1/.gitignore

@@ -321,4 +321,7 @@ Temporary Items
 
 ###################################
 # END MacOS
-###################################
+###################################
+
+
+.vscode

demos/demo1/pom.xml

@@ -62,38 +62,8 @@
 			<version>${protobuf.version}</version>
         </dependency>
 		 <dependency>
-			<groupId>gov.hhs.aspr.gcm.translation</groupId>
-			<artifactId>core</artifactId>
-			<version>${gcm.proto-definitions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>gov.hhs.aspr.gcm.translation</groupId>
-			<artifactId>nucleus-translator</artifactId>
-			<version>${gcm.proto-definitions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>gov.hhs.aspr.gcm.translation</groupId>
-			<artifactId>regions-plugin-translator</artifactId>
-			<version>${gcm.proto-definitions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>gov.hhs.aspr.gcm.translation</groupId>
-			<artifactId>people-plugin-translator</artifactId>
-			<version>${gcm.proto-definitions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>gov.hhs.aspr.gcm.translation</groupId>
-			<artifactId>stochastics-plugin-translator</artifactId>
-			<version>${gcm.proto-definitions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>gov.hhs.aspr.gcm.translation</groupId>
-			<artifactId>globalproperties-plugin-translator</artifactId>
-			<version>${gcm.proto-definitions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>gov.hhs.aspr.gcm.translation</groupId>
-			<artifactId>personproperties-plugin-translator</artifactId>
+			<groupId>gov.hhs.aspr.gcm.translation.protobuf</groupId>
+			<artifactId>plugin-translators-all</artifactId>
 			<version>${gcm.proto-definitions.version}</version>
 		</dependency>
 		<dependency>

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,23 +81,14 @@ private SerializationDemonstration(Path outputDirectory) {
 				.addTranslatorSpec(new PersonPropertyTranslatorSpec())
 				.addTranslatorSpec(new GlobalPropertyTranslatorSpec())
 				.addTranslatorSpec(new RegionTranslatorSpec())
-				.build().init();
+				.build();
 	}
 
 	private RandomGenerator randomGenerator = RandomGeneratorProvider.getRandomGenerator(524055747550937602L);
 
 	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<Object> output) {

demos/demo1/src/main/java/lesson/translatorSpecs/GlobalPropertyTranslatorSpec.java

@@ -1,39 +1,24 @@
 package lesson.translatorSpecs;
 
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.ProtocolMessageEnum;
-
-import gov.hhs.aspr.gcm.translation.core.AEnumTranslatorSpec;
+import gov.hhs.aspr.gcm.translation.protobuf.core.AbstractTranslatorSpec;
 import lesson.input.GlobalPropertyInput;
 import lesson.plugins.model.GlobalProperty;
 
-public class GlobalPropertyTranslatorSpec extends AEnumTranslatorSpec<GlobalPropertyInput, GlobalProperty> {
+public class GlobalPropertyTranslatorSpec extends AbstractTranslatorSpec<GlobalPropertyInput, GlobalProperty> {
 
     @Override
     protected GlobalProperty convertInputObject(GlobalPropertyInput inputObject) {
         return GlobalProperty.valueOf(inputObject.name());
     }
 
     @Override
-    protected GlobalPropertyInput convertSimObject(GlobalProperty simObject) {
+    protected GlobalPropertyInput convertAppObject(GlobalProperty simObject) {
         return GlobalPropertyInput.valueOf(simObject.name());
     }
 
     @Override
-    public EnumDescriptor getDescriptorForInputObject() {
-        return GlobalPropertyInput.getDescriptor();
-    }
-
-    @Override
-    public EnumInstance getEnumInstance() {
-        return new EnumInstance() {
-
-            @Override
-            public ProtocolMessageEnum getFromString(String arg0) {
-                return GlobalPropertyInput.valueOf(arg0);
-            }
-
-        };
+    public GlobalPropertyInput getDefaultInstanceForInputObject() {
+        return GlobalPropertyInput.forNumber(0);
     }
 
     @Override
@@ -42,7 +27,7 @@ public Class<GlobalPropertyInput> getInputObjectClass() {
     }
 
     @Override
-    public Class<GlobalProperty> getSimObjectClass() {
+    public Class<GlobalProperty> getAppObjectClass() {
         return GlobalProperty.class;
     }
 

demos/demo1/src/main/java/lesson/translatorSpecs/PersonPropertyTranslatorSpec.java

@@ -1,39 +1,24 @@
 package lesson.translatorSpecs;
 
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.ProtocolMessageEnum;
-
-import gov.hhs.aspr.gcm.translation.core.AEnumTranslatorSpec;
+import gov.hhs.aspr.gcm.translation.protobuf.core.AbstractTranslatorSpec;
 import lesson.input.PersonPropertyInput;
 import lesson.plugins.model.PersonProperty;
 
-public class PersonPropertyTranslatorSpec extends AEnumTranslatorSpec<PersonPropertyInput, PersonProperty> {
+public class PersonPropertyTranslatorSpec extends AbstractTranslatorSpec<PersonPropertyInput, PersonProperty> {
 
     @Override
     protected PersonProperty convertInputObject(PersonPropertyInput inputObject) {
         return PersonProperty.valueOf(inputObject.name());
     }
 
     @Override
-    protected PersonPropertyInput convertSimObject(PersonProperty simObject) {
+    protected PersonPropertyInput convertAppObject(PersonProperty simObject) {
         return PersonPropertyInput.valueOf(simObject.name());
     }
 
     @Override
-    public EnumDescriptor getDescriptorForInputObject() {
-        return PersonPropertyInput.getDescriptor();
-    }
-
-    @Override
-    public EnumInstance getEnumInstance() {
-        return new EnumInstance() {
-
-            @Override
-            public ProtocolMessageEnum getFromString(String arg0) {
-                return PersonPropertyInput.valueOf(arg0);
-            }
-
-        };
+    public PersonPropertyInput getDefaultInstanceForInputObject() {
+        return PersonPropertyInput.forNumber(0);
     }
 
     @Override
@@ -42,9 +27,8 @@ public Class<PersonPropertyInput> getInputObjectClass() {
     }
 
     @Override
-    public Class<PersonProperty> getSimObjectClass() {
-        return 
-        PersonProperty.class;
+    public Class<PersonProperty> getAppObjectClass() {
+        return PersonProperty.class;
     }
 
 }

demos/demo1/src/main/java/lesson/translatorSpecs/RegionTranslatorSpec.java

@@ -1,20 +1,18 @@
 package lesson.translatorSpecs;
 
-import com.google.protobuf.Descriptors.Descriptor;
-
-import gov.hhs.aspr.gcm.translation.core.AObjectTranslatorSpec;
+import gov.hhs.aspr.gcm.translation.protobuf.core.AbstractTranslatorSpec;
 import lesson.input.RegionInput;
 import lesson.plugins.model.Region;
 
-public class RegionTranslatorSpec extends AObjectTranslatorSpec<RegionInput, Region> {
+public class RegionTranslatorSpec extends AbstractTranslatorSpec<RegionInput, Region> {
 
     @Override
     protected Region convertInputObject(RegionInput inputObject) {
-      return new Region(inputObject.getId());
+        return new Region(inputObject.getId());
     }
 
     @Override
-    protected RegionInput convertSimObject(Region simObject) {
+    protected RegionInput convertAppObject(Region simObject) {
         return RegionInput.newBuilder().setId(simObject.getValue()).build();
     }
 
@@ -23,21 +21,14 @@ public RegionInput getDefaultInstanceForInputObject() {
         return RegionInput.getDefaultInstance();
     }
 
-    @Override
-    public Descriptor getDescriptorForInputObject() {
-       return RegionInput.getDescriptor();
-    }
-
     @Override
     public Class<RegionInput> getInputObjectClass() {
         return RegionInput.class;
     }
 
     @Override
-    public Class<Region> getSimObjectClass() {
+    public Class<Region> getAppObjectClass() {
         return Region.class;
     }
 
-
-
 }

demos/demo1/src/main/proto/lesson.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package gov.hhs.aspr.gcm;
+package gov.hhs.aspr.gcm.translation.demo;
 
 option java_multiple_files = true;
 option java_package = "lesson.input";