Skip to content

Commit 1cb65b4

Browse files
Merge pull request #390 from fjtirado/Fix_#379
2 parents 6a02d21 + 9ebcdbe commit 1cb65b4

15 files changed

+292
-394
lines changed

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

Lines changed: 0 additions & 38 deletions
This file was deleted.

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

Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Lines changed: 1 addition & 17 deletions
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

Lines changed: 0 additions & 31 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 58 deletions
This file was deleted.

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

Lines changed: 0 additions & 31 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 31 deletions
This file was deleted.

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

Lines changed: 3 additions & 2 deletions
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);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy