Support Default Package (#347)

Author: SentryMan

pom.xml

@@ -28,7 +28,7 @@
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <maven.compiler.release>17</maven.compiler.release>
     <inject.version>12.1-RC6</inject.version>
-    <spi.version>2.13</spi.version>
+    <spi.version>2.14-RC1</spi.version>
     <project.build.outputTimestamp>2025-12-01T15:48:59Z</project.build.outputTimestamp>
   </properties>
 

validator-generator/pom.xml

@@ -13,7 +13,7 @@
   <name>validator generator</name>
   <description>annotation processor generating validation adapters</description>
   <properties>
-    <avaje.prisms.version>2.0-RC1</avaje.prisms.version>
+    <avaje.prisms.version>2.0-RC2</avaje.prisms.version>
     <io.jstach.version>1.3.7</io.jstach.version>
   </properties>
 

validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java

@@ -20,15 +20,16 @@ final class AdapterName {
     String originPackage = APContext.elements().getPackageOf(type).getQualifiedName().toString();
     var name = shortName(type);
     shortName = name.substring(0, name.length() - 1);
-    if (pkgPrivate) {
+    if (pkgPrivate || "".equals(originPackage)) {
       this.adapterPackage = originPackage;
-    } else if ("".equals(originPackage)) {
-      this.adapterPackage = "valid";
     } else {
       this.adapterPackage =
           ProcessingContext.isImported(type) ? originPackage + ".valid" : originPackage;
     }
-    this.fullName = adapterPackage + "." + shortName + "ValidationAdapter";
+    this.fullName =
+      adapterPackage.isBlank()
+        ? shortName + "ValidationAdapter"
+        : adapterPackage + "." + shortName + "ValidationAdapter";
   }
 
   private String shortName(TypeElement origin) {

validator-generator/src/main/java/io/avaje/validation/generator/ComponentMetaData.java

@@ -47,13 +47,24 @@ String fullName(boolean pkgPrivate) {
         adapter.getQualifiedName().toString().transform(types::add);
       }
       String topPackage = TopPackage.of(types);
-      if (!topPackage.endsWith(".valid") && !pkgPrivate) {
+      var defaultPackage =
+        !topPackage.contains(".")
+          && APContext.getProjectModuleElement().isUnnamed()
+          && APContext.elements().getPackageElement(topPackage) == null;
+
+      if (!defaultPackage && !pkgPrivate && !topPackage.endsWith(".valid")) {
         topPackage += ".valid";
       }
-      fullName =
-          pkgPrivate
-              ? topPackage + "." + name(topPackage) + "ValidatorComponent"
-              : topPackage + ".GeneratedValidatorComponent";
+
+      if (defaultPackage) {
+        fullName = "GeneratedValidatorComponent";
+      } else if (pkgPrivate) {
+        fullName = topPackage + "." + name(topPackage) + "ValidatorComponent";
+      } else if (APContext.isTestCompilation()) {
+        fullName = topPackage + ".TestValidatorComponent";
+      } else {
+        fullName = topPackage + ".GeneratedValidatorComponent";
+      }
     }
     return fullName;
   }

validator-generator/src/main/java/io/avaje/validation/generator/SimpleAdapterWriter.java

@@ -107,6 +107,8 @@ private void writeImports() {
   }
 
   private void writePackage() {
-    writer.append("package %s;", adapterPackage).eol().eol();
+    if (!adapterPackage.isBlank()) {
+      writer.append("package %s;", adapterPackage).eol().eol();
+    }
   }
 }

validator-generator/src/main/java/io/avaje/validation/generator/SimpleComponentWriter.java

@@ -25,7 +25,7 @@ final class SimpleComponentWriter {
 
   void initialise(boolean pkgPrivate) throws IOException {
     fullName = metaData.fullName(pkgPrivate);
-    packageName = ProcessorUtils.packageOf(fullName);
+    packageName = "GeneratedValidatorComponent".equals(fullName) ? "" : ProcessorUtils.packageOf(fullName);
     if (fileObject == null) {
       fileObject = createSourceFile(fullName);
     }

validator-generator/src/main/java/io/avaje/validation/generator/Util.java

@@ -54,7 +54,7 @@ && importDifferentPackage(type, packageName)
   }
 
   private static boolean importDifferentPackage(String type, String packageName) {
-    return type.replace(packageName + '.', "").indexOf('.') > 0;
+    return packageName.isBlank() || type.replace(packageName + '.', "").indexOf('.') > 0;
   }
 
   private static boolean importJavaLangSubpackage(String type) {