From e59649d353593663e7334b9e4b089328ad21df48 Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Thu, 20 Aug 2020 17:33:19 +0200
Subject: [PATCH] Allow <mvnd.builder.rule> entries to be separated by
 whitespace

---
 .../jboss/fuse/mvnd/builder/SmartBuilder.java | 10 +++++--
 .../fuse/mvnd/builder/SmartBuilderTest.java   | 29 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 daemon/src/test/java/org/jboss/fuse/mvnd/builder/SmartBuilderTest.java

diff --git a/daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java
index 4bc254d7..aa88f9d7 100644
--- a/daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java
+++ b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.enterprise.inject.Default;
 import javax.inject.Inject;
@@ -65,6 +66,7 @@ public class SmartBuilder implements Builder {
     public static final String MVND_BUILDER_RULES_PROVIDER_SCRIPT = "mvnd.builder.rules.provider.script";
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
+    static final Pattern mvndRuleSanitizerPattern = Pattern.compile("[,\\s]+");
 
     private final LifecycleModuleBuilder moduleBuilder;
 
@@ -138,8 +140,12 @@ public class SmartBuilder implements Builder {
 
         session.getAllProjects().forEach(p -> {
             String rule = p.getProperties().getProperty(MVND_BUILDER_RULE);
-            if (rule != null && !rule.trim().isEmpty()) {
-                list.add(rule + " before " + p.getGroupId() + ":" + p.getArtifactId());
+            if (rule != null) {
+                rule = rule.trim();
+                if (!rule.isEmpty()) {
+                    rule = mvndRuleSanitizerPattern.matcher(rule).replaceAll(",");
+                    list.add(rule + " before " + p.getGroupId() + ":" + p.getArtifactId());
+                }
             }
         });
         String rules = null;
diff --git a/daemon/src/test/java/org/jboss/fuse/mvnd/builder/SmartBuilderTest.java b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/SmartBuilderTest.java
new file mode 100644
index 00000000..826fae13
--- /dev/null
+++ b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/SmartBuilderTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.fuse.mvnd.builder;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class SmartBuilderTest {
+
+    @Test
+    void mvndRuleSanitizerPattern() {
+        String actual = SmartBuilder.mvndRuleSanitizerPattern.matcher("foo bar,baz,\n     foo  \n\n  bar\n   ".trim())
+                .replaceAll(",");
+        Assertions.assertEquals("foo,bar,baz,foo,bar", actual);
+    }
+}