Skip to content

Commit 6bcc668

Browse files
committed
[Fix #379] Generating serializers/deserializers
Signed-off-by: Francisco Javier Tirado Sarti <[email protected]>
1 parent 6a02d21 commit 6bcc668

14 files changed

+185
-318
lines changed

api/src/main/java/io/serverlessworkflow/api/CallTaskDeserializer.java

-38
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/CallTaskSerializer.java

-30
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java

+1-17
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,8 @@
1717

1818
import com.fasterxml.jackson.databind.ObjectMapper;
1919
import com.fasterxml.jackson.databind.SerializationFeature;
20-
import com.fasterxml.jackson.databind.module.SimpleModule;
2120
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2221
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature;
23-
import io.serverlessworkflow.api.types.CallTask;
24-
import io.serverlessworkflow.api.types.SwitchItem;
25-
import io.serverlessworkflow.api.types.Task;
26-
import io.serverlessworkflow.api.types.TaskItem;
2722

2823
class ObjectMapperFactory {
2924

@@ -41,21 +36,10 @@ public static final ObjectMapper yamlMapper() {
4136
}
4237

4338
private static ObjectMapper configure(ObjectMapper mapper) {
44-
SimpleModule simpleModule = new SimpleModule();
45-
simpleModule.addDeserializer(Task.class, new TaskDeserializer());
46-
simpleModule.addSerializer(Task.class, new TaskSerializer());
47-
simpleModule.addDeserializer(CallTask.class, new CallTaskDeserializer());
48-
simpleModule.addSerializer(CallTask.class, new CallTaskSerializer());
49-
simpleModule.addDeserializer(TaskItem.class, new TaskItemDeserializer());
50-
simpleModule.addSerializer(TaskItem.class, new TaskItemSerializer());
51-
simpleModule.addSerializer(SwitchItem.class, new SwitchItemSerializer());
52-
simpleModule.addDeserializer(SwitchItem.class, new SwitchItemDeserializer());
53-
5439
return mapper
5540
.configure(SerializationFeature.INDENT_OUTPUT, true)
5641
.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false)
57-
.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false)
58-
.registerModule(simpleModule);
42+
.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false);
5943
}
6044

6145
private ObjectMapperFactory() {}

api/src/main/java/io/serverlessworkflow/api/SwitchItemDeserializer.java

-31
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/SwitchItemSerializer.java

-33
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/TaskDeserializer.java

-58
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/TaskItemDeserializer.java

-31
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/TaskItemSerializer.java

-33
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/TaskSerializer.java

-31
This file was deleted.

api/src/main/java/io/serverlessworkflow/api/DeserializeHelper.java renamed to api/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.api;
16+
package io.serverlessworkflow.serialization;
1717

1818
import com.fasterxml.jackson.core.JsonParser;
1919
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -27,7 +27,8 @@ public class DeserializeHelper {
2727
public static <T> T deserializeOneOf(
2828
JsonParser p, Class<T> targetClass, Collection<Class<?>> unionTypes) throws IOException {
2929
TreeNode node = p.readValueAsTree();
30-
JsonProcessingException ex = new JsonMappingException("Problem deserializing " + targetClass);
30+
JsonProcessingException ex =
31+
new JsonMappingException(p, "Problem deserializing " + targetClass);
3132
for (Class<?> unionType : unionTypes) {
3233
try {
3334
Object object = p.getCodec().treeToValue(node, unionType);

api/src/main/java/io/serverlessworkflow/api/SerializeHelper.java renamed to api/src/main/java/io/serverlessworkflow/serialization/SerializeHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.serverlessworkflow.api;
16+
package io.serverlessworkflow.serialization;
1717

1818
import com.fasterxml.jackson.core.JsonGenerator;
1919
import java.io.IOException;

0 commit comments

Comments
 (0)