-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release/1.0.1.0' into main
- Loading branch information
Showing
11 changed files
with
431 additions
and
238 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
src/main/java/dev/dsf/bpe/listener/SetCorrelationKeyListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package dev.dsf.bpe.listener; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| import org.camunda.bpm.engine.delegate.DelegateExecution; | ||
| import org.camunda.bpm.engine.delegate.ExecutionListener; | ||
| import org.springframework.beans.factory.InitializingBean; | ||
|
|
||
| import dev.dsf.bpe.v1.ProcessPluginApi; | ||
| import dev.dsf.bpe.v1.constants.BpmnExecutionVariables; | ||
| import dev.dsf.bpe.v1.variables.Target; | ||
| import dev.dsf.bpe.v1.variables.Variables; | ||
|
|
||
| public class SetCorrelationKeyListener implements ExecutionListener, InitializingBean | ||
| { | ||
| private final ProcessPluginApi api; | ||
|
|
||
| public SetCorrelationKeyListener(ProcessPluginApi api) | ||
| { | ||
| this.api = api; | ||
| } | ||
|
|
||
| @Override | ||
| public void afterPropertiesSet() throws Exception | ||
| { | ||
| Objects.requireNonNull(api, "api"); | ||
| } | ||
|
|
||
| @Override | ||
| public void notify(DelegateExecution execution) throws Exception | ||
| { | ||
| Variables variables = api.getVariables(execution); | ||
| Target target = variables.getTarget(); | ||
|
|
||
| execution.setVariableLocal(BpmnExecutionVariables.CORRELATION_KEY, target.getCorrelationKey()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,34 @@ | ||
| package dev.dsf.bpe.service; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| import org.camunda.bpm.engine.delegate.BpmnError; | ||
| import org.camunda.bpm.engine.delegate.DelegateExecution; | ||
| import org.hl7.fhir.r4.model.Task; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import dev.dsf.bpe.ConstantsPing; | ||
| import dev.dsf.bpe.mail.ErrorMailService; | ||
| import dev.dsf.bpe.util.PingStatusGenerator; | ||
| import dev.dsf.bpe.v1.ProcessPluginApi; | ||
| import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; | ||
| import dev.dsf.bpe.v1.variables.Target; | ||
| import dev.dsf.bpe.v1.variables.Targets; | ||
| import dev.dsf.bpe.v1.variables.Variables; | ||
|
|
||
| public class LogNoResponse extends AbstractServiceDelegate | ||
| { | ||
| private static final Logger logger = LoggerFactory.getLogger(LogNoResponse.class); | ||
|
|
||
| private final PingStatusGenerator responseGenerator; | ||
| private final ErrorMailService errorMailService; | ||
|
|
||
| public LogNoResponse(ProcessPluginApi api, PingStatusGenerator responseGenerator, ErrorMailService errorMailService) | ||
| public LogNoResponse(ProcessPluginApi api) | ||
| { | ||
| super(api); | ||
|
|
||
| this.responseGenerator = responseGenerator; | ||
| this.errorMailService = errorMailService; | ||
| } | ||
|
|
||
| @Override | ||
| public void afterPropertiesSet() throws Exception | ||
| { | ||
| super.afterPropertiesSet(); | ||
|
|
||
| Objects.requireNonNull(responseGenerator, "responseGenerator"); | ||
| Objects.requireNonNull(errorMailService, "errorLogger"); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception | ||
| { | ||
| Task mainTask = variables.getStartTask(); | ||
|
|
||
| Targets targets = variables.getTargets(); | ||
| targets.getEntries().forEach(t -> logAndAddResponseToTask(mainTask, t)); | ||
| Target target = variables.getTarget(); | ||
|
|
||
| variables.updateTask(mainTask); | ||
| } | ||
|
|
||
| private void logAndAddResponseToTask(Task task, Target target) | ||
| { | ||
| logger.warn("PONG from organization {} (endpoint {}) missing", target.getOrganizationIdentifierValue(), | ||
| target.getEndpointIdentifierValue()); | ||
|
|
||
| task.addOutput(responseGenerator.createPingStatusOutput(target, | ||
| ConstantsPing.CODESYSTEM_DSF_PING_STATUS_VALUE_PONG_MISSING)); | ||
| errorMailService.pongMessageNotReceived(task.getIdElement(), target); | ||
| variables.setString("statusCode_" + target.getCorrelationKey(), | ||
| ConstantsPing.CODESYSTEM_DSF_PING_STATUS_VALUE_PONG_MISSING); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package dev.dsf.bpe.service; | ||
|
|
||
| import org.camunda.bpm.engine.delegate.BpmnError; | ||
| import org.camunda.bpm.engine.delegate.DelegateExecution; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import dev.dsf.bpe.v1.ProcessPluginApi; | ||
| import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; | ||
| import dev.dsf.bpe.v1.variables.Target; | ||
| import dev.dsf.bpe.v1.variables.Variables; | ||
|
|
||
| public class LogSendError extends AbstractServiceDelegate | ||
| { | ||
| private static final Logger logger = LoggerFactory.getLogger(LogSendError.class); | ||
|
|
||
| public LogSendError(ProcessPluginApi api) | ||
| { | ||
| super(api); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doExecute(DelegateExecution execution, Variables variables) throws BpmnError, Exception | ||
| { | ||
| Target target = variables.getTarget(); | ||
| String statusCode = (String) execution.getVariableLocal("statusCode"); | ||
| String errorMessage = (String) execution.getVariableLocal("errorMessage"); | ||
|
|
||
| logger.warn("Unable to send PING to {} (endpoint: {}): {}", target.getOrganizationIdentifierValue(), | ||
| target.getEndpointIdentifierValue(), errorMessage); | ||
|
|
||
| variables.setString("statusCode_" + target.getCorrelationKey(), statusCode); | ||
| variables.setString("errorMessage_" + target.getCorrelationKey(), errorMessage); | ||
| } | ||
| } |
Oops, something went wrong.