support for jspecify @nullable annotations with TYPE_USE

Author: angryziber

.idea/compiler.xml

@@ -89,6 +89,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
     testImplementation 'org.assertj:assertj-core:3.15.0'
     testImplementation 'org.jetbrains:annotations:20.1.0'
+    testImplementation 'org.jspecify:jspecify:1.0.0'
     testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.1'
 
     implementation 'com.beust:jcommander:1.78'

build.gradle

@@ -139,9 +139,9 @@ else if (annotationName.equals("JsonProperty")) {
 
     fieldBuffer.append(propertyName);
 
-    if (!nonRuntimeAnnotations.isEmpty()) {
-      for (var annotation : nonRuntimeAnnotations.getOrDefault(method.getName(), emptyList()))
-        if (annotation.contains("Nullable;")) fieldBuffer.append("?");
+    if (nonRuntimeAnnotations.getOrDefault(method.getName(), emptyList()).stream().anyMatch(a -> a.contains("Nullable;")) ||
+        stream(method.getAnnotatedReturnType().getAnnotations()).anyMatch(a -> a.annotationType().getSimpleName().equals("Nullable"))) {
+      fieldBuffer.append("?");
     }
 
     var type = method.getReturnType();

src/main/java/jvm2dts/Converter.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Retention;
@@ -54,7 +53,7 @@ void wrapperTypes() {
       "double?: number; " +
       "float?: number; " +
       "integer: number; " +
-      "long: number; " +
+      "long?: number; " +
       "optional?: string;" +
       "}");
   }
@@ -111,9 +110,9 @@ interface WrapperTypes {
   Byte getAByte();
   Short getAShort();
   Integer getInteger();
-  Long getLong();
   Boolean isBoolean();
-  @Nullable Float getFloat();
+  @org.jspecify.annotations.Nullable Long getLong();
+  @org.jetbrains.annotations.Nullable Float getFloat();
   @ClassConverterTest.Nullable Double getDouble();
   Optional<String> getOptional();
 }