Skip to content

fix: process resource files AND fix: normalize leading slash in DemoSource path values #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paodb merged 2 commits into from
Apr 15, 2026
Merged

fix: process resource files AND fix: normalize leading slash in DemoSource path values #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea97c7
fix: process resource files
javier-godoy Apr 15, 2026
e8f5695
fix: normalize leading slash in DemoSource path values
javier-godoy Apr 15, 2026
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
31 changes: 30 additions & 1 deletion processor/src/main/java/com/flowingcode/vaadin/addons/demo/DemoSourceProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ private AnnotationValue getAnnotationValue(AnnotationMirror annotation, String n

private static final String[] SOURCE_ROOTS = {"src/test/java/", "src/main/java/"};

private static final String[] RESOURCE_ROOTS = {"src/test/resources/", "src/main/resources/"};

private void writeResource() {
int count = collectedPaths.size();
if (count > 0) {
Expand All @@ -228,7 +230,13 @@ private void writeResource() {
Diagnostic.Kind.NOTE,
"Copying " + count + " demo-source " + (count == 1 ? "file" : "files") + " to class output");
}
for (String sourcePath : collectedPaths) {
for (String rawPath : collectedPaths) {
String sourcePath = rawPath.startsWith("/") ? rawPath.substring(1) : rawPath;
// Files under META-INF/resources/ are already packaged into the JAR by Maven's
// resource-processing phase; the processor does not need to copy them.
if (isFromMetaInfResources(sourcePath)) {
continue;
}
try {
FileObject source = openSourceFile(sourcePath);
FileObject resource =
Expand All @@ -248,6 +256,16 @@ private void writeResource() {
}
}

private static boolean isFromMetaInfResources(String normalizedPath) {
for (String root : RESOURCE_ROOTS) {
if (normalizedPath.startsWith(root)) {
String relative = normalizedPath.substring(root.length());
return relative.startsWith("META-INF/resources/") || relative.equals("META-INF/resources");
}
}
return false;
}
Comment thread
paodb marked this conversation as resolved.

private FileObject openSourceFile(String path) throws IOException {
for (String root : SOURCE_ROOTS) {
if (path.startsWith(root)) {
Expand All @@ -256,6 +274,17 @@ private FileObject openSourceFile(String path) throws IOException {
.getResource(StandardLocation.SOURCE_PATH, "", path.substring(root.length()));
}
}
// Resource files (src/test/resources/, src/main/resources/) are copied to CLASS_OUTPUT
// by Maven's process-*-resources phase, which runs before test-compile (and therefore
// before annotation processors). Read them from CLASS_OUTPUT using the path relative to
// the resources root.
for (String root : RESOURCE_ROOTS) {
if (path.startsWith(root)) {
return processingEnv
.getFiler()
.getResource(StandardLocation.CLASS_OUTPUT, "", path.substring(root.length()));
}
}
return processingEnv.getFiler().getResource(StandardLocation.SOURCE_PATH, "", path);
}
}
Loading