Fix assignment check for getDataObject with tests (#125)

Author: longquanzheng

README.md

@@ -9,15 +9,15 @@ See [samples](https://github.com/indeedeng/iwf-java-samples) for how to use this
 ## Gradle
 ```gradle
 // https://mvnrepository.com/artifact/io.iworkflow/iwf-java-sdk
-implementation 'io.iworkflow:iwf-java-sdk:1.2.4'
+implementation 'io.iworkflow:iwf-java-sdk:1.2.5'
 ```
 ## Maven
 ```
 <!-- https://mvnrepository.com/artifact/io.iworkflow/iwf-java-sdk -->
 <dependency>
     <groupId>io.iworkflow</groupId>
     <artifactId>iwf-java-sdk</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <type>pom</type>
 </dependency>
 

build.gradle

@@ -150,7 +150,7 @@ signing {
 }
 
 group = "io.iworkflow"
-version = "1.2.4"
+version = "1.2.5"
 
 nexusPublishing {
     repositories {

src/main/java/io/iworkflow/core/persistence/DataObjectsRWImpl.java

@@ -35,7 +35,7 @@ public <T> T getDataObject(String key, Class<T> type) {
         }
 
         Class<?> registeredType = keyToTypeMap.get(key);
-        if (!registeredType.isAssignableFrom(type)) {
+        if (!type.isAssignableFrom(registeredType)) {
             throw new IllegalArgumentException(
                     String.format(
                             "registered type %s is not assignable from %s",

src/test/java/io/iworkflow/integ/PersistenceTest.java

@@ -35,12 +35,11 @@ public void testPersistenceWorkflow() throws InterruptedException {
                 client.getWorkflowDataObjects(BasicPersistenceWorkflow.class, wfId, runId, Arrays.asList(BasicPersistenceWorkflow.TEST_DATA_OBJECT_KEY));
         Assertions.assertEquals(
                 "query-start-query-decide", map.get(BasicPersistenceWorkflow.TEST_DATA_OBJECT_KEY));
-        Map<String, Object> allQueryAttributes =
-                client.getAllDataObjects(BasicPersistenceWorkflow.class, wfId, runId);
-        Assertions.assertEquals(
-                "query-start-query-decide", allQueryAttributes.get(BasicPersistenceWorkflow.TEST_DATA_OBJECT_KEY));
-        Assertions.assertEquals(
-                1, allQueryAttributes.size());
+        Map<String, Object> allDataObjects = client.getAllDataObjects(BasicPersistenceWorkflow.class, wfId, runId);
+        Assertions.assertEquals(3, allDataObjects.size());
+
+        Assertions.assertEquals("query-start-query-decide", allDataObjects.get(BasicPersistenceWorkflow.TEST_DATA_OBJECT_KEY));
+
         Assertions.assertEquals("test-value-2", output);
 
         final Map<String, Object> searchAttributes1 = client.getWorkflowSearchAttributes(BasicPersistenceWorkflow.class,

src/test/java/io/iworkflow/integ/persistence/BasicPersistenceWorkflow.java

@@ -5,7 +5,9 @@
 import io.iworkflow.core.persistence.DataObjectDef;
 import io.iworkflow.core.persistence.PersistenceFieldDef;
 import io.iworkflow.core.persistence.SearchAttributeDef;
+import io.iworkflow.gen.models.Context;
 import io.iworkflow.gen.models.SearchAttributeValueType;
+import io.iworkflow.integ.basic.FakContextImpl;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -14,6 +16,9 @@
 @Component
 public class BasicPersistenceWorkflow implements Workflow {
     public static final String TEST_DATA_OBJECT_KEY = "data-obj-1";
+    public static final String TEST_DATA_OBJECT_MODEL_1 = "data-obj-2";
+
+    public static final String TEST_DATA_OBJECT_MODEL_2 = "data-obj-3";
 
     public static final String TEST_SEARCH_ATTRIBUTE_KEYWORD = "CustomKeywordField";
     public static final String TEST_SEARCH_ATTRIBUTE_INT = "CustomIntField";
@@ -27,6 +32,8 @@ public List<StateDef> getStates() {
     public List<PersistenceFieldDef> getPersistenceSchema() {
         return Arrays.asList(
                 DataObjectDef.create(String.class, TEST_DATA_OBJECT_KEY),
+                DataObjectDef.create(Context.class, TEST_DATA_OBJECT_MODEL_1),
+                DataObjectDef.create(FakContextImpl.class, TEST_DATA_OBJECT_MODEL_2),
                 SearchAttributeDef.create(SearchAttributeValueType.INT, TEST_SEARCH_ATTRIBUTE_INT),
                 SearchAttributeDef.create(SearchAttributeValueType.KEYWORD, TEST_SEARCH_ATTRIBUTE_KEYWORD)
         );

src/test/java/io/iworkflow/integ/persistence/BasicPersistenceWorkflowState1.java

@@ -9,10 +9,13 @@
 import io.iworkflow.core.command.CommandResults;
 import io.iworkflow.core.communication.Communication;
 import io.iworkflow.core.persistence.Persistence;
+import io.iworkflow.integ.basic.FakContextImpl;
 
 import java.util.Arrays;
 
 import static io.iworkflow.integ.persistence.BasicPersistenceWorkflow.TEST_DATA_OBJECT_KEY;
+import static io.iworkflow.integ.persistence.BasicPersistenceWorkflow.TEST_DATA_OBJECT_MODEL_1;
+import static io.iworkflow.integ.persistence.BasicPersistenceWorkflow.TEST_DATA_OBJECT_MODEL_2;
 import static io.iworkflow.integ.persistence.BasicPersistenceWorkflow.TEST_SEARCH_ATTRIBUTE_INT;
 import static io.iworkflow.integ.persistence.BasicPersistenceWorkflow.TEST_SEARCH_ATTRIBUTE_KEYWORD;
 
@@ -32,6 +35,15 @@ public Class<String> getInputType() {
     @Override
     public CommandRequest start(Context context, String input, Persistence persistence, final Communication communication) {
         persistence.setDataObject(TEST_DATA_OBJECT_KEY, "query-start");
+
+        // it's allowed to set a child class to a parent
+        persistence.setDataObject(TEST_DATA_OBJECT_MODEL_1, new FakContextImpl());
+        persistence.setDataObject(TEST_DATA_OBJECT_MODEL_1, new io.iworkflow.gen.models.Context());
+
+        // but it's not allowed to set a parent to child
+        //persistence.setDataObject(TEST_DATA_OBJECT_MODEL_2, new io.iworkflow.gen.models.Context());
+        persistence.setDataObject(TEST_DATA_OBJECT_MODEL_2, new FakContextImpl());
+
         persistence.setStateLocal("test-key", "test-value-1");
         persistence.recordStateEvent("event-1", "event-1");
         persistence.recordStateEvent("event-2", "event-1", 2, "event-3");
@@ -44,6 +56,13 @@ public CommandRequest start(Context context, String input, Persistence persisten
     public StateDecision decide(Context context, String input, CommandResults commandResults, Persistence persistence, final Communication communication) {
         String str = persistence.getDataObject(TEST_DATA_OBJECT_KEY, String.class);
         persistence.setDataObject(TEST_DATA_OBJECT_KEY, str + "-query-decide");
+
+        // it's not allowed to assign a parent to child
+        persistence.getDataObject(TEST_DATA_OBJECT_MODEL_1, io.iworkflow.gen.models.Context.class);
+        // but it's allowed to assign child to parent
+        persistence.getDataObject(TEST_DATA_OBJECT_MODEL_2, io.iworkflow.gen.models.Context.class);
+        persistence.getDataObject(TEST_DATA_OBJECT_MODEL_2, FakContextImpl.class);
+
         String testVal2 = persistence.getStateLocal("test-key", String.class);
         if (testVal2.equals("test-value-1")) {
             persistence.setStateLocal("test-key", "test-value-2");