Skip to content

Commit aa469c3

Browse files
committed
[Fix #380] SwitchPRoperty to SwitchItem
1 parent 77746af commit aa469c3

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2222
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature;
2323
import io.serverlessworkflow.api.types.CallTask;
24-
import io.serverlessworkflow.api.types.Switch;
24+
import io.serverlessworkflow.api.types.SwitchItem;
2525
import io.serverlessworkflow.api.types.Task;
2626
import io.serverlessworkflow.api.types.TaskItem;
2727

@@ -48,8 +48,8 @@ private static ObjectMapper configure(ObjectMapper mapper) {
4848
simpleModule.addSerializer(CallTask.class, new CallTaskSerializer());
4949
simpleModule.addDeserializer(TaskItem.class, new TaskItemDeserializer());
5050
simpleModule.addSerializer(TaskItem.class, new TaskItemSerializer());
51-
simpleModule.addSerializer(Switch.class, new SwitchSerializer());
52-
simpleModule.addDeserializer(Switch.class, new SwitchDeserializer());
51+
simpleModule.addSerializer(SwitchItem.class, new SwitchItemSerializer());
52+
simpleModule.addDeserializer(SwitchItem.class, new SwitchItemDeserializer());
5353

5454
return mapper
5555
.configure(SerializationFeature.INDENT_OUTPUT, true)

api/src/main/java/io/serverlessworkflow/api/SwitchDeserializer.java renamed to api/src/main/java/io/serverlessworkflow/api/SwitchItemDeserializer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import com.fasterxml.jackson.databind.DeserializationContext;
2020
import com.fasterxml.jackson.databind.JsonDeserializer;
2121
import io.serverlessworkflow.api.types.Switch;
22-
import io.serverlessworkflow.api.types.SwitchProperty;
22+
import io.serverlessworkflow.api.types.SwitchItem;
2323
import java.io.IOException;
2424

25-
class SwitchDeserializer extends JsonDeserializer<Switch> {
25+
class SwitchItemDeserializer extends JsonDeserializer<SwitchItem> {
2626

2727
@Override
28-
public Switch deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
29-
return DeserializeHelper.deserializeItem(p, Switch.class, SwitchProperty.class);
28+
public SwitchItem deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
29+
return DeserializeHelper.deserializeItem(p, SwitchItem.class, Switch.class);
3030
}
3131
}

api/src/main/java/io/serverlessworkflow/api/SwitchSerializer.java renamed to api/src/main/java/io/serverlessworkflow/api/SwitchItemSerializer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
import com.fasterxml.jackson.core.JsonGenerator;
1919
import com.fasterxml.jackson.databind.JsonSerializer;
2020
import com.fasterxml.jackson.databind.SerializerProvider;
21-
import io.serverlessworkflow.api.types.Switch;
21+
import io.serverlessworkflow.api.types.SwitchItem;
2222
import java.io.IOException;
2323

24-
class SwitchSerializer extends JsonSerializer<Switch> {
24+
class SwitchItemSerializer extends JsonSerializer<SwitchItem> {
2525

2626
@Override
27-
public void serialize(Switch value, JsonGenerator gen, SerializerProvider serializers)
27+
public void serialize(SwitchItem value, JsonGenerator gen, SerializerProvider serializers)
2828
throws IOException {
2929
gen.writeStartObject();
30-
gen.writeObjectField(value.getName(), value.getSwitchProperty());
30+
gen.writeObjectField(value.getName(), value.getSwitch());
3131
gen.writeEndObject();
3232
}
3333
}

api/src/main/resources/schema/workflow.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,12 @@ $defs:
569569
minItems: 1
570570
items:
571571
type: object
572+
title: SwitchItem
572573
minProperties: 1
573574
maxProperties: 1
574575
additionalProperties:
575576
type: object
577+
title: Switch
576578
properties:
577579
name:
578580
type: string

0 commit comments

Comments
 (0)