Moved methods only used in tests to the test in question and made methods private that are only used by other methods inside the class

Author: jaboehri

src/main/java/dev/dsf/bpe/util/task/output/generator/PingStatusGenerator.java

@@ -94,7 +94,7 @@ public static Task updatePongStatusOutput(Task task, CodeSystem.DsfPingStatus.Co
 		return task;
 	}
 
-	public static TaskOutputComponent updatePongStatusOutput(TaskOutputComponent outputComponent,
+	private static TaskOutputComponent updatePongStatusOutput(TaskOutputComponent outputComponent,
 			CodeSystem.DsfPingStatus.Code statusCode)
 	{
 		if (hasStatusCodeSet(outputComponent))
@@ -132,7 +132,7 @@ public static Task updatePongStatusOutput(Task task, Target target)
 		return task;
 	}
 
-	public static TaskOutputComponent updateStatusOutput(TaskOutputComponent outputComponent, Target target)
+	private static TaskOutputComponent updateStatusOutput(TaskOutputComponent outputComponent, Target target)
 	{
 		if (hasTargetSet(outputComponent))
 		{
@@ -169,7 +169,7 @@ public static Task updatePongStatusOutputDownloadSpeed(Task task, BigDecimal dow
 		return task;
 	}
 
-	public static TaskOutputComponent updateStatusOutputDownloadSpeed(TaskOutputComponent outputComponent,
+	private static TaskOutputComponent updateStatusOutputDownloadSpeed(TaskOutputComponent outputComponent,
 			BigDecimal downloadSpeed, CodeSystem.DsfPingUnits.Code networkSpeedUnit)
 	{
 		if (hasDownloadSpeedSet(outputComponent))
@@ -208,7 +208,7 @@ public static Task updatePongStatusOutputUploadSpeed(Task task, BigDecimal uploa
 		return task;
 	}
 
-	public static TaskOutputComponent updateStatusOutputUploadSpeed(TaskOutputComponent outputComponent,
+	private static TaskOutputComponent updateStatusOutputUploadSpeed(TaskOutputComponent outputComponent,
 			BigDecimal uploadSpeed, CodeSystem.DsfPingUnits.Code networkSpeedUnit)
 	{
 		if (hasDownloadSpeedSet(outputComponent))
@@ -252,12 +252,6 @@ private static boolean hasDownloadSpeedSet(TaskOutputComponent outputComponent)
 		return downloadSpeedExtension != null;
 	}
 
-	public static TaskOutputComponent createPingStatusOutput(Target target, CodeSystem.DsfPingStatus.Code statusCode,
-			BigDecimal downloadSpeed, BigDecimal uploadSpeed, CodeSystem.DsfPingUnits.Code unit)
-	{
-		return createPingStatusOutput(target, statusCode, null, downloadSpeed, uploadSpeed, unit);
-	}
-
 	public static TaskOutputComponent createPingStatusOutput(Target target, CodeSystem.DsfPingStatus.Code statusCode,
 			List<ProcessError> errors)
 	{
@@ -273,11 +267,6 @@ public static TaskOutputComponent createPingStatusOutput(Target target, CodeSyst
 				downloadSpeed, uploadSpeed, unit.name());
 	}
 
-	public static TaskOutputComponent createPongStatusOutput(Target target, CodeSystem.DsfPingStatus.Code statusCode)
-	{
-		return createPongStatusOutput(target, statusCode, null);
-	}
-
 	public static TaskOutputComponent createPongStatusOutput(Target target, CodeSystem.DsfPingStatus.Code statusCode,
 			List<ProcessError> errors)
 	{

src/test/java/dev/dsf/fhir/profiles/TaskProfileTest.java

@@ -41,7 +41,6 @@
 import dev.dsf.bpe.util.task.input.generator.DownloadedBytesGenerator;
 import dev.dsf.bpe.util.task.input.generator.DownloadedDurationGenerator;
 import dev.dsf.bpe.util.task.input.generator.ErrorInputComponentGenerator;
-import dev.dsf.bpe.util.task.output.generator.ErrorOutputComponentGenerator;
 import dev.dsf.bpe.util.task.output.generator.PingStatusGenerator;
 import dev.dsf.bpe.v1.constants.CodeSystems.BpmnMessage;
 import dev.dsf.bpe.v1.constants.NamingSystems.EndpointIdentifier;
@@ -203,7 +202,7 @@ public void testTaskStartPingProcessProfileValidWithErrorMessages()
 	{
 		Task task = createValidTaskStartPingProcess();
 
-		ErrorOutputComponentGenerator.create(processErrors(4)).forEach(task::addOutput);
+		ProcessError.toTaskOutput(processErrors(4)).forEach(task::addOutput);
 
 		ValidationResult result = resourceValidator.validate(task);
 		ValidationSupportRule.logValidationMessages(logger, result);
@@ -331,8 +330,8 @@ public String getCorrelationKey()
 		Task task = createValidTaskStartPingProcess();
 		task.addInput().setValue(new StringType(UUID.randomUUID().toString())).getType()
 				.addCoding(BpmnMessage.businessKey());
-		task.addOutput(PingStatusGenerator.createPingStatusOutput(target, CodeSystem.DsfPingStatus.Code.COMPLETED,
-				BigDecimal.ZERO, BigDecimal.ZERO, CodeSystem.DsfPingUnits.Code.bps));
+		task.addOutput(createPingStatusOutput(target, CodeSystem.DsfPingStatus.Code.COMPLETED, BigDecimal.ZERO,
+				BigDecimal.ZERO, CodeSystem.DsfPingUnits.Code.bps));
 
 		ValidationResult result = resourceValidator.validate(task);
 		ValidationSupportRule.logValidationMessages(logger, result);
@@ -443,7 +442,7 @@ public String getCorrelationKey()
 			}
 		};
 		Task task = createValidTaskPing();
-		task.addOutput(PingStatusGenerator.createPongStatusOutput(target, CodeSystem.DsfPingStatus.Code.COMPLETED));
+		task.addOutput(createPongStatusOutput(target, CodeSystem.DsfPingStatus.Code.COMPLETED));
 
 		ValidationResult result = resourceValidator.validate(task);
 		ValidationSupportRule.logValidationMessages(logger, result);
@@ -483,7 +482,7 @@ public String getCorrelationKey()
 			}
 		};
 		Task task = createValidTaskPing();
-		task.addOutput(PingStatusGenerator.createPongStatusOutput(target, CodeSystem.DsfPingStatus.Code.COMPLETED));
+		task.addOutput(createPongStatusOutput(target, CodeSystem.DsfPingStatus.Code.COMPLETED));
 
 		task.addInput(DownloadResourceSizeGenerator.create(1000));
 		task.addInput(DownloadResourceReferenceGenerator.create("https://test.endpoint.org/fhir/Binary"));
@@ -696,4 +695,15 @@ private String fillPlaceholders(String xml)
 				dtf.format(LocalDate.ofInstant(Instant.now(), TimeZone.getDefault().toZoneId())));
 		return xml;
 	}
+
+	private Task.TaskOutputComponent createPingStatusOutput(Target target, CodeSystem.DsfPingStatus.Code statusCode,
+			BigDecimal downloadSpeed, BigDecimal uploadSpeed, CodeSystem.DsfPingUnits.Code unit)
+	{
+		return PingStatusGenerator.createPingStatusOutput(target, statusCode, null, downloadSpeed, uploadSpeed, unit);
+	}
+
+	private Task.TaskOutputComponent createPongStatusOutput(Target target, CodeSystem.DsfPingStatus.Code statusCode)
+	{
+		return PingStatusGenerator.createPongStatusOutput(target, statusCode, null);
+	}
 }