Merge pull request #19 from aloubyansky/optional-paths-template

Optional paths template

Author: aloubyansky

patch-gen-maven-plugin/pom.xml

@@ -20,23 +20,19 @@
             <artifactId>patch-gen</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-shared-utils</artifactId>
-            <version>3.1.0</version>
         </dependency>
     </dependencies>
 

patch-gen/src/main/java/org/jboss/as/patching/generator/PatchBuilderWrapper.java

@@ -353,7 +353,7 @@ static ModificationCondition getCondition(FSPathElement optionalPaths, Distribut
 
     static List<String> matchOptionalPath(FSPathElement root, DistributionContentItem item) {
         if(item.getParent() == null || item.getParent().name == null) {
-            final FSPathElement dir = root.children.get(item.getName());
+            final FSPathElement dir = root.getMatchingElement(item.getName());
             if(dir != null) {
                 root.linkTo(dir);
                 return Collections.emptyList();
@@ -367,7 +367,7 @@ static List<String> matchOptionalPath(FSPathElement root, DistributionContentIte
         if(root.children.isEmpty()) {
             return path;
         }
-        final FSPathElement dir = root.children.get(item.getName());
+        final FSPathElement dir = root.getMatchingElement(item.getName());
         if(dir != null) {
             switch(path.size()) {
                 case 0:
@@ -386,6 +386,7 @@ static List<String> matchOptionalPath(FSPathElement root, DistributionContentIte
 
     private static final class FSPathElement {
         private String name;
+        private boolean containsWildcard;
         private Map<String, FSPathElement> children = Collections.emptyMap();
         private String[] requires;
 
@@ -395,17 +396,35 @@ private static final class FSPathElement {
 
         FSPathElement(FSPathElement parent, String name) {
             assert name != null : "name is null";
-            this.name = name;
+            containsWildcard = name.charAt(name.length() - 1) == '*';
+            this.name = containsWildcard ? name.substring(0, name.length() - 1) : name;
             if(parent != null) {
                 parent.addChild(this);
             }
         }
 
         FSPathElement(FSPathElement linkTo) {
+        	containsWildcard = linkTo.containsWildcard;
             name = linkTo.name;
             children = linkTo.children;
         }
 
+        FSPathElement getMatchingElement(String targetName) {
+        	for(FSPathElement child : children.values()) {
+        		if(child.matches(targetName)) {
+        			return child;
+        		}
+        	}
+        	return null;
+        }
+        
+        boolean matches(String targetName) {
+        	if(containsWildcard) {
+        		return targetName.startsWith(name);
+        	}
+    		return name.equals(targetName);
+        }
+        
         FSPathElement addChild(String... names) {
             FSPathElement parent = this;
             FSPathElement child = null;
@@ -453,6 +472,7 @@ private void toString(StringBuilder buf, int depth) {
         }
 
         void linkTo(FSPathElement dir) {
+        	this.containsWildcard = dir.containsWildcard;
             this.name = dir.name;
             this.children = dir.children;
             this.requires = dir.requires;

patch-gen/src/main/java/org/jboss/as/patching/generator/PatchGenerator.java

@@ -41,6 +41,7 @@
 import org.jboss.as.patching.ZipUtils;
 import org.jboss.as.patching.logging.PatchLogger;
 import org.jboss.as.patching.metadata.Patch;
+import org.jboss.as.patching.metadata.PatchMerger;
 import org.jboss.as.version.ProductConfig;
 import org.jboss.modules.Module;