Merge pull request #542 from camunda-community-hub/feature/change-use…

…r-to-username feat: change user to username
camunda-community-hub · Dec 5, 2023 · 0abc38e · 0abc38e
2 parents 1a53a29 + a24d8e5
commit 0abc38e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...src/main/java/io/camunda/zeebe/spring/client/configuration/CommonClientConfiguration.java b/...src/main/java/io/camunda/zeebe/spring/client/configuration/CommonClientConfiguration.java
@@ -85,9 +85,9 @@ public Authentication authentication() {
           .jwtConfig(jwtConfig)
           .build();
       }
-    } else if (commonConfigurationProperties != null && commonConfigurationProperties.getUser() != null) {
+    } else if (commonConfigurationProperties != null && commonConfigurationProperties.getUsername() != null) {
       SimpleConfig simpleConfig = new SimpleConfig();
-      SimpleCredential common = new SimpleCredential(commonConfigurationProperties.getUser(), commonConfigurationProperties.getPassword());
+      SimpleCredential common = new SimpleCredential(commonConfigurationProperties.getUsername(), commonConfigurationProperties.getPassword());
       simpleConfig.addProduct(Product.OPERATE, common);
       simpleConfig.addProduct(Product.CONSOLE, common);
       simpleConfig.addProduct(Product.OPTIMIZE, common);

diff --git a/...tarter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/Client.java b/...tarter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/Client.java
@@ -4,7 +4,7 @@ public class Client {
 
   private String clientId;
   private String clientSecret;
-  private String user;
+  private String username;
   private String password;
   private Boolean enabled;
 
@@ -24,12 +24,12 @@ public void setClientSecret(String clientSecret) {
     this.clientSecret = clientSecret;
   }
 
-  public String getUser() {
-    return user;
+  public String getUsername() {
+    return username;
   }
 
-  public void setUser(String user) {
-    this.user = user;
+  public void setUsername(String username) {
+    this.username = username;
   }
 
   public String getPassword() {