From 78e5cc370d0ed218898b193826f6ebbc139cde9d Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sun, 22 Jan 2023 01:18:50 +0100
Subject: [PATCH] Update

---
 .../plugin/classgen/GenNullableX.java         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenNullableX.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenNullableX.java
index dacc512..da48aba 100644
--- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenNullableX.java
+++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenNullableX.java
@@ -85,11 +85,12 @@ public class GenNullableX extends ClassGenerator {
 			throw new UnsupportedOperationException();
 		}
 
+		classBuilder.addField(FieldSpec
+				.builder(type, "NULL").addModifiers(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL).initializer("new $T(null)", type).build());
+
 		if (version.isCurrent()) {
 			classBuilder.addSuperinterfaces(List.of(iNullableITypeClass, iNullableClass, typedNullable));
 
-			classBuilder.addField(FieldSpec.builder(type, "NULL").addModifiers(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL).initializer("new $T(($T)null)", type, baseType).build());
-
 			classBuilder.addMethod(MethodSpec
 					.methodBuilder("of")
 					.addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
@@ -111,13 +112,6 @@ public class GenNullableX extends ClassGenerator {
 					.addStatement("return value != null ? new $T(value) : NULL", type)
 					.build());
 
-			classBuilder.addMethod(MethodSpec
-					.methodBuilder("empty")
-					.addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
-					.returns(type)
-					.addStatement("return NULL")
-					.build());
-
 			classBuilder.addMethod(MethodSpec
 					.methodBuilder("or")
 					.addModifiers(Modifier.PUBLIC, Modifier.FINAL)
@@ -128,6 +122,13 @@ public class GenNullableX extends ClassGenerator {
 					.build());
 		}
 
+		classBuilder.addMethod(MethodSpec
+				.methodBuilder("empty")
+				.addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
+				.returns(type)
+				.addStatement("return NULL")
+				.build());
+
 		classBuilder.addMethod(MethodSpec
 				.methodBuilder("getNullable")
 				.addModifiers(Modifier.PUBLIC, Modifier.FINAL)