Skip to content

Add PluginPropertyUtilsTest test case and fix malformed pom data #9792

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
mbien merged 1 commit into from
Nov 13, 2026
Merged

Add PluginPropertyUtilsTest test case and fix malformed pom data #9792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions java/maven/src/org/netbeans/modules/maven/api/PluginPropertyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,17 @@ private PluginPropertyUtils() {
* @param expressionProperty expression property that once defined (and plugin configuration is omitted) is used. only value, no ${}
*/
public static @CheckForNull String getPluginProperty(@NonNull Project prj, @NonNull String groupId, @NonNull String artifactId, @NonNull String parameter, @NullAllowed String goal, @NullAllowed String expressionProperty) {
NbMavenProjectImpl project = prj instanceof NbMavenProjectImpl ? (NbMavenProjectImpl)prj : prj.getLookup().lookup(NbMavenProjectImpl.class);
NbMavenProjectImpl project = prj instanceof NbMavenProjectImpl nbp
? nbp : prj.getLookup().lookup(NbMavenProjectImpl.class);
assert project != null : "Requires a maven project instance"; //NOI18N
return getPluginPropertyImpl(project.getOriginalMavenProject(), groupId, artifactId, simpleProperty(parameter), goal, simpleDefaultProperty(expressionProperty));
return getPluginPropertyImpl(
project.getOriginalMavenProject(),
groupId,
artifactId,
simpleProperty(parameter),
goal,
simpleDefaultProperty(expressionProperty)
);
}

/**
Expand Down
55 changes: 28 additions & 27 deletions java/maven/src/org/netbeans/modules/maven/modelcache/MavenProjectCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,14 @@ public final class MavenProjectCache {
private static final String ATTR_IGNORE_ON_LOAD = "ignoreOnModelLoad"; // NOI18N

//File is referenced during lifetime of the Project. FileObject cannot be used as with rename it changes value@!!!
private static final Map<File, WeakReference<MavenProject>> file2Project = new WeakHashMap<File, WeakReference<MavenProject>>();
private static final Map<File, Mutex> file2Mutex = new WeakHashMap<File, Mutex>();
private static final Map<File, WeakReference<MavenProject>> file2Project = new WeakHashMap<>();
private static final Map<File, Mutex> file2Mutex = new WeakHashMap<>();

public static void clearMavenProject(final File pomFile) {
Mutex mutex = getMutex(pomFile);
mutex.writeAccess(new Action<MavenProject>() {
@Override
public MavenProject run() {
file2Project.remove(pomFile);
return null;
}
mutex.writeAccess(() -> {
file2Project.remove(pomFile);
return null;
});
}

Expand Down Expand Up @@ -152,7 +149,7 @@ public MavenProject run() {
}
}
MavenProject mp = loadOriginalMavenProject(pomFile);
file2Project.put(pomFile, new WeakReference<MavenProject>(mp));
file2Project.put(pomFile, new WeakReference<>(mp));
return mp;
}
});
Expand Down Expand Up @@ -196,16 +193,18 @@ public static long getLoadTimestamp(MavenProject p) {
* @param p project
* @return set of placeholder artifacts.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public static Collection<Artifact> getPlaceholderArtifacts(MavenProject p) {
Object o = p.getContextValue(CONTEXT_PLACEHOLDER_ARTIFACTS);
return o instanceof Collection ? (Collection)o : Collections.emptySet();
return o instanceof Collection c ? c : Collections.emptySet();
}

/**
* list of class names of build participants in the project, null when none are present.
* @param project
* @return
*/
@SuppressWarnings("unchecked")
public static Collection<String> getUnknownBuildParticipantsClassNames(MavenProject project) {
return (Collection<String>) project.getContextValue(CONTEXT_PARTICIPANTS);
}
Expand Down Expand Up @@ -235,11 +234,16 @@ public static MavenProject loadOriginalMavenProjectInternal(MavenEmbedder projec
long startLoading = System.currentTimeMillis();

try {
res = NbArtifactFixer.collectPlaceholderArtifacts(() -> projectEmbedder.readProjectWithDependencies(req, true), (c) ->
c.forEach(a -> {
// artifact fixer only injects POMs.
placeholders.add(projectEmbedder.createArtifactWithClassifier(a.getGroupId(), a.getArtifactId(), a.getVersion(), a.getExtension(), a.getClassifier())); // NOI18N
}
res = NbArtifactFixer.collectPlaceholderArtifacts(
() -> projectEmbedder.readProjectWithDependencies(req, true),
set -> set.forEach(a -> {
// artifact fixer only injects POMs.
placeholders.add(
projectEmbedder.createArtifactWithClassifier(
a.getGroupId(), a.getArtifactId(), a.getVersion(), a.getExtension(), a.getClassifier()
)
);
}
));
newproject = res.getProject();

Expand Down Expand Up @@ -346,8 +350,8 @@ public static MavenProject loadOriginalMavenProjectInternal(MavenEmbedder projec
active = config.getActiveConfiguration();
if (ctx != null && ctx.getConfiguration() != null) {
ProjectConfiguration cfg = ctx.getConfiguration();
if (cfg instanceof M2Configuration) {
active = (M2Configuration)cfg;
if (cfg instanceof M2Configuration m2c) {
active = m2c;
}
}

Expand Down Expand Up @@ -464,14 +468,11 @@ public static MavenProject getFallbackProject(MavenExecutionResult result, File
MavenProject partial = null;

for (Throwable t : result.getExceptions()) {
if (t instanceof ProjectBuildingException) {
ProjectBuildingException pbe = (ProjectBuildingException)t;
if (pbe.getResults() != null) {
for (ProjectBuildingResult res : pbe.getResults()) {
if (projectFile.equals(res.getPomFile())) {
partial = res.getProject();
break;
}
if (t instanceof ProjectBuildingException pbe && pbe.getResults() != null) {
for (ProjectBuildingResult res : pbe.getResults()) {
if (projectFile.equals(res.getPomFile())) {
partial = res.getProject();
break;
}
}
}
Expand Down Expand Up @@ -515,8 +516,8 @@ public static boolean isFallbackproject(MavenProject prj) {

public static MavenProject getPartialProject(MavenProject prj) {
Object o = prj.getContextValue(CONTEXT_PARTIAL_PROJECT);
if (o instanceof MavenProject) {
return (MavenProject)o;
if (o instanceof MavenProject mavenProject) {
return mavenProject;
} else {
return null;
}
Expand Down
56 changes: 56 additions & 0 deletions java/maven/test/unit/src/org/netbeans/modules/maven/api/PluginPropertyUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.test.TestFileUtils;

@SuppressWarnings("null")
public class PluginPropertyUtilsTest extends NbTestCase {

public PluginPropertyUtilsTest(String name) {
Expand Down Expand Up @@ -304,6 +305,61 @@ public void testGetCompilerArgs() throws Exception {
assertEquals("[--enable-preview]", Arrays.toString(PluginPropertyUtils.getPluginPropertyList(ProjectManager.getDefault().findProject(d), "org.apache.maven.plugins", "maven-compiler-plugin", "compilerArgs", "arg", null)));
}

// same as in MavenSourceLevelImplTest but more direct
public void testTestSourceLevel() throws Exception {
TestFileUtils.writeFile(d, "pom.xml",
"""
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
<artifactId>prj</artifactId>
<version>1.0</version>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.4</source>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.2</source>
</configuration>
<executions>
<execution>
<id>test-compile-java5</id>
<goals>
<goal>testCompile</goal>
</goals>
<configuration>
<source>1.6</source>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
""");
Project project = ProjectManager.getDefault().findProject(d);
String value = PluginPropertyUtils.getPluginProperty(
project,
"org.apache.maven.plugins",
"maven-compiler-plugin",
"source",
"testCompile",
null
);
assertEquals("1.6", value);
}

public void testDependencyListBuilder() throws Exception {
String testPom =
"""
Expand Down
2 changes: 1 addition & 1 deletion java/maven/test/unit/src/org/netbeans/modules/maven/classpath/ClassPathProviderImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ public void testArchetypeResources() throws Exception { // #189037
<modelVersion>4.0.0</modelVersion>
<groupId>g</groupId>
<artifactId>a</artifactId>
<!-- unloadable during a test: "<packaging>maven-archetype</packaging> -->"
<!-- unloadable during a test: "<packaging>maven-archetype</packaging>" -->
<version>0</version>
</project>
"""
Expand Down
17 changes: 7 additions & 10 deletions ...maven/test/unit/src/org/netbeans/modules/maven/queries/MavenReloadImplementationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.nio.file.attribute.FileTime;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.concurrent.CompletableFuture;
Expand All @@ -36,9 +35,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.text.Document;
import org.apache.maven.project.MavenProject;
Expand All @@ -60,7 +56,6 @@
import org.netbeans.modules.project.dependency.ProjectReload.Quality;
import org.netbeans.modules.project.dependency.ProjectReload.StateRequest;
import org.netbeans.modules.project.dependency.reload.ProjectReloadInternal;
import org.netbeans.modules.project.dependency.reload.Reloader;
import org.netbeans.modules.project.dependency.spi.ProjectReloadImplementation;
import org.netbeans.modules.project.dependency.spi.ProjectReloadImplementation.ProjectStateData;
import org.netbeans.spi.project.ActionProgress;
Expand Down Expand Up @@ -128,12 +123,14 @@ private static File getTestNBDestDir() {

loggers.add(Logger.getLogger(ProjectReloadInternal.class.getName()));
loggers.add(Logger.getLogger(Reloader.class.getName()));
loggers.add(Logger.getLogger(MavenProjectCache.class.getName()));
loggers.forEach(logger -> {
logger.setLevel(Level.FINER);
logger.setLevel(java.util.logging.Level.FINER);

ConsoleHandler h = new ConsoleHandler();
h.setLevel(Level.FINER);
if (!Arrays.asList(logger.getHandlers()).stream().anyMatch(x -> x instanceof ConsoleHandler)) {
java.util.logging.ConsoleHandler h = new java.util.logging.ConsoleHandler();
h.setFormatter(new org.netbeans.core.startup.logging.NbFormatter());
h.setLevel(java.util.logging.Level.FINER);
if (java.util.stream.Stream.of(logger.getHandlers()).noneMatch(x -> x instanceof java.util.logging.ConsoleHandler)) {
logger.addHandler(h);
}
});
Expand Down Expand Up @@ -957,7 +954,7 @@ public void testUnresolvableArtifactAppears() throws Exception {
assertEquals(Quality.RESOLVED, ps.getQuality());

oci.getProjectDirectory().getFileObject("pom.xml").delete();
FileObject newPom = FileUtil.copyFile(testApp.getFileObject("oci/pom_add_artifact.xml"), oci.getProjectDirectory(), "pom");
FileUtil.copyFile(testApp.getFileObject("oci/pom_add_artifact.xml"), oci.getProjectDirectory(), "pom");

// now the project state should be just LOADED, as a new artifact has apepared:
ProjectState ps2 = ProjectReload.withProjectState(oci, ProjectReload.StateRequest.refresh()).get();
Expand Down
16 changes: 9 additions & 7 deletions java/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenSourceLevelImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,15 @@ public void testTestSourceLevel() throws Exception { // e.g. org.apache.felix.co
<version>1.0</version>
<build>
<pluginManagement>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.4</source>
</configuration>
</plugin>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.4</source>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
Expand Down