From 43358ee2998058ad559de8dd4d2e47717eea3161 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 27 Apr 2021 00:59:11 +0200 Subject: [PATCH] Bugfix --- .../java/it/cavallium/data/generator/SourcesGenerator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/it/cavallium/data/generator/SourcesGenerator.java b/src/main/java/it/cavallium/data/generator/SourcesGenerator.java index 3efeac6..7ad9a8f 100644 --- a/src/main/java/it/cavallium/data/generator/SourcesGenerator.java +++ b/src/main/java/it/cavallium/data/generator/SourcesGenerator.java @@ -2353,7 +2353,8 @@ public class SourcesGenerator { var oldIType = ClassName.get(joinPackage(versionPackage, "data"), "IType"); deserializeMethod.addStatement("$T.requireNonNull(value)", Objects.class); deserializeMethod.addStatement("var content = value.$$getNullable()"); - deserializeMethod.addStatement("var newContent = ($T) $T.upgradeToNextVersion(($T) content)", + deserializeMethod.addStatement("var newContent = content == null ? null : $T.requireNonNull(($T) $T.upgradeToNextVersion(($T) content))", + ClassName.get(Objects.class), toGenericType, oldVersionType, oldIBasicType @@ -2391,7 +2392,8 @@ public class SourcesGenerator { var oldIType = ClassName.get(joinPackage(versionPackage, "data"), "IType"); deserializeMethod.addStatement("$T.requireNonNull(value)", Objects.class); deserializeMethod.addStatement("var content = value.$$getNullable()"); - deserializeMethod.addStatement("var newContent = ($T) $T.upgradeToNextVersion(($T) content)", + deserializeMethod.addStatement("var newContent = content == null ? null : $T.requireNonNull(($T) $T.upgradeToNextVersion(($T) content))", + ClassName.get(Objects.class), toBasicType, oldVersionType, oldIBasicType