From c759e2dd619a345b2939c6f7ed22a24bb87de41a Mon Sep 17 00:00:00 2001 From: tanvigour Date: Wed, 23 Mar 2022 09:18:25 -0400 Subject: [PATCH 01/22] run IT test for long values Signed-off-by: tanvigour --- .../java/io/dapr/it/pubsub/http/PubSubIT.java | 60 +++++++++++++++++++ .../it/pubsub/http/SubscriberController.java | 14 +++++ 2 files changed, 74 insertions(+) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 35e77ce5ee..c179e7be28 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -66,6 +66,8 @@ public class PubSubIT extends BaseIT { // Topic to test binary data private static final String BINARY_TOPIC_NAME = "binarytopic"; + private static final String LONG_TOPIC_NAME = "testinglongvalues"; + /** * Parameters for this test. * Param #1: useGrpc. @@ -402,6 +404,55 @@ public void testPubSubTTLMetadata() throws Exception { daprRun.stop(); } + @Test + public void testlongValues() throws Exception { + final DaprRun daprRun = closeLater(startDaprApp( + this.getClass().getSimpleName(), + SubscriberService.SUCCESS_MESSAGE, + SubscriberService.class, + true, + 60000)); + // At this point, it is guaranteed that the service above is running and all ports being listened to. + if (this.useGrpc) { + daprRun.switchToGRPC(); + } else { + daprRun.switchToHTTP(); + } + + ConverLong value = new ConverLong(); + value.setVal(590518626939830271L); + try (DaprClient client = new DaprClientBuilder().build()) { + for (int i = 0; i < NUM_MESSAGES; i++) { + //Publishing messages + client.publishEvent( + PUBSUB_NAME, + LONG_TOPIC_NAME, + value, + Collections.singletonMap(Metadata.TTL_IN_SECONDS, "1")).block(); + + try { + Thread.sleep((long) (1000 * Math.random())); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); + return; + } + } + } + + try (DaprClient client = new DaprClientBuilder().build()) { + callWithRetry(() -> { + System.out.println("Checking results for topic " + LONG_TOPIC_NAME); + final List messages = client.invokeMethod( + daprRun.getAppName(), + "messages/testinglongvalues", + null, + HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); + assertEquals(590518626939830271L, messages.get(0).getData()); + }, 2000); + } + } + public static class MyObject { private String id; @@ -413,4 +464,13 @@ public void setId(String id) { this.id = id; } } + + public static class ConverLong { + public Long value; + + public void setVal(Long value) { + this.value = value; + } + } + } diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java index 38bca7730a..c680cb58b5 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java @@ -115,6 +115,20 @@ public Mono handleMessageTTLTopic(@RequestBody(required = false) CloudEven }); } + @Topic(name = "testinglongvalues", pubsubName = "messagebus") + @PostMapping(path = "/testinglongvalues") + public Mono handleMessageLongValues(@RequestBody(required = false) CloudEvent cloudEvent) { + return Mono.fromRunnable(() -> { + try { + Long message = cloudEvent.getData().value; + System.out.println("Subscriber got: " + message); + messagesByTopic.compute("testinglongvalues", merge(cloudEvent)); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + } + private BiFunction>, List>> merge(final CloudEvent item) { return (key, value) -> { final List> list = value == null ? new ArrayList<>() : value; From afc31e6ea6d7fd1993e6a877f3009462bff855c8 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Wed, 23 Mar 2022 11:22:15 -0400 Subject: [PATCH 02/22] Fix the class name Signed-off-by: tanvigour --- .../test/java/io/dapr/it/pubsub/http/SubscriberController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java index c680cb58b5..10ffc16704 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java @@ -117,7 +117,7 @@ public Mono handleMessageTTLTopic(@RequestBody(required = false) CloudEven @Topic(name = "testinglongvalues", pubsubName = "messagebus") @PostMapping(path = "/testinglongvalues") - public Mono handleMessageLongValues(@RequestBody(required = false) CloudEvent cloudEvent) { + public Mono handleMessageLongValues(@RequestBody(required = false) CloudEvent cloudEvent) { return Mono.fromRunnable(() -> { try { Long message = cloudEvent.getData().value; From fa8f19d4975b72dc1294f7aab752c39bedc5f5ca Mon Sep 17 00:00:00 2001 From: tanvigour Date: Wed, 23 Mar 2022 12:35:56 -0400 Subject: [PATCH 03/22] assert for all messages and fix class name Signed-off-by: tanvigour --- .../src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index c179e7be28..204168ccff 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -419,7 +419,7 @@ public void testlongValues() throws Exception { daprRun.switchToHTTP(); } - ConverLong value = new ConverLong(); + ConvertToLong value = new ConvertToLong(); value.setVal(590518626939830271L); try (DaprClient client = new DaprClientBuilder().build()) { for (int i = 0; i < NUM_MESSAGES; i++) { @@ -448,7 +448,9 @@ public void testlongValues() throws Exception { "messages/testinglongvalues", null, HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); - assertEquals(590518626939830271L, messages.get(0).getData()); + for (int i = 0; i < NUM_MESSAGES; i++) { + assertEquals(590518626939830271L, messages.get(i).getData()); + } }, 2000); } } @@ -465,7 +467,7 @@ public void setId(String id) { } } - public static class ConverLong { + public static class ConvertToLong { public Long value; public void setVal(Long value) { From a31516f24052b921248027453a2340b1d3a0e0af Mon Sep 17 00:00:00 2001 From: tanvigour Date: Thu, 24 Mar 2022 21:28:09 -0400 Subject: [PATCH 04/22] test for Long.MAX_VALUE Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 204168ccff..de8309de69 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -420,7 +420,7 @@ public void testlongValues() throws Exception { } ConvertToLong value = new ConvertToLong(); - value.setVal(590518626939830271L); + value.setVal(Long.MAX_VALUE); try (DaprClient client = new DaprClientBuilder().build()) { for (int i = 0; i < NUM_MESSAGES; i++) { //Publishing messages @@ -449,7 +449,7 @@ public void testlongValues() throws Exception { null, HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); for (int i = 0; i < NUM_MESSAGES; i++) { - assertEquals(590518626939830271L, messages.get(i).getData()); + assertEquals(Long.MAX_VALUE, messages.get(i).getData()); } }, 2000); } From acd4a3212c122426493d13f2ad0a85aa42e7c63b Mon Sep 17 00:00:00 2001 From: tanvigour Date: Fri, 25 Mar 2022 09:12:32 -0400 Subject: [PATCH 05/22] revert back long number and print Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index de8309de69..085de9d537 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -420,7 +420,7 @@ public void testlongValues() throws Exception { } ConvertToLong value = new ConvertToLong(); - value.setVal(Long.MAX_VALUE); + value.setVal(590518626939830271L); try (DaprClient client = new DaprClientBuilder().build()) { for (int i = 0; i < NUM_MESSAGES; i++) { //Publishing messages @@ -449,7 +449,8 @@ public void testlongValues() throws Exception { null, HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); for (int i = 0; i < NUM_MESSAGES; i++) { - assertEquals(Long.MAX_VALUE, messages.get(i).getData()); + System.out.println(messages.get(i).getData()) + assertEquals(590518626939830271L, messages.get(i).getData()); } }, 2000); } From bf825b1e6d4cbfb03bd7ccaa40378edab939d923 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Fri, 25 Mar 2022 13:13:49 -0400 Subject: [PATCH 06/22] fix the typo Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 085de9d537..01bd4e2124 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -449,7 +449,7 @@ public void testlongValues() throws Exception { null, HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println(messages.get(i).getData()) + System.out.println(messages.get(i).getData()); assertEquals(590518626939830271L, messages.get(i).getData()); } }, 2000); From ba294513c161c1e9f7880ee5e626b5fb3c698a4a Mon Sep 17 00:00:00 2001 From: tanvigour Date: Fri, 25 Mar 2022 13:57:02 -0400 Subject: [PATCH 07/22] update the latest dapr commit in workflow files Signed-off-by: tanvigour --- .github/workflows/build.yml | 2 +- .github/workflows/validate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 915127e226..a74e8e2098 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: DAPR_RUNTIME_VER: 1.6.0-rc.2 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.6.0-rc.1/install/install.sh DAPR_CLI_REF: - DAPR_REF: 5a307f3deaa1b322f7945179adad0403de80eb7e + DAPR_REF: 4cf499448ef6ee87c83db6a11b84e83237e92665 steps: - uses: actions/checkout@v3 - name: Set up OpenJDK ${{ env.JDK_VER }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 67f8cd1069..ce686db14b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -40,7 +40,7 @@ jobs: DAPR_RUNTIME_VER: 1.6.0-rc.2 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.6.0-rc.1/install/install.sh DAPR_CLI_REF: - DAPR_REF: 5a307f3deaa1b322f7945179adad0403de80eb7e + DAPR_REF: 4cf499448ef6ee87c83db6a11b84e83237e92665 steps: - uses: actions/checkout@v3 - name: Set up OpenJDK ${{ env.JDK_VER }} From 4ba48595ee39c45f63f88b1fa7e13170bc736ebd Mon Sep 17 00:00:00 2001 From: tanvigour Date: Fri, 25 Mar 2022 15:16:41 -0400 Subject: [PATCH 08/22] log some more data to debug Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 01bd4e2124..e4576aeb2a 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -449,7 +449,7 @@ public void testlongValues() throws Exception { null, HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println(messages.get(i).getData()); + System.out.println("The long value received!!!",messages.get(i).getData()); assertEquals(590518626939830271L, messages.get(i).getData()); } }, 2000); From 93a594304124f1c001cc5d0583e0de5104d8b81f Mon Sep 17 00:00:00 2001 From: tanvigour Date: Fri, 25 Mar 2022 16:08:10 -0400 Subject: [PATCH 09/22] debug Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index e4576aeb2a..130eb668a2 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -449,7 +449,7 @@ public void testlongValues() throws Exception { null, HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("The long value received!!!",messages.get(i).getData()); + System.out.println("The long value received!!! " +messages.get(i).getData()); assertEquals(590518626939830271L, messages.get(i).getData()); } }, 2000); From 09c52afc2b9e036e58ca33815cf10606d00f05da Mon Sep 17 00:00:00 2001 From: tanvigour Date: Fri, 25 Mar 2022 17:12:05 -0400 Subject: [PATCH 10/22] get the value from messages Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 130eb668a2..e32bc92055 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -449,8 +449,8 @@ public void testlongValues() throws Exception { null, HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("The long value received!!! " +messages.get(i).getData()); - assertEquals(590518626939830271L, messages.get(i).getData()); + System.out.println("The long value received!!! " +messages.get(i).getData().value); + assertEquals(590518626939830271L, messages.get(i).getData().value); } }, 2000); } From 5b4f1d7b8eb9641734085f9299f86e9bce06ab8d Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 15:31:14 -0400 Subject: [PATCH 11/22] address feedback Signed-off-by: tanvigour --- .../java/io/dapr/it/pubsub/http/PubSubIT.java | 55 +++++++++++++++---- .../it/pubsub/http/SubscriberController.java | 2 +- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index e32bc92055..d02136b449 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -37,6 +37,9 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; +import java.util.Random; +import java.util.HashSet; +import java.util.Iterator; import static io.dapr.it.Retry.callWithRetry; import static io.dapr.it.TestUtils.assertThrowsDaprException; @@ -44,6 +47,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class PubSubIT extends BaseIT { @@ -51,6 +56,7 @@ public class PubSubIT extends BaseIT { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); private static final TypeRef> CLOUD_EVENT_LIST_TYPE_REF = new TypeRef<>() {}; + private static final TypeRef>> CLOUD_EVENT_LONG_LIST_TYPE_REF = new TypeRef<>() {}; private static final TypeRef>> CLOUD_EVENT_MYOBJECT_LIST_TYPE_REF = new TypeRef<>() {}; //Number of messages to be sent: 10 @@ -405,7 +411,7 @@ public void testPubSubTTLMetadata() throws Exception { } @Test - public void testlongValues() throws Exception { + public void testLongValues() throws Exception { final DaprRun daprRun = closeLater(startDaprApp( this.getClass().getSimpleName(), SubscriberService.SUCCESS_MESSAGE, @@ -419,15 +425,27 @@ public void testlongValues() throws Exception { daprRun.switchToHTTP(); } - ConvertToLong value = new ConvertToLong(); - value.setVal(590518626939830271L); + ConvertToLong toLong = new ConvertToLong(); + HashSet expected = new HashSet<>(); + Random random = new Random(); + Long randomLong = 590518626939830271L; + random.setSeed(randomLong); + toLong.setValue(randomLong); + expected.add(toLong); + Iterator expectVal = expected.iterator(); + for (int i = 1; i < NUM_MESSAGES; i++) { + randomLong = random.nextLong(); + toLong.setValue(randomLong); + expected.add(toLong); + } try (DaprClient client = new DaprClientBuilder().build()) { - for (int i = 0; i < NUM_MESSAGES; i++) { + while(expectVal.hasNext()) { + //Publishing messages client.publishEvent( PUBSUB_NAME, LONG_TOPIC_NAME, - value, + expectVal.next(), Collections.singletonMap(Metadata.TTL_IN_SECONDS, "1")).block(); try { @@ -440,18 +458,20 @@ public void testlongValues() throws Exception { } } + HashSet actual = new HashSet<>(); try (DaprClient client = new DaprClientBuilder().build()) { callWithRetry(() -> { System.out.println("Checking results for topic " + LONG_TOPIC_NAME); - final List messages = client.invokeMethod( + final List> messages = client.invokeMethod( daprRun.getAppName(), "messages/testinglongvalues", null, - HttpExtension.GET, CLOUD_EVENT_LIST_TYPE_REF).block(); + HttpExtension.GET, CLOUD_EVENT_LONG_LIST_TYPE_REF).block(); + assertNotNull(messages); for (int i = 0; i < NUM_MESSAGES; i++) { - System.out.println("The long value received!!! " +messages.get(i).getData().value); - assertEquals(590518626939830271L, messages.get(i).getData().value); + actual.add(messages.get(i).getData()); } + assertEquals(expected, actual); }, 2000); } } @@ -469,11 +489,24 @@ public void setId(String id) { } public static class ConvertToLong { - public Long value; + private Long value; - public void setVal(Long value) { + public Long getValue() { + return value; + } + + public void setValue(Long value) { this.value = value; } + + public boolean equals(Object object) { + if (this == object) return true; + if (object == null || getClass() != object.getClass()) return false; + if (!super.equals(object)) return false; + ConvertToLong that = (ConvertToLong) object; + return java.util.Objects.equals(value, that.value); + } + } } diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java index 10ffc16704..726e8990bc 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/SubscriberController.java @@ -120,7 +120,7 @@ public Mono handleMessageTTLTopic(@RequestBody(required = false) CloudEven public Mono handleMessageLongValues(@RequestBody(required = false) CloudEvent cloudEvent) { return Mono.fromRunnable(() -> { try { - Long message = cloudEvent.getData().value; + Long message = cloudEvent.getData().getValue(); System.out.println("Subscriber got: " + message); messagesByTopic.compute("testinglongvalues", merge(cloudEvent)); } catch (Exception e) { From c40af0ac729c2b1c40fee76bd99fcf297106653a Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 16:00:07 -0400 Subject: [PATCH 12/22] change the assertion Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index d02136b449..f0a67f44b5 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -471,7 +471,7 @@ public void testLongValues() throws Exception { for (int i = 0; i < NUM_MESSAGES; i++) { actual.add(messages.get(i).getData()); } - assertEquals(expected, actual); + assertTrue(expected.equals(actual)); }, 2000); } } From f0b5663b95375ffbf248c974865c507050366923 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 17:19:37 -0400 Subject: [PATCH 13/22] Add hashcode and equals functione and create new obj while adding value to set Signed-off-by: tanvigour --- .../test/java/io/dapr/it/pubsub/http/PubSubIT.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index f0a67f44b5..5d73166d2b 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -434,9 +434,10 @@ public void testLongValues() throws Exception { expected.add(toLong); Iterator expectVal = expected.iterator(); for (int i = 1; i < NUM_MESSAGES; i++) { + ConvertToLong value = new ConvertToLong(); randomLong = random.nextLong(); - toLong.setValue(randomLong); - expected.add(toLong); + value.setValue(randomLong); + expected.add(value); } try (DaprClient client = new DaprClientBuilder().build()) { while(expectVal.hasNext()) { @@ -501,12 +502,15 @@ public void setValue(Long value) { public boolean equals(Object object) { if (this == object) return true; - if (object == null || getClass() != object.getClass()) return false; + if (!(object instanceof ConvertToLong)) return false; if (!super.equals(object)) return false; ConvertToLong that = (ConvertToLong) object; - return java.util.Objects.equals(value, that.value); + return java.util.Objects.equals(getValue(), that.getValue()); } + public int hashCode() { + return java.util.Objects.hash(super.hashCode(), getValue()); + } } } From fca6921d16d5e020f33343c4afe6c872078921a9 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 21:29:22 -0400 Subject: [PATCH 14/22] move iterator Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 5d73166d2b..d1d5950586 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -432,13 +432,13 @@ public void testLongValues() throws Exception { random.setSeed(randomLong); toLong.setValue(randomLong); expected.add(toLong); - Iterator expectVal = expected.iterator(); for (int i = 1; i < NUM_MESSAGES; i++) { ConvertToLong value = new ConvertToLong(); randomLong = random.nextLong(); value.setValue(randomLong); expected.add(value); } + Iterator expectVal = expected.iterator(); try (DaprClient client = new DaprClientBuilder().build()) { while(expectVal.hasNext()) { From c7987293b0c775583124d969821a2dbee36f87fc Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 21:54:27 -0400 Subject: [PATCH 15/22] log value before adding to hashset Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index d1d5950586..9cfa2a24a4 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -471,6 +471,7 @@ public void testLongValues() throws Exception { assertNotNull(messages); for (int i = 0; i < NUM_MESSAGES; i++) { actual.add(messages.get(i).getData()); + System.out.println("Log data coming from subscriber added to hashset : " + messages.get(i).getData()) } assertTrue(expected.equals(actual)); }, 2000); From c81363f8f159baca9b57c67d947c5c3eda4873ec Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 22:08:20 -0400 Subject: [PATCH 16/22] log value before adding to hashset Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 9cfa2a24a4..e52f505cb3 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -471,8 +471,9 @@ public void testLongValues() throws Exception { assertNotNull(messages); for (int i = 0; i < NUM_MESSAGES; i++) { actual.add(messages.get(i).getData()); - System.out.println("Log data coming from subscriber added to hashset : " + messages.get(i).getData()) + System.out.println("Log data coming from subscriber added to hashset : " + messages.get(i).getData()); } + System.out.println(expected.equals(actual)); assertTrue(expected.equals(actual)); }, 2000); } From 77006cbc31555d0737289a29b5f52bce5df54b5d Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 22:32:36 -0400 Subject: [PATCH 17/22] log value before adding to hashset Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index e52f505cb3..b3b4cd7df1 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -456,6 +456,7 @@ public void testLongValues() throws Exception { Thread.currentThread().interrupt(); return; } + System.out.println("data in expect hashset: " + expectVal.next()); } } @@ -471,7 +472,7 @@ public void testLongValues() throws Exception { assertNotNull(messages); for (int i = 0; i < NUM_MESSAGES; i++) { actual.add(messages.get(i).getData()); - System.out.println("Log data coming from subscriber added to hashset : " + messages.get(i).getData()); + System.out.println("Log data coming from subscriber added to hashset : " + messages.get(i).getData().getValue()); } System.out.println(expected.equals(actual)); assertTrue(expected.equals(actual)); From 113baf5b1071a4ce8834a420999be994a7e89155 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Mon, 28 Mar 2022 23:03:42 -0400 Subject: [PATCH 18/22] change assertion Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index b3b4cd7df1..cf97d0ad13 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -456,7 +456,6 @@ public void testLongValues() throws Exception { Thread.currentThread().interrupt(); return; } - System.out.println("data in expect hashset: " + expectVal.next()); } } @@ -472,10 +471,8 @@ public void testLongValues() throws Exception { assertNotNull(messages); for (int i = 0; i < NUM_MESSAGES; i++) { actual.add(messages.get(i).getData()); - System.out.println("Log data coming from subscriber added to hashset : " + messages.get(i).getData().getValue()); } - System.out.println(expected.equals(actual)); - assertTrue(expected.equals(actual)); + assertEquals(expected,actual); }, 2000); } } From 0f7f2f874e93cb1cc4fcebc794aaeef69c552163 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Tue, 29 Mar 2022 10:28:30 -0400 Subject: [PATCH 19/22] fix equals method Signed-off-by: tanvigour --- .../java/io/dapr/it/pubsub/http/PubSubIT.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index cf97d0ad13..7a8d8b8763 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -40,6 +40,7 @@ import java.util.Random; import java.util.HashSet; import java.util.Iterator; +import java.util.Objects; import static io.dapr.it.Retry.callWithRetry; import static io.dapr.it.TestUtils.assertThrowsDaprException; @@ -500,16 +501,17 @@ public void setValue(Long value) { this.value = value; } - public boolean equals(Object object) { - if (this == object) return true; - if (!(object instanceof ConvertToLong)) return false; - if (!super.equals(object)) return false; - ConvertToLong that = (ConvertToLong) object; - return java.util.Objects.equals(getValue(), that.getValue()); + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ConvertToLong that = (ConvertToLong) o; + return Objects.equals(value, that.value); } + @Override public int hashCode() { - return java.util.Objects.hash(super.hashCode(), getValue()); + return Objects.hash(value); } } From 2240671a014081c3b910151b2ce0da331d82b6fb Mon Sep 17 00:00:00 2001 From: tanvigour Date: Tue, 29 Mar 2022 11:15:20 -0400 Subject: [PATCH 20/22] adding debugging for expected value Signed-off-by: tanvigour --- .../src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 7a8d8b8763..9ca6bcabc6 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -442,12 +442,13 @@ public void testLongValues() throws Exception { Iterator expectVal = expected.iterator(); try (DaprClient client = new DaprClientBuilder().build()) { while(expectVal.hasNext()) { - + ConvertToLong val = new ConvertToLong(); + val = expectVal.next(); //Publishing messages client.publishEvent( PUBSUB_NAME, LONG_TOPIC_NAME, - expectVal.next(), + val, Collections.singletonMap(Metadata.TTL_IN_SECONDS, "1")).block(); try { @@ -457,6 +458,7 @@ public void testLongValues() throws Exception { Thread.currentThread().interrupt(); return; } + System.out.println("expected value is : " +val); } } From f2de558a5e780c4891be95e06224b96f49248e32 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Tue, 29 Mar 2022 11:27:47 -0400 Subject: [PATCH 21/22] adding logs for expected value Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index 9ca6bcabc6..aea5774c1a 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -438,12 +438,11 @@ public void testLongValues() throws Exception { randomLong = random.nextLong(); value.setValue(randomLong); expected.add(value); + System.out.println("expected value is : " +value); } Iterator expectVal = expected.iterator(); try (DaprClient client = new DaprClientBuilder().build()) { while(expectVal.hasNext()) { - ConvertToLong val = new ConvertToLong(); - val = expectVal.next(); //Publishing messages client.publishEvent( PUBSUB_NAME, @@ -458,7 +457,6 @@ public void testLongValues() throws Exception { Thread.currentThread().interrupt(); return; } - System.out.println("expected value is : " +val); } } From ddcd2b30a3dc68ba7499d827fb1ff20a64be7996 Mon Sep 17 00:00:00 2001 From: tanvigour Date: Tue, 29 Mar 2022 11:30:12 -0400 Subject: [PATCH 22/22] log value before adding to hashset Signed-off-by: tanvigour --- sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java index aea5774c1a..32491f68c5 100644 --- a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java @@ -447,7 +447,7 @@ public void testLongValues() throws Exception { client.publishEvent( PUBSUB_NAME, LONG_TOPIC_NAME, - val, + expectVal.next(), Collections.singletonMap(Metadata.TTL_IN_SECONDS, "1")).block(); try {