update to util 4.2.0 (#48)

HHS · May 17, 2024 · 3825a78 · 3825a78
1 parent 80121c2
commit 3825a78
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 42 deletions.
diff --git a/pom.xml b/pom.xml
@@ -69,8 +69,8 @@
         <central-publishing-maven-plugin.version>0.4.0</central-publishing-maven-plugin.version>
 
         <!-- dependency versions -->
-        <taskit.version>4.0.2</taskit.version>
-        <gcm.version>4.2.0</gcm.version>
+        <taskit.version>4.1.0-SNAPSHOT</taskit.version>
+        <gcm.version>4.2.1-SNAPSHOT</gcm.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
     </properties>

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/IT_NucleusTranslator.java
@@ -19,14 +19,14 @@
 
 public class IT_NucleusTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testSimulationStateTranslator() {
         String fileName = "simulationState.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(
@@ -57,7 +57,7 @@ public void testSimulationStateTranslator() {
     public void testExperimentParameterDataTranslator() {
         String fileName = "experimentParameterData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(

diff --git a/...s/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java b/...s/aspr/ms/gcm/taskit/protobuf/plugins/globalproperties/IT_GlobalPropertiesTranslator.java
@@ -26,14 +26,14 @@
 
 public class IT_GlobalPropertiesTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testGlobalPropertiesPluginDataIntegration() {
         String fileName = "globalPropertiesPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder()
                 .addTranslator(GlobalPropertiesTranslator.getTranslator())
@@ -68,7 +68,7 @@ public void testGlobalPropertiesPluginDataIntegration() {
     public void testGlobalPropertyReportPluginDataIntegration() {
         String fileName = "propertyReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder()
                 .addTranslator(GlobalPropertiesTranslator.getTranslator())

diff --git a/...src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java b/...src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/groups/IT_GroupsTranslator.java
@@ -34,14 +34,14 @@
 
 public class IT_GroupsTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testGroupsTranslator() {
         String fileName = "groupsPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder()
                 .addTranslator(GroupsTranslator.getTranslator())
@@ -99,7 +99,7 @@ public void testGroupsTranslator() {
     public void testGroupPropertyReportTranslatorSpec() {
         String fileName = "propertyReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         ProtobufTranslationEngine protobufTranslationEngine = ProtobufTranslationEngine.builder()
                 .addTranslator(GroupsTranslator.getTranslator())

diff --git a/...st/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java b/...st/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/materials/IT_MaterialsTranslator.java
@@ -32,14 +32,14 @@
 
 public class IT_MaterialsTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testMaterialsTranslator() {
         String fileName = "materialsPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -76,7 +76,7 @@ public void testMaterialsTranslator() {
     public void testBatchStatusReportPluginDataTranslatorSpec() {
         String fileName = "batchStatusReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -116,7 +116,7 @@ public void testBatchStatusReportPluginDataTranslatorSpec() {
     public void testMaterialsProducerPropertyReportPluginDataTranslatorSpec() {
         String fileName = "materialsProducerPropertyReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -155,7 +155,7 @@ public void testMaterialsProducerPropertyReportPluginDataTranslatorSpec() {
     public void testMaterialsProducerResourceReportPluginDataTranslatorSpec() {
         String fileName = "materialsProducerResourceReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -194,7 +194,7 @@ public void testMaterialsProducerResourceReportPluginDataTranslatorSpec() {
     public void testStageReportPluginDataTranslatorSpec() {
         String fileName = "stageReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()

diff --git a/.../java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java b/.../java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/partitions/IT_PartitionsTranslator.java
@@ -18,14 +18,14 @@
 
 public class IT_PartitionsTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testGroupsTranslator() {
         String fileName = "partitionsPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()

diff --git a/...src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java b/...src/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/people/IT_PeopleTranslator.java
@@ -19,14 +19,14 @@
 
 public class IT_PeopleTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testPeopleTranslator() {
         String fileName = "peoplePluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(

diff --git a/...s/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java b/...s/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/IT_PersonPropertiesTranslator.java
@@ -36,14 +36,14 @@
 
 public class IT_PersonPropertiesTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testPersonPropertiesTranslator() {
         String fileName = "personPropertiesPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -83,7 +83,7 @@ public void testPersonPropertiesTranslator() {
     public void testPersonPropertyReportTranslatorSpec() {
         String fileName = "propertyReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -135,7 +135,7 @@ public void testPersonPropertyReportTranslatorSpec() {
     public void testPersonInteractionReportTranslatorSpec() {
         String fileName = "interactionReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()

diff --git a/...s/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java b/...s/aspr/ms/gcm/taskit/protobuf/plugins/personproperties/MT_PersonPropertiesTranslator.java
@@ -22,7 +22,7 @@ public class MT_PersonPropertiesTranslator {
     long seed = 4684903523797799712L;
     String times = "";
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
     ProtobufTranslationEngine protobufTranslationEngine;
     TimeElapser timeElapser = new TimeElapser();
     PersonPropertiesPluginData pluginData;
@@ -41,7 +41,7 @@ private MT_PersonPropertiesTranslator() {
     private void createPluginData(int population) {
         String fileName = "personPropertiesPluginData_mt-" + population + ".json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         this.translationController = TranslationController.builder()
                 .addTranslationEngine(this.protobufTranslationEngine)

diff --git a/.../java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java b/.../java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/properties/IT_PropertiesTranslator.java
@@ -16,14 +16,14 @@
 
 public class IT_PropertiesTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testPropertyValueMapTranslator() {
         String fileName = "propertyDefinition.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(

diff --git a/...c/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java b/...c/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/regions/IT_RegionsTranslator.java
@@ -37,14 +37,14 @@
 
 public class IT_RegionsTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testRegionsTranslator() {
         String fileName = "regionsPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -83,7 +83,7 @@ public void testRegionsTranslator() {
     public void testRegionPropertyReportTranslatorSpec() {
         String fileName = "propertyReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -134,7 +134,7 @@ public void testRegionPropertyReportTranslatorSpec() {
     public void testRegionTransferReportTranslatorSpec() {
         String fileName = "transferReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()

diff --git a/...c/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java b/...c/test/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/reports/IT_ReportsTranslator.java
@@ -17,14 +17,14 @@
 
 public class IT_ReportsTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testReportLabelTranslatorSpec() {
         String fileName = "reportLabel.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(

diff --git a/...st/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java b/...st/java/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/resources/IT_ResourcesTranslator.java
@@ -40,14 +40,14 @@
 
 public class IT_ResourcesTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testResourcesTranslator() {
         String fileName = "resourcesPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -87,7 +87,7 @@ public void testResourcesTranslator() {
     public void testPersonResourceReportTranslatorSpec() {
         String fileName = "personResourceReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -140,7 +140,7 @@ public void testPersonResourceReportTranslatorSpec() {
     public void testResourcePropertyReportTranslatorSpec() {
         String fileName = "resourcePropertyReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()
@@ -178,7 +178,7 @@ public void testResourcePropertyReportTranslatorSpec() {
     public void testResourceReportTranslatorSpec() {
         String fileName = "resourceReport.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()

diff --git a/...ava/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java b/...ava/gov/hhs/aspr/ms/gcm/taskit/protobuf/plugins/stochastics/IT_StochasticsTranslator.java
@@ -22,14 +22,14 @@
 
 public class IT_StochasticsTranslator {
     Path basePath = ResourceHelper.getResourceDir(this.getClass());
-    Path filePath = ResourceHelper.makeOutputDir(basePath, "test-output");
+    Path filePath = ResourceHelper.createDirectory(basePath, "test-output");
 
     @Test
     @UnitTestForCoverage
     public void testStochasticsTranslator() {
         String fileName = "stochasticsPluginData.json";
 
-        ResourceHelper.createOutputFile(filePath, fileName);
+        ResourceHelper.createFile(filePath, fileName);
 
         TranslationController translatorController = TranslationController.builder()
                 .addTranslationEngine(ProtobufTranslationEngine.builder()