From a24d8e5f51a641ad3b8a88ef905094249b786dbc Mon Sep 17 00:00:00 2001
From: 1nb0und <133918079+1nb0und@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:12:04 -0500
Subject: [PATCH] feat: change user to username

---
 .../configuration/CommonClientConfiguration.java       |  4 ++--
 .../zeebe/spring/client/properties/common/Client.java  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/configuration/CommonClientConfiguration.java b/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/configuration/CommonClientConfiguration.java
index 89eb88df4..d7882836a 100644
--- a/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/configuration/CommonClientConfiguration.java
+++ b/spring-boot-starter-camunda/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/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/Client.java b/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/Client.java
index 7c7cfafa3..33027a2bf 100644
--- a/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/Client.java
+++ b/spring-boot-starter-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() {