Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

group 'com.formkiq'
version '1.5.0'
version '1.5.1'

dependencies {
annotationProcessor group: 'com.google.auto.service', name: 'auto-service', version: '1.1.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.MirroredTypeException;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
import javax.tools.FileObject;
import javax.tools.StandardLocation;
Expand Down Expand Up @@ -194,7 +195,7 @@ private String getClassNameByType(final Element element) {
result = result.getEnclosingElement();
}

className = te.getQualifiedName().toString();
className = getBinaryName(te);

if (!simpleNames.isEmpty()) {
String e = element.getEnclosingElement().toString();
Expand All @@ -210,6 +211,11 @@ private String getClassNameByType(final Element element) {
return className;
}

public String getBinaryName(final TypeElement typeElement) {
Elements elements = processingEnv.getElementUtils();
return elements.getBinaryName(typeElement).toString();
}

/**
* Get {@link Reflect}.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,48 @@ public record TestRecord(String name) {}
assertEquals(Boolean.TRUE, map.get(0).get("allDeclaredFields"));
}

/**
* test nested java record.
*
* @throws IOException IOException
*/
@Test
public void testNestedRecordAnnotations() throws IOException {
JavaFileObject recordSource = JavaFileObjects.forSourceString("com.example.TestRecord", """
package com.example;

import com.formkiq.graalvm.annotations.Reflectable;

@Reflectable
public record TestRecord(String name) {
@Reflectable
public record NestedTestRecord(String name) {
}
}
""");
Compilation compilation =
javac().withProcessors(new GraalvmReflectAnnontationProcessor()).compile(recordSource);

List<Map<String, Object>> map = getReflectConf(compilation, "com.example");

assertEquals(2, map.size());
assertEquals("com.example.TestRecord", map.get(0).get("name"));
assertEquals(Boolean.TRUE, map.get(0).get("allPublicConstructors"));
assertEquals(Boolean.TRUE, map.get(0).get("allPublicMethods"));
assertEquals(Boolean.TRUE, map.get(0).get("allPublicFields"));
assertEquals(Boolean.FALSE, map.get(0).get("allDeclaredConstructors"));
assertEquals(Boolean.TRUE, map.get(0).get("allDeclaredMethods"));
assertEquals(Boolean.TRUE, map.get(0).get("allDeclaredFields"));

assertEquals("com.example.TestRecord$NestedTestRecord", map.get(1).get("name"));
assertEquals(Boolean.TRUE, map.get(0).get("allPublicConstructors"));
assertEquals(Boolean.TRUE, map.get(0).get("allPublicMethods"));
assertEquals(Boolean.TRUE, map.get(0).get("allPublicFields"));
assertEquals(Boolean.FALSE, map.get(0).get("allDeclaredConstructors"));
assertEquals(Boolean.TRUE, map.get(0).get("allDeclaredMethods"));
assertEquals(Boolean.TRUE, map.get(0).get("allDeclaredFields"));
}

/**
* test java record.
*
Expand Down