Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

respect activated job #643

Merged
merged 1 commit into from
Feb 16, 2024
Merged

respect activated job #643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...zeebe/src/main/java/io/camunda/zeebe/spring/client/annotation/value/ZeebeWorkerValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.camunda.zeebe.spring.client.annotation.value;

import io.camunda.zeebe.client.api.response.ActivatedJob;
import io.camunda.zeebe.spring.client.annotation.Variable;
import io.camunda.zeebe.spring.client.annotation.ZeebeVariable;
import io.camunda.zeebe.spring.client.bean.CopyNotNullBeanUtilsBean;
Expand Down Expand Up @@ -267,7 +268,9 @@ public ZeebeWorkerValue initializeName(String name, MethodInfo methodInfo, Strin
}

public ZeebeWorkerValue initializeFetchVariables(boolean forceFetchAllVariables, String[] fetchVariables, MethodInfo methodInfo) {
if (forceFetchAllVariables) {
if (hasActivatedJobInjected()) {
// do nothing
} else if (forceFetchAllVariables) {
// this overwrites any other setting
setFetchVariables(new String[0]);
} else {
Expand All @@ -280,6 +283,10 @@ public ZeebeWorkerValue initializeFetchVariables(boolean forceFetchAllVariables,
return this;
}

private boolean hasActivatedJobInjected() {
return getMethodInfo().getParameters().stream().anyMatch(p -> p.getParameterInfo().getType().isAssignableFrom(ActivatedJob.class));
}

private List<ParameterInfo> readZeebeVariableParameters(MethodInfo methodInfo) {
List<ParameterInfo> result = methodInfo.getParametersFilteredByAnnotation(Variable.class);
result.addAll(methodInfo.getParametersFilteredByAnnotation(ZeebeVariable.class));
Expand Down
Loading