Skip to content

Commit ad2e966

Browse files
authored
Fix NPE in JSON type adapter (#43)
- Adds null-check to type adapter - Updates Gradle version Resolves #41 {patch}
1 parent 228b2d7 commit ad2e966

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

.github/workflows/gradle-test-main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
branches: [ main ]
1010
paths:
1111
- 'gradle/libs.versions.toml'
12+
- 'gradle/wrapper/gradle-wrapper.properties'
1213

1314
permissions: read-all
1415

.github/workflows/gradle.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
- 'renovate.json'
2121
- '.whitesource'
2222
- 'gradle/libs.versions.toml'
23+
- 'gradle/wrapper/gradle-wrapper.properties'
2324

2425
permissions: read-all
2526

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# suppress inspection "SpellCheckingInspection" for whole file
22
# suppress inspection "UnusedProperty" for whole file
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
44
distributionBase=GRADLE_USER_HOME
55
distributionPath=wrapper/dists
66
zipStorePath=wrapper/dists

mission-control/src/main/java/com/github/nagyesta/abortmission/core/telemetry/LocalDateTimeAdapter.java

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,23 @@ public class LocalDateTimeAdapter extends TypeAdapter<LocalDateTime> {
2525

2626
@Override
2727
public void write(final JsonWriter out, final LocalDateTime value) throws IOException {
28-
out.beginObject()
29-
.name(DATE).beginObject()
30-
.name(YEAR).value(value.getYear())
31-
.name(MONTH).value(value.getMonthValue())
32-
.name(DAY).value(value.getDayOfMonth())
33-
.endObject()
34-
.name(TIME).beginObject()
35-
.name(HOUR).value(value.getHour())
36-
.name(MINUTE).value(value.getMinute())
37-
.name(SECOND).value(value.getSecond())
38-
.name(NANO).value(value.getNano())
39-
.endObject()
40-
.endObject();
28+
if (value == null) {
29+
out.nullValue();
30+
} else {
31+
out.beginObject()
32+
.name(DATE).beginObject()
33+
.name(YEAR).value(value.getYear())
34+
.name(MONTH).value(value.getMonthValue())
35+
.name(DAY).value(value.getDayOfMonth())
36+
.endObject()
37+
.name(TIME).beginObject()
38+
.name(HOUR).value(value.getHour())
39+
.name(MINUTE).value(value.getMinute())
40+
.name(SECOND).value(value.getSecond())
41+
.name(NANO).value(value.getNano())
42+
.endObject()
43+
.endObject();
44+
}
4145
}
4246

4347
@Override

0 commit comments

Comments
 (0)