fix(jdk-codemodel): resolve module when building TypeName in visitDeclared (#53)

Author: deer

jdk-codemodel/src/main/java/build/codemodel/jdk/JdkInitializer.java

@@ -889,8 +889,7 @@ public Lazy<TypeUsage> visitArray(final ArrayType t, final Lazy<TypeUsage> lazy)
             @Override
             public Lazy<TypeUsage> visitDeclared(final DeclaredType t, final Lazy<TypeUsage> lazy) {
                 final var typeElement = (TypeElement) t.asElement();
-                final var fqn = typeElement.getQualifiedName().toString();
-                final var typeName = nameProvider.getTypeName(Optional.empty(), fqn);
+                final var typeName = resolveTypeName(typeElement);
 
                 if (typeElement.getTypeParameters().isEmpty()) {
                     final var usage = SpecificTypeUsage.of(codeModel, typeName);

jdk-codemodel/src/test/java/build/codemodel/jdk/FieldDiscoveryTests.java

@@ -40,8 +40,9 @@ public class Discover {
         assertThat(typeDescriptor.traits(MethodDescriptor.class)).isEmpty();
         assertThat(typeDescriptor.traits(FieldDescriptor.class)).hasSize(4);
 
-        // All fields are String
-        final var stringTypeName = naming.getTypeName(Optional.empty(), "java.lang.String");
+        // All fields are String — type names are resolved with their JPMS module
+        final var javaBase = naming.getModuleName("java.base");
+        final var stringTypeName = naming.getTypeName(javaBase, "java.lang.String");
         assertThat(typeDescriptor.traits(FieldDescriptor.class)
             .map(FieldDescriptor::type)
             .filter(NamedTypeUsage.class::isInstance)

jdk-codemodel/src/test/java/build/codemodel/jdk/GenericsDiscoveryTests.java

@@ -172,6 +172,38 @@ public class Discoverable<T extends Number & Comparable<T>> {
         assertThat(boundNames).anyMatch(name -> name.contains("Comparable"));
     }
 
+    @Test
+    void genericTypeNameShouldIncludeModule() {
+        // Regression: visitDeclared was constructing TypeNames with Optional.empty() module,
+        // causing generic raw types to not match descriptors registered with a JPMS module.
+        final var source = JavaFileObjects.forSourceString("build.codemodel.jdk.example.Wrapper", """
+            package build.codemodel.jdk.example;
+            import java.util.List;
+            public class Wrapper {
+                public List<String> items;
+            }
+            """);
+        final var codeModel = JdkInitializerTests.runInternal(
+            new JdkInitializer(List.of(), List.of(), List.of(source)));
+
+        final var naming = codeModel.getNameProvider();
+        final var typeName = naming.getTypeName(Optional.empty(), "build.codemodel.jdk.example.Wrapper");
+        final var field = codeModel.getTypeDescriptor(typeName).orElseThrow()
+            .traits(FieldDescriptor.class).findFirst().orElseThrow();
+
+        final var generic = (GenericTypeUsage) field.type();
+
+        // The raw type must carry the java.base module
+        final var javaBase = naming.getModuleName("java.base");
+        final var expectedListName = naming.getTypeName(javaBase, "java.util.List");
+        assertThat(generic.typeName()).isEqualTo(expectedListName);
+
+        // The type argument (String) must also carry java.base
+        final var stringArg = (NamedTypeUsage) generic.parameters().findFirst().orElseThrow();
+        final var expectedStringName = naming.getTypeName(javaBase, "java.lang.String");
+        assertThat(stringArg.typeName()).isEqualTo(expectedStringName);
+    }
+
     @Test
     void shouldDiscoverGenericMethodTypeParameter() {
         final var source = JavaFileObjects.forSourceString("Discoverable", """