Fix issue where custom JSON serializer generates Base64 encoded data in state store

sdk-actors/src/main/java/io/dapr/actors/ActorId.java

@@ -10,7 +10,7 @@
 /**
  * The ActorId represents the identity of an actor within an actor service.
  */
-public class ActorId extends Object implements Comparable<ActorId> {
+public class ActorId implements Comparable<ActorId> {
 
   /**
    * The ID of the actor as a String.
@@ -20,7 +20,7 @@ public class ActorId extends Object implements Comparable<ActorId> {
   /**
    * An error message for an invalid constructor arg.
    */
-  private final String errorMsg = "actor needs to be initialized with an id!";
+  private static final String errorMsg = "actor needs to be initialized with an id!";
 
   /**
    * Initializes a new instance of the ActorId class with the id passed in.

sdk-actors/src/main/java/io/dapr/actors/runtime/DaprStateAsyncProvider.java

@@ -15,6 +15,7 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
 /**
@@ -68,6 +69,19 @@ <T> Mono<T> load(String actorType, ActorId actorId, String stateName, TypeRef<T>
           return Mono.empty();
         }
 
+        if (!this.isStateSerializerDefault) {
+          if (s.length == 0) {
+            return Mono.empty();
+          }
+          s = OBJECT_MAPPER.readValue(s, byte[].class);
+          if (type.getType().equals(String.class) && s[0] != '"') {
+            byte[] out = new byte[s.length + 2];
+            out[0] = '"';
+            System.arraycopy(s, 0, out, 1, s.length);
+            out[out.length - 1] = '"';
+            s = out;
+          }
+        }
         T response = this.stateSerializer.deserialize(s, type);
         if (this.isStateSerializerDefault && (response instanceof byte[])) {
           if (s.length == 0) {

sdk-actors/src/test/java/io/dapr/actors/runtime/DaprStateAsyncProviderTest.java

@@ -7,14 +7,17 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dapr.actors.ActorId;
+import io.dapr.client.ObjectSerializer;
 import io.dapr.serializer.DaprObjectSerializer;
 import io.dapr.serializer.DefaultObjectSerializer;
 import io.dapr.utils.TypeRef;
 import org.junit.Assert;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
 
+import java.io.IOException;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Objects;
 
 import static org.mockito.ArgumentMatchers.*;
@@ -27,8 +30,6 @@ public class DaprStateAsyncProviderTest {
 
   private static final DaprObjectSerializer SERIALIZER = new DefaultObjectSerializer();
 
-  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
   private static final double EPSILON = 1e-10;
 
   /**
@@ -74,6 +75,24 @@ public int hashCode() {
 
   }
 
+  class CustomJsonSerializer extends ObjectSerializer implements DaprObjectSerializer{
+
+    @Override
+    public byte[] serialize(Object o) throws IOException {
+      return super.serialize(o);
+    }
+
+    @Override
+    public <T> T deserialize(byte[] data, TypeRef<T> type) throws IOException {
+      return super.deserialize(data, type);
+    }
+
+    @Override
+    public String getContentType() {
+      return "application/json";
+    }
+  }
+
   @Test
   public void happyCaseApply() {
     DaprClient daprClient = mock(DaprClient.class);
@@ -142,6 +161,9 @@ public void happyCaseLoad() throws Exception {
     when(daprClient
         .getState(any(), any(), eq("name")))
         .thenReturn(Mono.just(SERIALIZER.serialize("Jon Doe")));
+    when(daprClient
+            .getState(any(), any(), eq("quotes_name")))
+            .thenReturn(Mono.just(SERIALIZER.serialize("\"Jon Doe\"")));
     when(daprClient
         .getState(any(), any(), eq("zipcode")))
         .thenReturn(Mono.just(SERIALIZER.serialize(98021)));
@@ -174,6 +196,8 @@ public void happyCaseLoad() throws Exception {
 
     Assert.assertEquals("Jon Doe",
         provider.load("MyActor", new ActorId("123"), "name", TypeRef.STRING).block());
+    Assert.assertEquals("\"Jon Doe\"",
+        provider.load("MyActor", new ActorId("123"), "quotes_name", TypeRef.STRING).block());
     Assert.assertEquals(98021,
         (int) provider.load("MyActor", new ActorId("123"), "zipcode", TypeRef.INT).block());
     Assert.assertEquals(98,
@@ -197,6 +221,75 @@ public void happyCaseLoad() throws Exception {
         provider.load("MyActor", new ActorId("123"), "emptyBytes", TypeRef.get(byte[].class)).block());
   }
 
+  @Test
+  public void happyCaseLoadForCustomSerializer() throws Exception {
+    DaprClient daprClient = mock(DaprClient.class);
+    when(daprClient
+            .getState(any(), any(), eq("name")))
+            .thenReturn(Mono.just("\"Sm9uIERvZQ==\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("quotesName")))
+            .thenReturn(Mono.just("\"IlwiSm9uIERvZVwiIg==\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("zipcode")))
+            .thenReturn(Mono.just("\"OTgwMjE=\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("goals")))
+            .thenReturn(Mono.just("\"OTg=\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("balance")))
+            .thenReturn(Mono.just("\"NDYuNTU=\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("active")))
+            .thenReturn(Mono.just("\"dHJ1ZQ==\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("customer")))
+            .thenReturn(Mono.just("\"eyAiaWQiOiAxMDAwLCAibmFtZSI6ICJSb3hhbmUifQ==\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("anotherCustomer")))
+            .thenReturn(Mono.just("\"eyAiaWQiOiAyMDAwLCAibmFtZSI6ICJNYXgifQ==\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("quotesCustomer")))
+            .thenReturn(Mono.just("\"eyJpZCI6MTAwMCwibmFtZSI6IlwiUm94YW5lXCIifQ==\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("nullCustomer")))
+            .thenReturn(Mono.empty());
+    when(daprClient
+            .getState(any(), any(), eq("bytes")))
+            .thenReturn(Mono.just("\"QQ==\"".getBytes()));
+    when(daprClient
+            .getState(any(), any(), eq("emptyBytes")))
+            .thenReturn(Mono.just(new byte[0]));
+
+    DaprStateAsyncProvider providerWithCustomJsonSerializer = new DaprStateAsyncProvider(daprClient, new CustomJsonSerializer());
+
+    Assert.assertEquals("Jon Doe",
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "name", TypeRef.STRING).block());
+    Assert.assertEquals("\"Jon Doe\"",
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "quotesName", TypeRef.STRING).block());
+    Assert.assertEquals(98021,
+            (int) providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "zipcode", TypeRef.INT).block());
+    Assert.assertEquals(98,
+            (int) providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "goals", TypeRef.INT).block());
+    Assert.assertEquals(46.55,
+            (double) providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "balance", TypeRef.DOUBLE).block(),
+            EPSILON);
+    Assert.assertEquals(true,
+            (boolean) providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "active", TypeRef.BOOLEAN).block());
+    Assert.assertEquals(new Customer().setId(1000).setName("Roxane"),
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "customer", TypeRef.get(Customer.class)).block());
+    Assert.assertNotEquals(new Customer().setId(1000).setName("Roxane"),
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "anotherCustomer", TypeRef.get(Customer.class)).block());
+    Assert.assertEquals(new Customer().setId(1000).setName("\"Roxane\""),
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "quotesCustomer", TypeRef.get(Customer.class)).block());
+    Assert.assertNull(
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "nullCustomer", TypeRef.get(Customer.class)).block());
+    Assert.assertArrayEquals("A".getBytes(),
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "bytes", TypeRef.get(byte[].class)).block());
+    Assert.assertNull(
+            providerWithCustomJsonSerializer.load("MyActor", new ActorId("123"), "emptyBytes", TypeRef.get(byte[].class)).block());
+  }
+
   @Test
   public void happyCaseContains() {
     DaprClient daprClient = mock(DaprClient.class);