[sling-slingfeature-maven-plugin] branch master updated: SLING-8829 : Provide a configuration to provide an alternative api region name for the api jar

[cz...@apache.org]

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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new c4babbf  SLING-8829 : Provide a configuration to provide an alternative api region name for the api jar
c4babbf is described below

commit c4babbf32112e9a1c2f0a3b4bcbc90012f9f562f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Nov 7 08:14:35 2019 +0100

    SLING-8829 : Provide a configuration to provide an alternative api region name for the api jar
---
 .../apache/sling/feature/maven/mojos/ApisJarMojo.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index 2472044..cfc6c32 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -30,6 +30,7 @@ import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -197,6 +198,9 @@ public class ApisJarMojo extends AbstractIncludingFeatureMojo implements Artifac
     @Parameter(defaultValue = "true")
     private boolean attachApiJars;
 
+    @Parameter
+    private Map<String, String> apiRegionNameMappings;
+
     @Parameter(defaultValue = "${project.build.directory}/apis-jars", readonly = true)
     private File mainOutputDir;
 
@@ -234,6 +238,19 @@ public class ApisJarMojo extends AbstractIncludingFeatureMojo implements Artifac
         }
     }
 
+    /**
+     * Apply region name mapping if configured
+     *
+     * @param regionName The region name
+     * @return The mapped name or the original name
+     */
+    private String mapApiRegionName(final String regionName) {
+        if (this.apiRegionNameMappings != null && this.apiRegionNameMappings.containsKey(regionName)) {
+            return this.apiRegionNameMappings.get(regionName);
+        }
+        return regionName;
+    }
+
     private ArtifactProvider createArtifactProvider() {
         return new ArtifactProvider() {
 
@@ -1107,7 +1124,7 @@ public class ApisJarMojo extends AbstractIncludingFeatureMojo implements Artifac
             classifierBuilder.append(featureId.getClassifier())
                              .append('-');
         }
-        String finalClassifier = classifierBuilder.append(apiRegion.getName())
+        String finalClassifier = classifierBuilder.append(mapApiRegionName(apiRegion.getName()))
                                                   .append('-')
                                                   .append(classifier)
                                                   .toString();