build(deps): bump zeebe.version from 8.4.1 to 8.4.3 (#642)

* build(deps): bump zeebe.version from 8.4.1 to 8.4.3

Bumps `zeebe.version` from 8.4.1 to 8.4.3.

Updates `io.camunda:zeebe-bom` from 8.4.1 to 8.4.3
- [Release notes](https://github.com/camunda/zeebe/releases)
- [Commits](camunda/camunda@8.4.1...8.4.3)

Updates `io.camunda:zeebe-bpmn-model` from 8.4.1 to 8.4.3
- [Release notes](https://github.com/camunda/zeebe/releases)
- [Commits](camunda/camunda@8.4.1...8.4.3)

Updates `io.camunda:zeebe-process-test-extension` from 8.4.1 to 8.4.3
- [Commits](https://github.com/camunda-community-hub/zeebe-process-test-root/commits)

Updates `io.camunda:zeebe-process-test-extension-testcontainer` from 8.4.1 to 8.4.3
- [Commits](https://github.com/camunda-community-hub/zeebe-process-test-root/commits)

---
updated-dependencies:
- dependency-name: io.camunda:zeebe-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.camunda:zeebe-bpmn-model
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.camunda:zeebe-process-test-extension
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.camunda:zeebe-process-test-extension-testcontainer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fixed a bug where the annotation was not handled properly

* added a test to assert on the bug fix

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Lukas <jonathan.lukas@camunda.com>

Author: dependabot[bot]

pom.xml

@@ -19,7 +19,7 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
-    <zeebe.version>8.4.1</zeebe.version>
+    <zeebe.version>8.4.3</zeebe.version>
     <identity.version>8.4.0-SNAPSHOT</identity.version>
 
     <spring-boot.version>3.2.2</spring-boot.version>

spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/PropertyBasedZeebeWorkerValueCustomizer.java

@@ -2,6 +2,7 @@
 
 import static org.apache.commons.lang3.StringUtils.*;
 
+import io.camunda.zeebe.client.api.response.ActivatedJob;
 import io.camunda.zeebe.spring.client.annotation.Variable;
 import io.camunda.zeebe.spring.client.annotation.VariablesAsType;
 import io.camunda.zeebe.spring.client.annotation.ZeebeVariable;
@@ -44,7 +45,11 @@ public void customize(ZeebeWorkerValue zeebeWorker) {
   }
 
   private void applyFetchVariables(ZeebeWorkerValue zeebeWorkerValue) {
-    if (zeebeWorkerValue.isForceFetchAllVariables()) {
+    if (hasActivatedJobInjected(zeebeWorkerValue)) {
+      LOG.debug(
+          "Worker '{}': ActivatedJob is injected, no variable filtering possible",
+          zeebeWorkerValue.getName());
+    } else if (zeebeWorkerValue.isForceFetchAllVariables()) {
       LOG.debug("Worker '{}': Force fetch all variables is enabled", zeebeWorkerValue.getName());
       zeebeWorkerValue.setFetchVariables(new String[0]);
     } else {
@@ -54,7 +59,7 @@ private void applyFetchVariables(ZeebeWorkerValue zeebeWorkerValue) {
       }
       variables.addAll(
           readZeebeVariableParameters(zeebeWorkerValue.getMethodInfo()).stream()
-              .map(ParameterInfo::getParameterName)
+              .map(this::extractVariableName)
               .collect(Collectors.toList()));
       variables.addAll(readVariablesAsTypeParameters(zeebeWorkerValue.getMethodInfo()));
       zeebeWorkerValue.setFetchVariables(variables.toArray(new String[0]));
@@ -65,12 +70,25 @@ private void applyFetchVariables(ZeebeWorkerValue zeebeWorkerValue) {
     }
   }
 
+  private boolean hasActivatedJobInjected(ZeebeWorkerValue zeebeWorkerValue) {
+    return zeebeWorkerValue.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));
     return result;
   }
 
+  private String extractVariableName(ParameterInfo parameterInfo) {
+    Variable variableAnnotation = parameterInfo.getParameterInfo().getAnnotation(Variable.class);
+    if (variableAnnotation != null && !Variable.DEFAULT_NAME.equals(variableAnnotation.name())) {
+      return variableAnnotation.name();
+    }
+    return parameterInfo.getParameterName();
+  }
+
   private List<String> readVariablesAsTypeParameters(MethodInfo methodInfo) {
     List<String> result = new ArrayList<>();
     List<ParameterInfo> parameters =

spring-boot-starter-camunda/src/test/java/io/camunda/zeebe/spring/client/properties/PropertyBasedZeebeWorkerValueCustomizerTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import io.camunda.zeebe.client.api.response.ActivatedJob;
 import io.camunda.zeebe.spring.client.annotation.JobWorker;
 import io.camunda.zeebe.spring.client.annotation.Variable;
 import io.camunda.zeebe.spring.client.annotation.VariablesAsType;
@@ -38,6 +39,24 @@ private static ZeebeClientConfigurationProperties properties() {
   @JobWorker
   void sampleWorker(@Variable String var1, @VariablesAsType ComplexProcessVariable var2) {}
 
+  @JobWorker
+  void activatedJobWorker(@Variable String var1, ActivatedJob activatedJob) {}
+
+  @Test
+  void shouldNotAdjustVariableFilterVariablesAsActivatedJobIsInjected() {
+    // given
+    ZeebeClientConfigurationProperties properties = properties();
+    PropertyBasedZeebeWorkerValueCustomizer customizer =
+        new PropertyBasedZeebeWorkerValueCustomizer(properties);
+    ZeebeWorkerValue zeebeWorkerValue = new ZeebeWorkerValue();
+    zeebeWorkerValue.setFetchVariables(new String[] {"a", "var1", "b"});
+    zeebeWorkerValue.setMethodInfo(methodInfo(this, "testBean", "activatedJobWorker"));
+    // when
+    customizer.customize(zeebeWorkerValue);
+    // then
+    assertThat(zeebeWorkerValue.getFetchVariables()).containsExactly("a", "var1", "b");
+  }
+
   @Test
   void shouldSetDefaultName() throws NoSuchMethodException {
     // given