updating tests and clients

Signed-off-by: salaboy <Salaboy@gmail.com>
dapr · Jun 11, 2024 · 837be4a · 837be4a
1 parent 093f85d
commit 837be4a
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java
@@ -1234,14 +1234,10 @@ private DaprMetadata buildDaprMetadata(
       DaprProtos.GetMetadataResponse response) throws IOException {
     List<RegisteredComponents> registeredComponentsList = response.getRegisteredComponentsList();
 
-    DaprMetadata daprMetadata = new DaprMetadata();
-    daprMetadata.setId(response.getId());
-    daprMetadata.setRuntimeVersion(response.getRuntimeVersion());
     List<ComponentMetadata> components = new ArrayList<>();
     for (RegisteredComponents rc : registeredComponentsList) {
       components.add(new ComponentMetadata(rc.getName(), rc.getType(), rc.getVersion()));
     }
-    daprMetadata.setComponents(components);
 
     List<PubsubSubscription> subscriptionsList = response.getSubscriptionsList();
     List<SubscriptionMetadata> subscriptions = new ArrayList<>();
@@ -1253,8 +1249,7 @@ private DaprMetadata buildDaprMetadata(
       }
       subscriptions.add(new SubscriptionMetadata(s.getTopic(), s.getPubsubName(), s.getDeadLetterTopic(), rules));
     }
-    daprMetadata.setSubscriptions(subscriptions);
 
-    return daprMetadata;
+    return new DaprMetadata(response.getId(), response.getRuntimeVersion(), components, subscriptions);
   }
 }
diff --git a/sdk/src/main/java/io/dapr/client/domain/ComponentMetadata.java b/sdk/src/main/java/io/dapr/client/domain/ComponentMetadata.java
@@ -59,12 +59,15 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (this == obj)
+    if (this == obj) {
       return true;
-    if (obj == null)
+    }
+    if (obj == null) {
       return false;
-    if (getClass() != obj.getClass())
+    }
+    if (getClass() != obj.getClass()) {
       return false;
+    }
     ComponentMetadata other = (ComponentMetadata) obj;
     return Objects.equals(name, other.name) && Objects.equals(type, other.type)
         && Objects.equals(version, other.version);

diff --git a/sdk/src/main/java/io/dapr/client/domain/DaprMetadata.java b/sdk/src/main/java/io/dapr/client/domain/DaprMetadata.java
@@ -69,12 +69,15 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (this == obj)
+    if (this == obj) {
       return true;
-    if (obj == null)
+    }
+    if (obj == null) {
       return false;
-    if (getClass() != obj.getClass())
+    }
+    if (getClass() != obj.getClass()) {
       return false;
+    }
     DaprMetadata other = (DaprMetadata) obj;
     return Objects.equals(id, other.id) && Objects.equals(runtimeVersion, other.runtimeVersion)
         && Objects.equals(components, other.components) && Objects.equals(subscriptions, other.subscriptions);

diff --git a/sdk/src/main/java/io/dapr/client/domain/RuleMetadata.java b/sdk/src/main/java/io/dapr/client/domain/RuleMetadata.java
@@ -39,12 +39,15 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (this == obj)
+    if (this == obj) {
       return true;
-    if (obj == null)
+    }
+    if (obj == null) {
       return false;
-    if (getClass() != obj.getClass())
+    }
+    if (getClass() != obj.getClass()) {
       return false;
+    }
     RuleMetadata other = (RuleMetadata) obj;
     return Objects.equals(path, other.path);
   }

diff --git a/sdk/src/main/java/io/dapr/client/domain/SubscriptionMetadata.java b/sdk/src/main/java/io/dapr/client/domain/SubscriptionMetadata.java
@@ -69,12 +69,15 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (this == obj)
+    if (this == obj) {
       return true;
-    if (obj == null)
+    }
+    if (obj == null) {
       return false;
-    if (getClass() != obj.getClass())
+    }
+    if (getClass() != obj.getClass()) {
       return false;
+    }
     SubscriptionMetadata other = (SubscriptionMetadata) obj;
     return Objects.equals(topic, other.topic) && Objects.equals(pubsubname, other.pubsubname)
         && Objects.equals(deadLetterTopic, other.deadLetterTopic) && Objects.equals(rules, other.rules);

diff --git a/sdk/src/test/java/io/dapr/client/DaprClientHttpTest.java b/sdk/src/test/java/io/dapr/client/DaprClientHttpTest.java
@@ -139,14 +139,11 @@ public void metadataEndpoint() throws JsonProcessingException{
     daprHttp = new DaprHttp(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
     DaprClientHttp daprClientHttp = new DaprClientHttp(daprHttp);
 
-    DaprMetadata metadata = new DaprMetadata();
-    metadata.setId("my-app");
-    metadata.setRuntimeVersion("1.1x.x");
-    metadata.setComponents(Collections.singletonList(new ComponentMetadata("statestore", "state.redis", "v1")));
-    metadata.setSubscriptions(Collections.singletonList(new SubscriptionMetadata("topic", "pubsub", "", Collections.singletonList(new RuleMetadata("/path")))));
-
-    ObjectMapper mapper = new ObjectMapper();
+    DaprMetadata metadata = new DaprMetadata("my-app", "1.1x.x", 
+              Collections.singletonList(new ComponentMetadata("statestore", "state.redis", "v1")), 
+              Collections.singletonList(new SubscriptionMetadata("topic", "pubsub", "", Collections.singletonList(new RuleMetadata("/path")))));
 
+    ObjectMapper mapper = new ObjectMapper();
 
     mockInterceptor.addRule()
             .get()