From 04d682af54d8828ebbf2731ca5bb919230af77b1 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 22 Feb 2026 22:19:34 -0500 Subject: [PATCH 1/4] Avoid Split Packages when importing --- .../validation/generator/AdapterName.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java index fcc6a9b4..afef2f18 100644 --- a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java +++ b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java @@ -1,9 +1,19 @@ package io.avaje.validation.generator; +import java.util.Optional; + +import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; final class AdapterName { + static final String IMPORTED_PKG = + Optional.ofNullable(APContext.getProjectModuleElement()) + .map(Element::getEnclosedElements) + .map(l -> l.get(0).getSimpleName().toString()) + .orElse("unknown") + + ".valid"; + final String shortName; final String adapterPackage; final String fullName; @@ -23,8 +33,7 @@ final class AdapterName { if (pkgPrivate || "".equals(originPackage)) { this.adapterPackage = originPackage; } else { - this.adapterPackage = - ProcessingContext.isImported(type) ? originPackage + ".valid" : originPackage; + this.adapterPackage = ProcessingContext.isImported(type) ? IMPORTED_PKG : originPackage; } this.fullName = adapterPackage.isBlank() @@ -51,4 +60,9 @@ String adapterPackage() { String fullName() { return fullName; } + + static String importedPkg() { + return APContext.getProjectModuleElement().getEnclosedElements().get(0).getSimpleName() + + ".valid"; + } } From c7dd3a64e141a3b96dd176f0ae6fa2e2fd8dd103 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Mon, 23 Feb 2026 04:14:37 +0000 Subject: [PATCH 2/4] Remove unused static method importedPkg Removed the static method 'importedPkg' from AdapterName. --- .../main/java/io/avaje/validation/generator/AdapterName.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java index afef2f18..ed37ceda 100644 --- a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java +++ b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java @@ -60,9 +60,4 @@ String adapterPackage() { String fullName() { return fullName; } - - static String importedPkg() { - return APContext.getProjectModuleElement().getEnclosedElements().get(0).getSimpleName() - + ".valid"; - } } From 5f985920cd6d0c3305f41a617aa1dbc483827424 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Mon, 23 Feb 2026 03:07:19 -0500 Subject: [PATCH 3/4] Update AdapterName.java --- .../src/main/java/io/avaje/validation/generator/AdapterName.java | 1 + 1 file changed, 1 insertion(+) diff --git a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java index ed37ceda..dc84e628 100644 --- a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java +++ b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java @@ -9,6 +9,7 @@ final class AdapterName { static final String IMPORTED_PKG = Optional.ofNullable(APContext.getProjectModuleElement()) + .filter(m -> !m.isUnnamed()) .map(Element::getEnclosedElements) .map(l -> l.get(0).getSimpleName().toString()) .orElse("unknown") From cb234b1127f56e0b8660e0eb322fd13c358980ed Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Tue, 24 Feb 2026 11:32:46 -0500 Subject: [PATCH 4/4] Update AdapterName.java --- .../validation/generator/AdapterName.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java index dc84e628..9c8f1165 100644 --- a/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java +++ b/validator-generator/src/main/java/io/avaje/validation/generator/AdapterName.java @@ -7,14 +7,6 @@ final class AdapterName { - static final String IMPORTED_PKG = - Optional.ofNullable(APContext.getProjectModuleElement()) - .filter(m -> !m.isUnnamed()) - .map(Element::getEnclosedElements) - .map(l -> l.get(0).getSimpleName().toString()) - .orElse("unknown") - + ".valid"; - final String shortName; final String adapterPackage; final String fullName; @@ -34,7 +26,8 @@ final class AdapterName { if (pkgPrivate || "".equals(originPackage)) { this.adapterPackage = originPackage; } else { - this.adapterPackage = ProcessingContext.isImported(type) ? IMPORTED_PKG : originPackage; + this.adapterPackage = + ProcessingContext.isImported(type) ? importedPkg(originPackage) : originPackage; } this.fullName = adapterPackage.isBlank() @@ -61,4 +54,13 @@ String adapterPackage() { String fullName() { return fullName; } + + private static String importedPkg(String originPackage) { + return Optional.ofNullable(APContext.getProjectModuleElement()) + .filter(m -> !m.isUnnamed()) + .map(Element::getEnclosedElements) + .map(l -> l.get(0).getSimpleName().toString()) + .orElse(originPackage) + + ".valid"; + } }