Remove all global state from setProperty (dapr#1138)

* Remove all global state in from setProperty Signed-off-by: Artur Souza <asouza.pro@gmail.com> * use Map.of Signed-off-by: Artur Souza <asouza.pro@gmail.com> * Remove dependency that is not needed. Signed-off-by: Artur Souza <asouza.pro@gmail.com> --------- Signed-off-by: Artur Souza <asouza.pro@gmail.com> Signed-off-by: salaboy <Salaboy@gmail.com>
salaboy · Oct 4, 2024 · fbd8402 · fbd8402
1 parent 232bcff
commit fbd8402
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...g/dapr-spring-messaging/src/main/java/io/dapr/spring/messaging/DaprMessagingTemplate.java b/...g/dapr-spring-messaging/src/main/java/io/dapr/spring/messaging/DaprMessagingTemplate.java
@@ -32,10 +32,15 @@
 import reactor.core.publisher.Hooks;
 import reactor.core.publisher.Mono;
 <<<<<<< HEAD
+<<<<<<< HEAD
 import reactor.util.context.Context;
 import java.util.Collections;
 import java.util.HashMap;
 =======
+=======
+
+import java.util.Map;
+>>>>>>> 7490434d (Remove all global state from setProperty (#1138))
 
 >>>>>>> 7490434d (Remove all global state from setProperty (#1138))
 import java.util.Map;

diff --git a/sdk-tests/src/test/java/io/dapr/it/binding/http/BindingIT.java b/sdk-tests/src/test/java/io/dapr/it/binding/http/BindingIT.java
@@ -38,10 +38,10 @@ public class BindingIT extends BaseIT {
 
   @Test
   public void httpOutputBindingError() throws Exception {
-    startDaprApp(
+    var run = startDaprApp(
         this.getClass().getSimpleName() + "-httpoutputbinding-exception",
         60000);
-    try(DaprClient client = new DaprClientBuilder().build()) {
+    try(DaprClient client = run.newDaprClientBuilder().build()) {
       // Validate error message
       callWithRetry(() -> {
         System.out.println("Checking exception handling for output binding ...");
@@ -61,10 +61,10 @@ public void httpOutputBindingError() throws Exception {
 
   @Test
   public void httpOutputBindingErrorIgnoredByComponent() throws Exception {
-    startDaprApp(
+    var run = startDaprApp(
         this.getClass().getSimpleName() + "-httpoutputbinding-ignore-error",
         60000);
-    try(DaprClient client = new DaprClientBuilder().build()) {
+    try(DaprClient client = run.newDaprClientBuilder().build()) {
       // Validate error message
       callWithRetry(() -> {
         System.out.println("Checking exception handling for output binding ...");
@@ -93,7 +93,7 @@ public void inputOutputBinding() throws Exception {
 
     var bidingName = "sample123";
 
-    try(DaprClient client = new DaprClientBuilder().build()) {
+    try(DaprClient client = daprRun.newDaprClientBuilder().build()) {
       callWithRetry(() -> {
         System.out.println("Checking if input binding is up before publishing events ...");
         client.invokeBinding(
@@ -116,14 +116,14 @@ public void inputOutputBinding() throws Exception {
 
       System.out.println("sending first message");
       client.invokeBinding(
-          bidingName, "create", myClass, Collections.singletonMap("MyMetadata", "MyValue"), Void.class).block();
+          bidingName, "create", myClass, Map.of("MyMetadata", "MyValue"), Void.class).block();
 
       // This is an example of sending a plain string.  The input binding will receive
       //   cat
       final String m = "cat";
       System.out.println("sending " + m);
       client.invokeBinding(
-          bidingName, "create", m, Collections.singletonMap("MyMetadata", "MyValue"), Void.class).block();
+          bidingName, "create", m, Map.of("MyMetadata", "MyValue"), Void.class).block();
 
       // Metadata is not used by Kafka component, so it is not possible to validate.
       callWithRetry(() -> {