fix: userKafkas Update, removing broken equals impl

redhat-developer · Mar 31, 2021 · dc312e5 · dc312e5
1 parent 14d3533
commit dc312e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/source/model/src/main/java/com/openshift/cloud/v1alpha/models/UserKafka.java b/source/model/src/main/java/com/openshift/cloud/v1alpha/models/UserKafka.java
@@ -89,21 +89,6 @@ public UserKafka setStatus(String status) {
     return this;
   }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    UserKafka userKafka = (UserKafka) o;
-
-    return id.equals(userKafka.id);
-  }
-
-  @Override
-  public int hashCode() {
-    return id.hashCode();
-  }
-
   public String getUpdatedAt() {
     return updatedAt;
   }

diff --git a/source/rhoas/src/main/java/com/openshift/cloud/beans/AccessTokenSecretTool.java b/source/rhoas/src/main/java/com/openshift/cloud/beans/AccessTokenSecretTool.java
@@ -51,7 +51,8 @@ public String getAccessToken(String accessTokenSecretName, String namespace)
       throws ConditionAwareException {
     try {
       if (isNullOrEmpty(accessTokenSecretName, namespace)) {
-        throw new IllegalArgumentException("accessTokenSecretName and namespace must be provided and exist.");
+        throw new IllegalArgumentException(
+            "accessTokenSecretName and namespace must be provided and exist.");
       }
       var offlineToken = getOfflineTokenFromSecret(accessTokenSecretName, namespace);
       var accessToken = exchangeToken(offlineToken);

diff --git a/...e/rhoas/src/main/java/com/openshift/cloud/controllers/CloudServicesRequestController.java b/...e/rhoas/src/main/java/com/openshift/cloud/controllers/CloudServicesRequestController.java
@@ -67,10 +67,6 @@ void doCreateOrUpdateResource(
               userKafkas.add(userKafka);
             });
 
-    if (userKafkas.equals(resource.getStatus().getUserKafkas())) {
-
-    } else {
-      resource.getStatus().setUserKafkas(userKafkas);
-    }
+    resource.getStatus().setUserKafkas(userKafkas);
   }
 }