ExecutionVariables enum values are now the enum names

jaboehri · jaboehri · commit 604e26258f2f · 2025-08-20T19:10:51.000+02:00
diff --git a/src/main/java/dev/dsf/bpe/ExecutionVariables.java b/src/main/java/dev/dsf/bpe/ExecutionVariables.java
@@ -2,37 +2,25 @@
 
 public enum ExecutionVariables
 {
-	TIMER_INTERVAL("timerInterval"),
-	STOP_TIMER("stopTimer"),
-	DOWNLOAD_RESOURCE_SIZE_BYTES("downloadResourceSizeBytes"),
-	DOWNLOAD_RESOURCE("downloadResource"),
-	DOWNLOAD_RESOURCE_REFERENCE("downloadResourceReference"),
-	STATUS_CODE("statusCode"),
-	ERROR("error"),
-	ERROR_LIST("errors"),
-	DOWNLOADED_BYTES("downloadedBytes"),
-	DOWNLOADED_DURATION("downloadedDuration"),
-	PONG_TARGET_ENDPOINT_IDENTIFIER("targetEndpointIdentifier"),
-	UPLOADED_BYTES("uploadedBytes"),
-	UPLOADED_DURATION("uploadedDuration"),
-	RESOURCE_DOWNLOAD_ERROR("resourceDownloadError"),
-	RESOURCE_UPLOAD_ERROR("resourceUploadError"),
-	PING_TASK_ID("pingTaskId");
-
-	private final String value;
-
-	ExecutionVariables(String value)
-	{
-		this.value = value;
-	}
-
-	public String getValue()
-	{
-		return value;
-	}
+	timerInterval,
+	stopTimer,
+	downloadResourceSizeBytes,
+	downloadResource,
+	downloadResourceReference,
+	statusCode,
+	error,
+	errors,
+	downloadedBytes,
+	downloadedDuration,
+	targetEndpointIdentifier,
+	uploadedBytes,
+	uploadedDuration,
+	resourceDownloadError,
+	resourceUploadError,
+	pingTaskId;
 
 	public String correlatedValue(String correlationKey)
 	{
-		return getValue() + "_" + correlationKey;
+		return name() + "_" + correlationKey;
 	}
 }
diff --git a/src/main/java/dev/dsf/bpe/message/CleanupPongMessage.java b/src/main/java/dev/dsf/bpe/message/CleanupPongMessage.java
@@ -35,9 +35,9 @@ protected Stream<Task.ParameterComponent> getAdditionalInputParameters(DelegateE
 	{
 		Target target = variables.getTarget();
 		String correlationKey = target.getCorrelationKey();
-		Long downloadedBytes = variables.getLong(ExecutionVariables.DOWNLOADED_BYTES.correlatedValue(correlationKey));
+		Long downloadedBytes = variables.getLong(ExecutionVariables.downloadedBytes.correlatedValue(correlationKey));
 		Duration downloadedDuration = (Duration) variables
-				.getVariable(ExecutionVariables.DOWNLOADED_DURATION.correlatedValue(correlationKey));
+				.getVariable(ExecutionVariables.downloadedDuration.correlatedValue(correlationKey));
 
 		Stream<Task.ParameterComponent> downloadedBytesParameter = downloadedBytes != null
 				? Stream.of(DownloadedBytesGenerator.create(downloadedBytes))
@@ -57,8 +57,8 @@ protected void handleSendTaskError(DelegateExecution execution, Variables variab
 		ProcessError error = SendTaskErrorConverter.convert(exception,
 				"Sending cleanup message to " + target.getEndpointUrl());
 
-		execution.setVariableLocal(ExecutionVariables.ERROR.getValue(), new ProcessErrorValueImpl(error));
-		execution.setVariableLocal(ExecutionVariables.STATUS_CODE.getValue(), CodeSystem.DsfPing.Code.ERROR.getValue());
+		execution.setVariableLocal(ExecutionVariables.error.name(), new ProcessErrorValueImpl(error));
+		execution.setVariableLocal(ExecutionVariables.statusCode.name(), CodeSystem.DsfPing.Code.ERROR.getValue());
 
 		logger.info("Request to {} resulted in error: {}", target.getEndpointUrl(), error.message());
 	}
diff --git a/src/main/java/dev/dsf/bpe/message/SendPingMessage.java b/src/main/java/dev/dsf/bpe/message/SendPingMessage.java
@@ -38,9 +38,8 @@ public SendPingMessage(ProcessPluginApi api)
 	@Override
 	protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution, Variables variables)
 	{
-		String downloadResourceReference = variables
-				.getString(ExecutionVariables.DOWNLOAD_RESOURCE_REFERENCE.getValue());
-		long downloadResourceSizeBytes = variables.getLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue());
+		String downloadResourceReference = variables.getString(ExecutionVariables.downloadResourceReference.name());
+		long downloadResourceSizeBytes = variables.getLong(ExecutionVariables.downloadResourceSizeBytes.name());
 
 		Stream<ParameterComponent> downloadResourceReferenceStream = downloadResourceReference == null ? Stream.empty()
 				: Stream.of(DownloadResourceReferenceGenerator.create(downloadResourceReference));
@@ -63,7 +62,7 @@ protected void sendTask(DelegateExecution execution, Variables variables, Target
 				additionalInputParameters);
 		if (taskId != null)
 		{
-			execution.setVariableLocal(ExecutionVariables.PING_TASK_ID.getValue(), taskId.getIdPart());
+			execution.setVariableLocal(ExecutionVariables.pingTaskId.name(), taskId.getIdPart());
 		}
 	}
 
@@ -82,8 +81,8 @@ protected void handleSendTaskError(DelegateExecution execution, Variables variab
 		ProcessError error = SendTaskErrorConverter.convert(exception,
 				"Sending ping message to " + target.getEndpointUrl());
 
-		execution.setVariableLocal(ExecutionVariables.ERROR.getValue(), new ProcessErrorValueImpl(error));
-		execution.setVariableLocal(ExecutionVariables.STATUS_CODE.getValue(), CodeSystem.DsfPing.Code.ERROR.getValue());
+		execution.setVariableLocal(ExecutionVariables.error.name(), new ProcessErrorValueImpl(error));
+		execution.setVariableLocal(ExecutionVariables.statusCode.name(), CodeSystem.DsfPing.Code.ERROR.getValue());
 
 		logger.info("Request to {} resulted in error: {}", target.getEndpointUrl(), error.message());
 	}
diff --git a/src/main/java/dev/dsf/bpe/message/SendPongMessage.java b/src/main/java/dev/dsf/bpe/message/SendPongMessage.java
@@ -52,14 +52,13 @@ protected Stream<Task.ParameterComponent> getAdditionalInputParameters(DelegateE
 			Variables variables)
 	{
 		ProcessErrors errorList = ErrorListUtils.getErrorList(execution);
-		long downloadResourceSizeBytes = variables.getLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue());
+		long downloadResourceSizeBytes = variables.getLong(ExecutionVariables.downloadResourceSizeBytes.name());
 		if (downloadResourceSizeBytes >= 0)
 		{
-			Long downloadedBytes = variables.getLong(ExecutionVariables.DOWNLOADED_BYTES.getValue());
+			Long downloadedBytes = variables.getLong(ExecutionVariables.downloadedBytes.name());
 			Duration downloadedDuration = (Duration) variables
-					.getVariable(ExecutionVariables.DOWNLOADED_DURATION.getValue());
-			String downloadResourceReference = variables
-					.getString(ExecutionVariables.DOWNLOAD_RESOURCE_REFERENCE.getValue());
+					.getVariable(ExecutionVariables.downloadedDuration.name());
+			String downloadResourceReference = variables.getString(ExecutionVariables.downloadResourceReference.name());
 
 			Stream<Task.ParameterComponent> downloadedBytesParameter = downloadedBytes != null
 					? Stream.of(DownloadedBytesGenerator.create(downloadedBytes))
@@ -104,7 +103,7 @@ protected void handleSendTaskError(DelegateExecution execution, Variables variab
 
 		ErrorListUtils.add(error, execution);
 		PingStatusGenerator.updatePongStatusOutput(startTask, CodeSystem.DsfPingStatus.Code.ERROR);
-		variables.setString(ExecutionVariables.STATUS_CODE.getValue(), CodeSystem.DsfPing.Code.ERROR.getValue());
+		variables.setString(ExecutionVariables.statusCode.name(), CodeSystem.DsfPing.Code.ERROR.getValue());
 		variables.updateTask(startTask);
 
 		logger.info("Request to {} resulted in error: {}", target.getEndpointUrl(), error.message());
diff --git a/src/main/java/dev/dsf/bpe/service/Cleanup.java b/src/main/java/dev/dsf/bpe/service/Cleanup.java
@@ -39,8 +39,8 @@ public void doExecute(DelegateExecution delegateExecution, Variables variables)
 		CodeSystem.DsfPingProcesses.Code process = getProcess((String) this.process.getValue(delegateExecution));
 		Objects.requireNonNull(process);
 
-		String downloadResourceId = new IdType(
-				variables.getString(ExecutionVariables.DOWNLOAD_RESOURCE_REFERENCE.getValue())).getIdPart();
+		String downloadResourceId = new IdType(variables.getString(ExecutionVariables.downloadResourceReference.name()))
+				.getIdPart();
 		if (downloadResourceId != null)
 		{
 			try
diff --git a/src/main/java/dev/dsf/bpe/service/GenerateAndStoreResource.java b/src/main/java/dev/dsf/bpe/service/GenerateAndStoreResource.java
@@ -54,7 +54,7 @@ public void doExecute(DelegateExecution delegateExecution, Variables variables)
 		{
 			resourceContent = new RandomByteInputStream(downloadResourceSizeBytes);
 		}
-		variables.setLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue(), downloadResourceSizeBytes);
+		variables.setLong(ExecutionVariables.downloadResourceSizeBytes.name(), downloadResourceSizeBytes);
 		logger.debug("Generated resource.");
 		logger.debug("Storing binary resource for download...");
 
@@ -64,7 +64,7 @@ public void doExecute(DelegateExecution delegateExecution, Variables variables)
 
 			String reference = downloadResource.toVersionless().getValueAsString();
 
-			variables.setString(ExecutionVariables.DOWNLOAD_RESOURCE_REFERENCE.getValue(), reference);
+			variables.setString(ExecutionVariables.downloadResourceReference.name(), reference);
 
 			logger.debug("Stored binary resource for download");
 		}
@@ -75,14 +75,13 @@ public void doExecute(DelegateExecution delegateExecution, Variables variables)
 					CodeSystem.DsfPingProcessSteps.Code.GENERATE_AND_STORE_RESOURCE,
 					"Storing Binary resource on local DSF FHIR server.", ConstantsPing.POTENTIAL_FIX_URL_ERROR_HTTP,
 					"Local DSF FHIR server responded with status: " + status);
-			variables.setVariable(ExecutionVariables.RESOURCE_UPLOAD_ERROR.getValue(),
-					new ProcessErrorValueImpl(error));
+			variables.setVariable(ExecutionVariables.resourceUploadError.name(), new ProcessErrorValueImpl(error));
 		}
 	}
 
 	private long getDownloadResourceSize(Variables variables)
 	{
-		return variables.getLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue());
+		return variables.getLong(ExecutionVariables.downloadResourceSizeBytes.name());
 	}
 
 	private IdType storeBinary(RandomByteInputStream downloadResourceContent)
diff --git a/src/main/java/dev/dsf/bpe/service/SetDownloadResourceSize.java b/src/main/java/dev/dsf/bpe/service/SetDownloadResourceSize.java
@@ -33,7 +33,7 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 		logger.debug("Setting download resource size...");
 
 		long downloadResourceSizeBytes = getDownloadResourceSizeBytes(variables);
-		variables.setLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue(), downloadResourceSizeBytes);
+		variables.setLong(ExecutionVariables.downloadResourceSizeBytes.name(), downloadResourceSizeBytes);
 
 		logger.debug("Set download resource size to " + downloadResourceSizeBytes);
 	}
diff --git a/src/main/java/dev/dsf/bpe/service/autostart/SetTargetAndConfigureTimer.java b/src/main/java/dev/dsf/bpe/service/autostart/SetTargetAndConfigureTimer.java
@@ -25,9 +25,9 @@ public SetTargetAndConfigureTimer(ProcessPluginApi api)
 	protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError
 	{
 		String timerInterval = getTimerInterval(variables);
-		logger.debug("Setting variable '{}' to {}", ExecutionVariables.TIMER_INTERVAL.getValue(), timerInterval);
+		logger.debug("Setting variable '{}' to {}", ExecutionVariables.timerInterval.name(), timerInterval);
 
-		variables.setString(ExecutionVariables.TIMER_INTERVAL.getValue(), timerInterval);
+		variables.setString(ExecutionVariables.timerInterval.name(), timerInterval);
 		variables.setTarget(
 				variables.createTarget(api.getOrganizationProvider().getLocalOrganizationIdentifierValue().get(),
 						api.getEndpointProvider().getLocalEndpointIdentifierValue().get(),
diff --git a/src/main/java/dev/dsf/bpe/service/ping/CheckPingTaskStatus.java b/src/main/java/dev/dsf/bpe/service/ping/CheckPingTaskStatus.java
@@ -37,7 +37,7 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 		Target target = variables.getTarget();
 		String correlationKey = target.getCorrelationKey();
 
-		String taskId = (String) delegateExecution.getVariableLocal(ExecutionVariables.PING_TASK_ID.getValue());
+		String taskId = (String) delegateExecution.getVariableLocal(ExecutionVariables.pingTaskId.name());
 
 		Objects.requireNonNull(taskId);
 		FhirWebserviceClient fhirWebserviceClient = api.getFhirWebserviceClientProvider()
diff --git a/src/main/java/dev/dsf/bpe/service/ping/DownloadResourceAndMeasureSpeedInSubProcess.java b/src/main/java/dev/dsf/bpe/service/ping/DownloadResourceAndMeasureSpeedInSubProcess.java
@@ -39,14 +39,14 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 
 		if (downloadResult.getError() == null)
 		{
-			variables.setLong(ExecutionVariables.DOWNLOADED_BYTES.correlatedValue(correlationKey),
+			variables.setLong(ExecutionVariables.downloadedBytes.correlatedValue(correlationKey),
 					downloadResult.getDownloadedBytes());
-			variables.setVariable(ExecutionVariables.DOWNLOADED_DURATION.correlatedValue(correlationKey),
+			variables.setVariable(ExecutionVariables.downloadedDuration.correlatedValue(correlationKey),
 					new DurationValueImpl(downloadResult.getDownloadedDuration()));
 		}
 		else
 		{
-			delegateExecution.setVariableLocal(ExecutionVariables.RESOURCE_DOWNLOAD_ERROR.getValue(),
+			delegateExecution.setVariableLocal(ExecutionVariables.resourceDownloadError.name(),
 					downloadResult.getError());
 		}
 
diff --git a/src/main/java/dev/dsf/bpe/service/ping/LogAndSaveError.java b/src/main/java/dev/dsf/bpe/service/ping/LogAndSaveError.java
@@ -28,7 +28,7 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 		Target target = variables.getTarget();
 
 		ProcessError error = (ProcessError) delegateExecution
-				.getVariableLocal(ExecutionVariables.RESOURCE_DOWNLOAD_ERROR.getValue());
+				.getVariableLocal(ExecutionVariables.resourceDownloadError.name());
 
 		ErrorListUtils.add(error, delegateExecution, target.getCorrelationKey());
 
diff --git a/src/main/java/dev/dsf/bpe/service/ping/LogAndSaveSendError.java b/src/main/java/dev/dsf/bpe/service/ping/LogAndSaveSendError.java
@@ -28,10 +28,10 @@ public LogAndSaveSendError(ProcessPluginApi api)
 	protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError
 	{
 		String correlationKey = variables.getTarget().getCorrelationKey();
-		ProcessError error = (ProcessError) execution.getVariableLocal(ExecutionVariables.ERROR.getValue());
+		ProcessError error = (ProcessError) execution.getVariableLocal(ExecutionVariables.error.name());
 		ErrorListUtils.add(error, execution, correlationKey);
-		variables.setLong(ExecutionVariables.UPLOADED_BYTES.correlatedValue(correlationKey), 0L);
-		variables.setVariable(ExecutionVariables.UPLOADED_DURATION.correlatedValue(correlationKey),
+		variables.setLong(ExecutionVariables.uploadedBytes.correlatedValue(correlationKey), 0L);
+		variables.setVariable(ExecutionVariables.uploadedDuration.correlatedValue(correlationKey),
 				new DurationValueImpl(Duration.ZERO));
 		logger.debug("Saved error when trying to send ping message. Error message: {}", error.message());
 	}
diff --git a/src/main/java/dev/dsf/bpe/service/ping/LogAndSaveUploadErrorPing.java b/src/main/java/dev/dsf/bpe/service/ping/LogAndSaveUploadErrorPing.java
@@ -23,7 +23,7 @@ public LogAndSaveUploadErrorPing(ProcessPluginApi api)
 	@Override
 	protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError
 	{
-		ProcessError error = (ProcessError) variables.getVariable(ExecutionVariables.RESOURCE_UPLOAD_ERROR.getValue());
+		ProcessError error = (ProcessError) variables.getVariable(ExecutionVariables.resourceUploadError.name());
 
 		logger.info("Error while storing binary resource for download: {}", error.message());
 	}
diff --git a/src/main/java/dev/dsf/bpe/service/ping/SavePong.java b/src/main/java/dev/dsf/bpe/service/ping/SavePong.java
@@ -47,13 +47,13 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 						CodeSystem.DsfPing.Code.DOWNLOADED_DURATION_MILLIS.getValue(),
 						org.hl7.fhir.r4.model.Duration.class);
 		optDownloadedDuration.ifPresent(
-				duration -> variables.setVariable(ExecutionVariables.UPLOADED_DURATION.correlatedValue(correlationKey),
+				duration -> variables.setVariable(ExecutionVariables.uploadedDuration.correlatedValue(correlationKey),
 						new DurationValueImpl(Duration.ofMillis(duration.getValue().longValue()))));
 
 		Optional<DecimalType> optDownloadedBytes = api.getTaskHelper().getFirstInputParameterValue(pong,
 				CodeSystem.DsfPing.URL, CodeSystem.DsfPing.Code.DOWNLOADED_BYTES.getValue(), DecimalType.class);
 		optDownloadedBytes.ifPresent(decimalType -> variables.setLong(
-				ExecutionVariables.UPLOADED_BYTES.correlatedValue(correlationKey), decimalType.getValue().longValue()));
+				ExecutionVariables.uploadedBytes.correlatedValue(correlationKey), decimalType.getValue().longValue()));
 
 
 		ProcessErrors errorList = new ProcessErrors(parseInputs(pong));
diff --git a/src/main/java/dev/dsf/bpe/service/ping/StoreResults.java b/src/main/java/dev/dsf/bpe/service/ping/StoreResults.java
@@ -68,23 +68,22 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 			ProcessErrors errors = ErrorListUtils.getErrorList(execution, correlationKey);
 			CodeSystem.DsfPingStatus.Code statusCode = errors.isEmpty() ? CodeSystem.DsfPingStatus.Code.COMPLETED
 					: CodeSystem.DsfPingStatus.Code.ERROR;
-			long downloadResourceSizeBytes = variables
-					.getLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue());
+			long downloadResourceSizeBytes = variables.getLong(ExecutionVariables.downloadResourceSizeBytes.name());
 			if (downloadResourceSizeBytes >= 0) // if fat-ping
 			{
 				Long downloadedBytes = variables
-						.getLong(ExecutionVariables.DOWNLOADED_BYTES.correlatedValue(correlationKey));
+						.getLong(ExecutionVariables.downloadedBytes.correlatedValue(correlationKey));
 				Duration downloadedDuration = (Duration) variables
-						.getVariable(ExecutionVariables.DOWNLOADED_DURATION.correlatedValue(correlationKey));
+						.getVariable(ExecutionVariables.downloadedDuration.correlatedValue(correlationKey));
 
 				BigDecimal downloadSpeed = downloadedBytes != null && downloadedDuration != null
 						? networkSpeedUnit.calculateSpeed(downloadedBytes, downloadedDuration)
 						: null;
 
 				Long uploadedBytes = variables
-						.getLong(ExecutionVariables.UPLOADED_BYTES.correlatedValue(correlationKey));
+						.getLong(ExecutionVariables.uploadedBytes.correlatedValue(correlationKey));
 				Duration uploadedDurationMillis = (Duration) variables
-						.getVariable(ExecutionVariables.UPLOADED_DURATION.correlatedValue(correlationKey));
+						.getVariable(ExecutionVariables.uploadedDuration.correlatedValue(correlationKey));
 
 				BigDecimal uploadSpeed = uploadedBytes != null && uploadedDurationMillis != null
 						? networkSpeedUnit.calculateSpeed(uploadedBytes, uploadedDurationMillis)
diff --git a/src/main/java/dev/dsf/bpe/service/pong/DownloadResourceAndMeasureSpeed.java b/src/main/java/dev/dsf/bpe/service/pong/DownloadResourceAndMeasureSpeed.java
@@ -35,14 +35,13 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 
 		if (downloadResult.getError() == null)
 		{
-			variables.setLong(ExecutionVariables.DOWNLOADED_BYTES.getValue(), downloadResult.getDownloadedBytes());
-			variables.setVariable(ExecutionVariables.DOWNLOADED_DURATION.getValue(),
+			variables.setLong(ExecutionVariables.downloadedBytes.name(), downloadResult.getDownloadedBytes());
+			variables.setVariable(ExecutionVariables.downloadedDuration.name(),
 					new DurationValueImpl(downloadResult.getDownloadedDuration()));
 		}
 		else
 		{
-			delegateExecution.setVariable(ExecutionVariables.RESOURCE_DOWNLOAD_ERROR.getValue(),
-					downloadResult.getError());
+			delegateExecution.setVariable(ExecutionVariables.resourceDownloadError.name(), downloadResult.getError());
 		}
 		logger.debug("Completed resource download and measured speed.");
 	}
diff --git a/src/main/java/dev/dsf/bpe/service/pong/EstimateCleanupTimerDuration.java b/src/main/java/dev/dsf/bpe/service/pong/EstimateCleanupTimerDuration.java
@@ -28,7 +28,7 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 		logger.debug("Estimating cleanup timer duration...");
 		final long minTimerDurationMillis = 20000;
 		Duration downloadedDuration = Optional
-				.ofNullable((Duration) variables.getVariable(ExecutionVariables.DOWNLOADED_DURATION.getValue()))
+				.ofNullable((Duration) variables.getVariable(ExecutionVariables.downloadedDuration.name()))
 				.orElse(Duration.ZERO);
 		long timerDurationMillis = downloadedDuration.toMillis() > Long.MAX_VALUE / 10 - minTimerDurationMillis
 				? Long.MAX_VALUE
diff --git a/src/main/java/dev/dsf/bpe/service/pong/LogAndSaveAndStoreError.java b/src/main/java/dev/dsf/bpe/service/pong/LogAndSaveAndStoreError.java
@@ -31,7 +31,7 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable
 		Task startTask = variables.getStartTask();
 
 		ProcessError error = (ProcessError) delegateExecution
-				.getVariableLocal(ExecutionVariables.RESOURCE_DOWNLOAD_ERROR.getValue());
+				.getVariableLocal(ExecutionVariables.resourceDownloadError.name());
 
 		ErrorListUtils.add(error, delegateExecution);
 		PingStatusGenerator.updatePongStatusOutput(startTask,
diff --git a/src/main/java/dev/dsf/bpe/service/pong/LogAndSaveUploadErrorPong.java b/src/main/java/dev/dsf/bpe/service/pong/LogAndSaveUploadErrorPong.java
@@ -24,7 +24,7 @@ public LogAndSaveUploadErrorPong(ProcessPluginApi api)
 	@Override
 	protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError
 	{
-		ProcessError error = (ProcessError) variables.getVariable(ExecutionVariables.RESOURCE_UPLOAD_ERROR.getValue());
+		ProcessError error = (ProcessError) variables.getVariable(ExecutionVariables.resourceUploadError.name());
 
 		ErrorListUtils.add(error, execution);
 
diff --git a/src/main/java/dev/dsf/bpe/service/pong/SelectPongTarget.java b/src/main/java/dev/dsf/bpe/service/pong/SelectPongTarget.java
@@ -32,8 +32,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 		String correlationKey = api.getTaskHelper()
 				.getFirstInputParameterStringValue(task, BpmnMessage.URL, BpmnMessage.Codes.CORRELATION_KEY).get();
 		String targetOrganizationIdentifierValue = task.getRequester().getIdentifier().getValue();
-		String targetEndpointIdentifierValue = variables
-				.getString(ExecutionVariables.PONG_TARGET_ENDPOINT_IDENTIFIER.getValue());
+		String targetEndpointIdentifierValue = variables.getString(ExecutionVariables.targetEndpointIdentifier.name());
 
 		String targetEndpointAddress = api.getEndpointProvider().getEndpointAddress(targetEndpointIdentifierValue)
 				.orElseThrow(() ->
diff --git a/src/main/java/dev/dsf/bpe/service/pong/SetEndpointIdentifier.java b/src/main/java/dev/dsf/bpe/service/pong/SetEndpointIdentifier.java
@@ -30,7 +30,7 @@ protected void doExecute(DelegateExecution execution, Variables variables) throw
 
 		Task task = variables.getStartTask();
 		String endpointIdentifierValue = getEndpointIdentifierValue(task);
-		variables.setString(ExecutionVariables.PONG_TARGET_ENDPOINT_IDENTIFIER.getValue(), endpointIdentifierValue);
+		variables.setString(ExecutionVariables.targetEndpointIdentifier.name(), endpointIdentifierValue);
 
 		logger.debug("Set endpoint identifier to " + endpointIdentifierValue);
 	}
diff --git a/src/main/java/dev/dsf/bpe/service/pong/StoreDownloadSpeed.java b/src/main/java/dev/dsf/bpe/service/pong/StoreDownloadSpeed.java
diff --git a/src/main/java/dev/dsf/bpe/util/BinaryResourceDownloader.java b/src/main/java/dev/dsf/bpe/util/BinaryResourceDownloader.java
diff --git a/src/main/java/dev/dsf/bpe/util/ErrorListUtils.java b/src/main/java/dev/dsf/bpe/util/ErrorListUtils.java

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,8 @@ public SendPingMessage(ProcessPluginApi api)`
`38`	`38`	`@Override`
`39`	`39`	`protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution, Variables variables)`
`40`	`40`	`{`
`41`		`- String downloadResourceReference = variables`
`42`		`- .getString(ExecutionVariables.DOWNLOAD_RESOURCE_REFERENCE.getValue());`
`43`		`- long downloadResourceSizeBytes = variables.getLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue());`
	`41`	`+ String downloadResourceReference = variables.getString(ExecutionVariables.downloadResourceReference.name());`
	`42`	`+ long downloadResourceSizeBytes = variables.getLong(ExecutionVariables.downloadResourceSizeBytes.name());`
`44`	`43`
`45`	`44`	`Stream<ParameterComponent> downloadResourceReferenceStream = downloadResourceReference == null ? Stream.empty()`
`46`	`45`	`: Stream.of(DownloadResourceReferenceGenerator.create(downloadResourceReference));`
`@@ -63,7 +62,7 @@ protected void sendTask(DelegateExecution execution, Variables variables, Target`
`63`	`62`	`additionalInputParameters);`
`64`	`63`	`if (taskId != null)`
`65`	`64`	`{`
`66`		`- execution.setVariableLocal(ExecutionVariables.PING_TASK_ID.getValue(), taskId.getIdPart());`
	`65`	`+ execution.setVariableLocal(ExecutionVariables.pingTaskId.name(), taskId.getIdPart());`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`
`@@ -82,8 +81,8 @@ protected void handleSendTaskError(DelegateExecution execution, Variables variab`
`82`	`81`	`ProcessError error = SendTaskErrorConverter.convert(exception,`
`83`	`82`	`"Sending ping message to " + target.getEndpointUrl());`
`84`	`83`
`85`		`- execution.setVariableLocal(ExecutionVariables.ERROR.getValue(), new ProcessErrorValueImpl(error));`
`86`		`- execution.setVariableLocal(ExecutionVariables.STATUS_CODE.getValue(), CodeSystem.DsfPing.Code.ERROR.getValue());`
	`84`	`+ execution.setVariableLocal(ExecutionVariables.error.name(), new ProcessErrorValueImpl(error));`
	`85`	`+ execution.setVariableLocal(ExecutionVariables.statusCode.name(), CodeSystem.DsfPing.Code.ERROR.getValue());`
`87`	`86`
`88`	`87`	`logger.info("Request to {} resulted in error: {}", target.getEndpointUrl(), error.message());`
`89`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void doExecute(DelegateExecution delegateExecution, Variables variables)`
`54`	`54`	`{`
`55`	`55`	`resourceContent = new RandomByteInputStream(downloadResourceSizeBytes);`
`56`	`56`	`}`
`57`		`- variables.setLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue(), downloadResourceSizeBytes);`
	`57`	`+ variables.setLong(ExecutionVariables.downloadResourceSizeBytes.name(), downloadResourceSizeBytes);`
`58`	`58`	`logger.debug("Generated resource.");`
`59`	`59`	`logger.debug("Storing binary resource for download...");`
`60`	`60`
`@@ -64,7 +64,7 @@ public void doExecute(DelegateExecution delegateExecution, Variables variables)`
`64`	`64`
`65`	`65`	`String reference = downloadResource.toVersionless().getValueAsString();`
`66`	`66`
`67`		`- variables.setString(ExecutionVariables.DOWNLOAD_RESOURCE_REFERENCE.getValue(), reference);`
	`67`	`+ variables.setString(ExecutionVariables.downloadResourceReference.name(), reference);`
`68`	`68`
`69`	`69`	`logger.debug("Stored binary resource for download");`
`70`	`70`	`}`
`@@ -75,14 +75,13 @@ public void doExecute(DelegateExecution delegateExecution, Variables variables)`
`75`	`75`	`CodeSystem.DsfPingProcessSteps.Code.GENERATE_AND_STORE_RESOURCE,`
`76`	`76`	`"Storing Binary resource on local DSF FHIR server.", ConstantsPing.POTENTIAL_FIX_URL_ERROR_HTTP,`
`77`	`77`	`"Local DSF FHIR server responded with status: " + status);`
`78`		`- variables.setVariable(ExecutionVariables.RESOURCE_UPLOAD_ERROR.getValue(),`
`79`		`- new ProcessErrorValueImpl(error));`
	`78`	`+ variables.setVariable(ExecutionVariables.resourceUploadError.name(), new ProcessErrorValueImpl(error));`
`80`	`79`	`}`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`private long getDownloadResourceSize(Variables variables)`
`84`	`83`	`{`
`85`		`- return variables.getLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue());`
	`84`	`+ return variables.getLong(ExecutionVariables.downloadResourceSizeBytes.name());`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`private IdType storeBinary(RandomByteInputStream downloadResourceContent)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable`
`33`	`33`	`logger.debug("Setting download resource size...");`
`34`	`34`
`35`	`35`	`long downloadResourceSizeBytes = getDownloadResourceSizeBytes(variables);`
`36`		`- variables.setLong(ExecutionVariables.DOWNLOAD_RESOURCE_SIZE_BYTES.getValue(), downloadResourceSizeBytes);`
	`36`	`+ variables.setLong(ExecutionVariables.downloadResourceSizeBytes.name(), downloadResourceSizeBytes);`
`37`	`37`
`38`	`38`	`logger.debug("Set download resource size to " + downloadResourceSizeBytes);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,14 @@ protected void doExecute(DelegateExecution delegateExecution, Variables variable`
`39`	`39`
`40`	`40`	`if (downloadResult.getError() == null)`
`41`	`41`	`{`
`42`		`- variables.setLong(ExecutionVariables.DOWNLOADED_BYTES.correlatedValue(correlationKey),`
	`42`	`+ variables.setLong(ExecutionVariables.downloadedBytes.correlatedValue(correlationKey),`
`43`	`43`	`downloadResult.getDownloadedBytes());`
`44`		`- variables.setVariable(ExecutionVariables.DOWNLOADED_DURATION.correlatedValue(correlationKey),`
	`44`	`+ variables.setVariable(ExecutionVariables.downloadedDuration.correlatedValue(correlationKey),`
`45`	`45`	`new DurationValueImpl(downloadResult.getDownloadedDuration()));`
`46`	`46`	`}`
`47`	`47`	`else`
`48`	`48`	`{`
`49`		`- delegateExecution.setVariableLocal(ExecutionVariables.RESOURCE_DOWNLOAD_ERROR.getValue(),`
	`49`	`+ delegateExecution.setVariableLocal(ExecutionVariables.resourceDownloadError.name(),`
`50`	`50`	`downloadResult.getError());`
`51`	`51`	`}`
`52`	`52`