Skip to content

Commit 1103b67

Browse files
respect activated job (#643)
1 parent f751ea4 commit 1103b67

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

spring-client-zeebe/src/main/java/io/camunda/zeebe/spring/client/annotation/value/ZeebeWorkerValue.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.camunda.zeebe.spring.client.annotation.value;
22

3+
import io.camunda.zeebe.client.api.response.ActivatedJob;
34
import io.camunda.zeebe.spring.client.annotation.Variable;
45
import io.camunda.zeebe.spring.client.annotation.ZeebeVariable;
56
import io.camunda.zeebe.spring.client.bean.CopyNotNullBeanUtilsBean;
@@ -267,7 +268,9 @@ public ZeebeWorkerValue initializeName(String name, MethodInfo methodInfo, Strin
267268
}
268269

269270
public ZeebeWorkerValue initializeFetchVariables(boolean forceFetchAllVariables, String[] fetchVariables, MethodInfo methodInfo) {
270-
if (forceFetchAllVariables) {
271+
if (hasActivatedJobInjected()) {
272+
// do nothing
273+
} else if (forceFetchAllVariables) {
271274
// this overwrites any other setting
272275
setFetchVariables(new String[0]);
273276
} else {
@@ -280,6 +283,10 @@ public ZeebeWorkerValue initializeFetchVariables(boolean forceFetchAllVariables,
280283
return this;
281284
}
282285

286+
private boolean hasActivatedJobInjected() {
287+
return getMethodInfo().getParameters().stream().anyMatch(p -> p.getParameterInfo().getType().isAssignableFrom(ActivatedJob.class));
288+
}
289+
283290
private List<ParameterInfo> readZeebeVariableParameters(MethodInfo methodInfo) {
284291
List<ParameterInfo> result = methodInfo.getParametersFilteredByAnnotation(Variable.class);
285292
result.addAll(methodInfo.getParametersFilteredByAnnotation(ZeebeVariable.class));

0 commit comments

Comments
 (0)