Skip to content

Various Gradle fixes #8875

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
merged 2 commits into from
Oct 3, 2025
Merged

Various Gradle fixes #8875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbe86a2
Gradle JavaEE/JakartaEE support might yield null for webAppDir, this …
matthiasblaesing Sep 30, 2025
a19a70f
GradleTestProgressListener: Handle situation where source dir is repo…
matthiasblaesing Sep 30, 2025
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
8 changes: 7 additions & 1 deletion ...e/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/WebProjectWebRootProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.netbeans.modules.gradle.javaee.web;

import java.io.File;
import org.netbeans.modules.gradle.api.NbGradleProject;
import org.netbeans.modules.gradle.javaee.api.GradleWebProject;
import java.util.Collection;
Expand Down Expand Up @@ -56,6 +57,11 @@ public Collection<FileObject> getWebRoots() {

FileObject getDefaultWebRoot() {
GradleWebProject wp = GradleWebProject.get(project);
return wp != null ? FileUtil.toFileObject(wp.getWebAppDir()) : null;
if(wp != null && wp.getWebAppDir() != null) {
File normalizedFile = FileUtil.normalizeFile(wp.getWebAppDir());
return FileUtil.toFileObject(normalizedFile);
} else {
return null;
}
}
}
10 changes: 8 additions & 2 deletions java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,17 +355,23 @@ private String searchLocation(Testcase tc, String className, String methodName,
.values()
.stream()
.flatMap(gradleJavaSourceSet -> gradleJavaSourceSet.getSourceDirs(SourceType.JAVA).stream())
.distinct()
.collect(
Collectors.toMap(
f -> ClasspathInfo.create(f),
f -> f.toPath()
f -> f.toPath(),
// Should not happen, each path is only considered once (see distinct() before)
// in any case this would catch it
(f1, f2) -> f1
)
);
}

String relativePath = null;
for (Map.Entry<ClasspathInfo, Path> ci : classpathInfo.entrySet()) {
if (ci.getKey() == null) continue;
if (ci.getKey() == null) {
continue;
}
FileObject fo = SourceUtils.getFile(ElementHandle.createTypeElementHandle(ElementKind.CLASS, className), ci.getKey());
if (fo != null) {
relativePath = ci.getValue().relativize(FileUtil.toFile(fo).toPath()).toString();
Expand Down