Skip to content

Commit 66fce36

Browse files
authored
Merge pull request #80 from uber/format101
Fixing format for converter files
2 parents 2a2d0d5 + 2de5aa6 commit 66fce36

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

src/main/java/com/uber/cadence/samples/spring/cadence/CadenceDataConverter.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22

33
import com.google.gson.TypeAdapterFactory;
44
import com.uber.cadence.converter.JsonDataConverter;
5-
65
import java.time.ZonedDateTime;
76
import java.util.ServiceLoader;
87

98
// This singleton JsonDataConverter should be universally used in all components that require a
109
// JsonDataConverter. Specifically in Cadence's case, WorkflowClient uses Json serialize function
1110
// and Worker uses deserialize function, therefore they have to match with one another.
1211
public class CadenceDataConverter {
13-
public static JsonDataConverter cadenceJsonDataConverter() {
14-
return new JsonDataConverter(
15-
gsonBuilder -> {
16-
for (TypeAdapterFactory factory : ServiceLoader.load(TypeAdapterFactory.class)) {
17-
gsonBuilder.registerTypeAdapterFactory(factory);
18-
}
19-
return gsonBuilder.registerTypeAdapter(ZonedDateTime.class, new ZonedDatetimeConverter());
20-
});
21-
}
12+
public static JsonDataConverter cadenceJsonDataConverter() {
13+
return new JsonDataConverter(
14+
gsonBuilder -> {
15+
for (TypeAdapterFactory factory : ServiceLoader.load(TypeAdapterFactory.class)) {
16+
gsonBuilder.registerTypeAdapterFactory(factory);
17+
}
18+
return gsonBuilder.registerTypeAdapter(ZonedDateTime.class, new ZonedDatetimeConverter());
19+
});
20+
}
2221
}
Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
package com.uber.cadence.samples.spring.cadence;
22

3-
import com.google.gson.JsonSerializer;
3+
import com.google.gson.JsonDeserializationContext;
44
import com.google.gson.JsonDeserializer;
55
import com.google.gson.JsonElement;
6-
import com.google.gson.JsonSerializationContext;
7-
import com.google.gson.JsonPrimitive;
8-
import com.google.gson.JsonDeserializationContext;
96
import com.google.gson.JsonParseException;
10-
7+
import com.google.gson.JsonPrimitive;
8+
import com.google.gson.JsonSerializationContext;
9+
import com.google.gson.JsonSerializer;
1110
import java.lang.reflect.Type;
1211
import java.time.ZonedDateTime;
1312
import java.time.format.DateTimeFormatter;
1413

15-
public class ZonedDatetimeConverter implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
16-
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_DATE_TIME;
14+
public class ZonedDatetimeConverter
15+
implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
16+
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_DATE_TIME;
1717

18-
@Override
19-
public JsonElement serialize(ZonedDateTime src, Type type, JsonSerializationContext jsonSerializationContext) {
20-
return new JsonPrimitive(FORMATTER.format(src));
21-
}
18+
@Override
19+
public JsonElement serialize(
20+
ZonedDateTime src, Type type, JsonSerializationContext jsonSerializationContext) {
21+
return new JsonPrimitive(FORMATTER.format(src));
22+
}
2223

23-
@Override
24-
public ZonedDateTime deserialize(JsonElement json, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
25-
return FORMATTER.parse(json.getAsString(), ZonedDateTime::from);
26-
}
24+
@Override
25+
public ZonedDateTime deserialize(
26+
JsonElement json, Type type, JsonDeserializationContext jsonDeserializationContext)
27+
throws JsonParseException {
28+
return FORMATTER.parse(json.getAsString(), ZonedDateTime::from);
29+
}
2730
}

0 commit comments

Comments
 (0)