test that custom Nullable annotation works on both classes and records

Author: angryziber

src/main/java/jvm2dts/Converter.java

@@ -114,7 +114,7 @@ static boolean isLikeGetter(String methodName) {
     return (methodName.startsWith("get") || methodName.startsWith("is")) && !methodName.equals("getClass");
   }
 
-  private void processProperty(String propertyName, Method method, StringBuilder out, Map<String, List<String>> classAnnotations) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+  private void processProperty(String propertyName, Method method, StringBuilder out, Map<String, List<String>> methodAnnotations) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
     var fieldBuffer = new StringBuilder();
 
     if (propertyName == null) return;
@@ -139,8 +139,8 @@ else if (annotationName.equals("JsonProperty")) {
 
     fieldBuffer.append(propertyName);
 
-    if (!classAnnotations.isEmpty())
-      for (var annotation : classAnnotations.getOrDefault(method.getName(), emptyList()))
+    if (!methodAnnotations.isEmpty())
+      for (var annotation : methodAnnotations.getOrDefault(method.getName(), emptyList()))
         if (annotation.contains("Nullable;"))
           fieldBuffer.append("?");
 
@@ -247,7 +247,7 @@ public ClassAnnotationExtractor(Map<String, List<String>> annotations) {
     }
 
     @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-      if (!isPublic(access) || !isLikeGetter(name)) return null;
+      if (!isPublic(access)) return null;
       return new MethodAnnotationExtractor(annotations.computeIfAbsent(name, k -> new ArrayList<>()));
     }
   }

src/test/java/jvm2dts/ClassConverterTest.java

@@ -5,10 +5,12 @@
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
+import java.lang.annotation.Retention;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -75,18 +77,22 @@ void realClass() {
   @Test
   void record() {
     assertThat(converter.convert(Record.class)).isEqualTo("interface Record {" +
-      "isCool: boolean; " +
-      "hello: string; " +
-      "\"@key\": string; " +
       "notIncluded: boolean; " +
-      "world: string;}");
+      "\"@key\": string; " +
+      "hello: string; " +
+      "world?: string; " +
+      "isCool: boolean;" +
+      "}");
   }
 
   @Test
   void emptyTypes() {
     assertThat(converter.convert(Empty.class)).isNull();
     assertThat(converter.convert(OnlyPrivate.class)).isNull();
   }
+
+  @Retention(RUNTIME)
+  @interface Nullable {}
 }
 
 @SuppressWarnings("unused")
@@ -108,7 +114,7 @@ interface WrapperTypes {
   Long getLong();
   Boolean isBoolean();
   @Nullable Float getFloat();
-  @Nullable Double getDouble();
+  @ClassConverterTest.Nullable Double getDouble();
   Optional<String> getOptional();
 }
 
@@ -159,7 +165,7 @@ interface AnyId {
   Object getId();
 }
 
-record Record(String hello, String world, boolean isCool) {
+record Record(String hello, @ClassConverterTest.Nullable String world, boolean isCool) {
   @JsonProperty public boolean notIncluded() { return false; }
   @JsonProperty("@key") public String key() { return ""; }
 }