(maven-mvnd) branch mvnd-1.x updated: Backport of "Default value must be handled" (#1000)

[cstamas]

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a commit to branch mvnd-1.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git


The following commit(s) were added to refs/heads/mvnd-1.x by this push:
     new 62ac4196 Backport of "Default value must be handled" (#1000)
62ac4196 is described below

commit 62ac4196f978d93eb7984a363750ce0bf0883d9f
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed May 22 16:37:49 2024 +0200

    Backport of "Default value must be handled" (#1000)
    
    Default must be manually handled, i missed this.
    
    Fixes #912
    
    Backport of #953 to mvnd-1.x
---
 .../java/org/mvndaemon/mvnd/client/DaemonParameters.java  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java 
b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index fae56a80..31a784ac 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@ -490,16 +490,21 @@ public class DaemonParameters {
 
     private static List<CoreExtension> 
filterCoreExtensions(List<CoreExtension> coreExtensions) {
         Set<String> exclusions = new HashSet<>();
-        String exclusionsString =
-                
systemProperty(Environment.MVND_CORE_EXTENSIONS_EXCLUDE).asString();
+        String exclusionsString = 
systemProperty(Environment.MVND_CORE_EXTENSIONS_EXCLUDE)
+                .orDefault()
+                .asString();
         if (exclusionsString != null) {
             exclusions.addAll(Arrays.stream(exclusionsString.split(","))
                     .filter(e -> e != null && !e.trim().isEmpty())
                     .collect(Collectors.toList()));
         }
-        return coreExtensions.stream()
-                .filter(e -> !exclusions.contains(e.getGroupId() + ":" + 
e.getArtifactId()))
-                .collect(Collectors.toList());
+        if (!exclusions.isEmpty()) {
+            return coreExtensions.stream()
+                    .filter(e -> !exclusions.contains(e.getGroupId() + ":" + 
e.getArtifactId()))
+                    .collect(Collectors.toList());
+        } else {
+            return coreExtensions;
+        }
     }
 
     private static Properties loadProperties(Path path) {