[Fix #1333] Fixing WorkflowModelCollection serialization/deserialization

Signed-off-by: fjtirado <ftirados@redhat.com>

Author: fjtirado

experimental/model/src/main/java/io/serverlessworkflow/impl/model/func/JavaModelCollectionMarshaller.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl.model.func;
+
+import io.serverlessworkflow.impl.marshaller.CustomObjectMarshaller;
+import io.serverlessworkflow.impl.marshaller.WorkflowInputBuffer;
+import io.serverlessworkflow.impl.marshaller.WorkflowOutputBuffer;
+import java.util.Collection;
+
+public class JavaModelCollectionMarshaller implements CustomObjectMarshaller<JavaModelCollection> {
+
+  @Override
+  public void write(WorkflowOutputBuffer buffer, JavaModelCollection object) {
+    buffer.writeObject(object.asJavaObject());
+  }
+
+  @Override
+  public JavaModelCollection read(
+      WorkflowInputBuffer buffer, Class<? extends JavaModelCollection> clazz) {
+    return new JavaModelCollection((Collection<?>) buffer.readObject());
+  }
+
+  @Override
+  public Class<JavaModelCollection> getObjectClass() {
+    return JavaModelCollection.class;
+  }
+
+  @Override
+  public int priority() {
+    return Integer.MAX_VALUE;
+  }
+}

experimental/model/src/main/resources/META-INF/services/io.serverlessworkflow.impl.marshaller.CustomObjectMarshaller

@@ -1,2 +1,3 @@
 io.serverlessworkflow.impl.model.func.JavaModelMarshaller
+io.serverlessworkflow.impl.model.func.JavaModelCollectionMarshaller
 io.serverlessworkflow.impl.model.func.SerializableObjectMarshaller

impl/core/src/main/java/io/serverlessworkflow/impl/marshaller/AbstractOutputBuffer.java

@@ -15,6 +15,7 @@
  */
 package io.serverlessworkflow.impl.marshaller;
 
+import io.serverlessworkflow.impl.WorkflowModel;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
@@ -64,6 +65,9 @@ public WorkflowOutputBuffer writeCollection(Collection<Object> col) {
   public WorkflowOutputBuffer writeObject(Object object) {
     if (object == null) {
       writeType(Type.NULL);
+    } else if (object instanceof WorkflowModel model) {
+      writeType(Type.CUSTOM);
+      writeCustomObject(object);
     } else if (object instanceof Short number) {
       writeType(Type.SHORT);
       writeShort(number);

impl/model/src/main/java/io/serverlessworkflow/impl/model/jackson/JacksonModelCollection.java

@@ -16,6 +16,8 @@
 package io.serverlessworkflow.impl.model.jackson;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.serverlessworkflow.impl.CollectionConversionUtils;
 import io.serverlessworkflow.impl.WorkflowModel;
@@ -27,9 +29,11 @@
 import java.util.List;
 import java.util.Optional;
 
+@JsonSerialize(using = JacksonModelCollectionSerializer.class)
+@JsonDeserialize(using = JacksonModelCollectionDeserializer.class)
 public class JacksonModelCollection implements WorkflowModelCollection {
 
-  private ArrayNode node;
+  protected ArrayNode node;
 
   JacksonModelCollection() {
     this.node = JsonUtils.array();

impl/model/src/main/java/io/serverlessworkflow/impl/model/jackson/JacksonModelCollectionDeserializer.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl.model.jackson;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import java.io.IOException;
+
+public class JacksonModelCollectionDeserializer extends StdDeserializer<JacksonModelCollection> {
+
+  private static final long serialVersionUID = 1L;
+
+  protected JacksonModelCollectionDeserializer() {
+    super(JacksonModelCollection.class);
+  }
+
+  @Override
+  public JacksonModelCollection deserialize(JsonParser p, DeserializationContext ctxt)
+      throws IOException, JacksonException {
+    return new JacksonModelCollection(p.readValueAsTree());
+  }
+}

impl/model/src/main/java/io/serverlessworkflow/impl/model/jackson/JacksonModelCollectionMarshaller.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl.model.jackson;
+
+public class JacksonModelCollectionMarshaller
+    extends AbstractJacksonMarshaller<JacksonModelCollection> {
+
+  @Override
+  public Class<JacksonModelCollection> getObjectClass() {
+    return JacksonModelCollection.class;
+  }
+}

impl/model/src/main/java/io/serverlessworkflow/impl/model/jackson/JacksonModelCollectionSerializer.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl.model.jackson;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import java.io.IOException;
+
+public class JacksonModelCollectionSerializer extends StdSerializer<JacksonModelCollection> {
+
+  private static final long serialVersionUID = 1L;
+
+  protected JacksonModelCollectionSerializer() {
+    super(JacksonModelCollection.class);
+  }
+
+  @Override
+  public void serialize(
+      JacksonModelCollection value, JsonGenerator gen, SerializerProvider provider)
+      throws IOException {
+    gen.writeTree(value.node);
+  }
+}

impl/model/src/main/resources/META-INF/services/io.serverlessworkflow.impl.marshaller.CustomObjectMarshaller

@@ -1,2 +1,3 @@
 io.serverlessworkflow.impl.model.jackson.JacksonModelMarshaller
+io.serverlessworkflow.impl.model.jackson.JacksonModelCollectionMarshaller
 io.serverlessworkflow.impl.model.jackson.JacksonObjectMarshaller