remove adding default tenant ids to job worker configuration

Author: jonathanlukas

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

@@ -39,7 +39,6 @@ public PropertyBasedZeebeWorkerValueCustomizer(
   public void customize(ZeebeWorkerValue zeebeWorker) {
     applyDefaultWorkerName(zeebeWorker);
     applyDefaultJobWorkerType(zeebeWorker);
-    applyTenantIds(zeebeWorker);
     applyFetchVariables(zeebeWorker);
     applyOverrides(zeebeWorker);
   }
@@ -100,20 +99,6 @@ private void applyOverrides(ZeebeWorkerValue zeebeWorker) {
     }
   }
 
-  private void applyTenantIds(ZeebeWorkerValue zeebeWorker) {
-    List<String> defaultJobWorkerTenantIds =
-        zeebeClientConfigurationProperties.getDefaultJobWorkerTenantIds();
-    if (defaultJobWorkerTenantIds != null
-        && !defaultJobWorkerTenantIds.isEmpty()
-        && (zeebeWorker.getTenantIds() == null || zeebeWorker.getTenantIds().isEmpty())) {
-      LOG.debug(
-          "Worker '{}': Setting default tenant ids to {}",
-          zeebeWorker.getName(),
-          defaultJobWorkerTenantIds);
-      zeebeWorker.setTenantIds(defaultJobWorkerTenantIds);
-    }
-  }
-
   private void applyDefaultWorkerName(ZeebeWorkerValue zeebeWorker) {
     String defaultJobWorkerName = zeebeClientConfigurationProperties.getDefaultJobWorkerName();
     if (isBlank(zeebeWorker.getName())) {

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

@@ -138,21 +138,6 @@ void shouldNotSetNameOfVariablesAsTypeAnnotatedField() {
     assertThat(zeebeWorkerValue.getFetchVariables()).doesNotContain("var2");
   }
 
-  @Test
-  void shouldSetDefaultTenantIds() {
-    // given
-    ZeebeClientConfigurationProperties properties = properties();
-    PropertyBasedZeebeWorkerValueCustomizer customizer =
-        new PropertyBasedZeebeWorkerValueCustomizer(properties);
-    ZeebeWorkerValue zeebeWorkerValue = new ZeebeWorkerValue();
-    zeebeWorkerValue.setMethodInfo(methodInfo(this, "testBean", "sampleWorker"));
-    // when
-    customizer.customize(zeebeWorkerValue);
-    // then
-    assertThat(zeebeWorkerValue.getTenantIds())
-        .containsOnly(ZeebeClientConfigurationProperties.DEFAULT.getDefaultTenantId());
-  }
-
   @Test
   void shouldApplyOverrides() {
     // given

spring-client-zeebe/src/main/java/io/camunda/zeebe/spring/client/jobhandling/JobWorkerManager.java

@@ -74,6 +74,9 @@ public JobWorker openWorker(
         && zeebeWorkerValue.getFetchVariables().length > 0) {
       builder.fetchVariables(zeebeWorkerValue.getFetchVariables());
     }
+    if (zeebeWorkerValue.getTenantIds() != null && !zeebeWorkerValue.getTenantIds().isEmpty()) {
+      builder.tenantIds(zeebeWorkerValue.getTenantIds());
+    }
 
     JobWorker jobWorker = builder.open();
     openedWorkers.add(jobWorker);