Skip to content

Commit

Permalink
Fix wrong definition of tenant-id property
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanpelikan committed Jun 7, 2024
1 parent 78ff3ee commit c7c241f
Showing 1 changed file with 8 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package io.vanillabp.camunda8;

import io.vanillabp.springboot.adapter.VanillaBpProperties;
import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.StringUtils;

import java.util.Map;

@ConfigurationProperties(prefix = VanillaBpProperties.PREFIX, ignoreUnknownFields = true)
public class Camunda8VanillaBpProperties {

Expand Down Expand Up @@ -37,8 +36,8 @@ public String getTenantId(
if (!configuration.isUseTenants()) {
return null;
}
if (StringUtils.hasText(configuration.getTenant())) {
return configuration.getTenant();
if (StringUtils.hasText(configuration.getTenantId())) {
return configuration.getTenantId();
}
return workflowModuleId;

Expand All @@ -48,7 +47,7 @@ public static class AdapterConfiguration {

private boolean useTenants = true;

private String tenant;
private String tenantId;

public boolean isUseTenants() {
return useTenants;
Expand All @@ -58,12 +57,12 @@ public void setUseTenants(boolean useTenants) {
this.useTenants = useTenants;
}

public String getTenant() {
return tenant;
public String getTenantId() {
return tenantId;
}

public void setTenant(String tenant) {
this.tenant = tenant;
public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}

}
Expand Down

0 comments on commit c7c241f

Please sign in to comment.