WINDUP-504: XmlFile.inFile(***) is a ParameterizedPattern, not a Regex

windup · Feb 12, 2015 · 7198477 · 7198477
1 parent c20c34a
commit 7198477
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 39 deletions.
diff --git a/rules-xml/src/main/java/org/jboss/windup/rules/apps/xml/condition/XmlFile.java b/rules-xml/src/main/java/org/jboss/windup/rules/apps/xml/condition/XmlFile.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathExpression;
@@ -74,13 +75,14 @@ public class XmlFile extends ParameterizedGraphCondition implements XmlFileDTD,X
     private String xpathString;
     private XPathExpression compiledXPath;
     private Map<String, String> namespaces = new HashMap<>();
-    private String fileName;
     private String publicId;
     private String xpathResultMatch;
 
     // just to extract required parameter names
     private RegexParameterizedPatternParser xpathPattern;
 
+    private RegexParameterizedPatternParser fileNamePattern;
+
     public void setXpathResultMatch(String xpathResultMatch)
     {
         this.xpathResultMatch = xpathResultMatch;
@@ -146,7 +148,7 @@ public ConditionBuilder as(String variable)
      */
     public XmlFileIn inFile(String fileName)
     {
-        this.fileName = fileName;
+        this.fileNamePattern = new RegexParameterizedPatternParser(fileName);
         return this;
     }
 
@@ -164,9 +166,9 @@ public XPathExpression getXPathExpression()
         return compiledXPath;
     }
 
-    public String getInFile()
+    public RegexParameterizedPatternParser getInFilePattern()
     {
-        return fileName;
+        return fileNamePattern;
     }
 
     public String getPublicId()
@@ -331,9 +333,13 @@ else if (iterated instanceof XmlFileModel)
                             + ")");
             }
 
-            if (fileName != null && !fileName.equals(""))
+            if (fileNamePattern != null)
             {
-                if (!xml.getFileName().matches(fileName))
+                final ParameterStore store = DefaultParameterStore.getInstance(context);
+                Pattern compiledPattern = fileNamePattern.getCompiledPattern(store);
+                String pattern = compiledPattern.pattern();
+                String fileName = xml.getFileName();
+                if (!fileName.matches(pattern))
                 {
                     continue;
                 }
@@ -444,9 +450,9 @@ public String toString()
         {
             builder.append(".matches(" + xpathString + ")");
         }
-        if (fileName != null)
+        if (fileNamePattern != null)
         {
-            builder.append(".inFile(" + fileName + ")");
+            builder.append(".inFile(" + fileNamePattern.toString() + ")");
         }
         if (publicId != null)
         {

diff --git a/rules-xml/src/main/java/org/jboss/windup/rules/apps/xml/confighandler/XmlFileHandler.java b/rules-xml/src/main/java/org/jboss/windup/rules/apps/xml/confighandler/XmlFileHandler.java
@@ -74,7 +74,9 @@ public XmlFile processElement(ParserContext handlerManager, Element element)
         {
             xmlFile.namespace(nsMapping.getKey(), nsMapping.getValue());
         }
-        xmlFile.inFile(inFile);
+        if(inFile !=null) {
+            xmlFile.inFile(inFile);
+        }
         xmlFile.as(as);
         return (XmlFile)xmlFile;
     }

diff --git a/.../main/resources/legacy/org.jboss.windup.rules.apps.xml.legacy.XmlKnowHowConfig.windup.xml b/.../main/resources/legacy/org.jboss.windup.rules.apps.xml.legacy.XmlKnowHowConfig.windup.xml
@@ -3,7 +3,7 @@
     <rules>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasource/@pool-name" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//datasource/@pool-name" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -15,7 +15,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasource/@jndi-name" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//datasource/@jndi-name" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -27,7 +27,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasource/@jta" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//datasource/@jta" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -39,7 +39,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasource/@spy" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//datasource/@spy" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -51,7 +51,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasource/@use-ccm" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//datasource/@use-ccm" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -63,7 +63,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//connection-url" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//connection-url" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -75,7 +75,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//driver-class" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//driver-class" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -87,7 +87,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//new-connection-sql" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//new-connection-sql" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -99,7 +99,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//min-pool-size" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//min-pool-size" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -111,7 +111,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//max-pool-size" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//max-pool-size" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -123,7 +123,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//prefill" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//prefill" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -135,7 +135,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//use-strict-min" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//use-strict-min" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -147,7 +147,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//transaction-isolation" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//transaction-isolation" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -159,7 +159,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//flush-strategy" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//flush-strategy" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -171,7 +171,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//user-name" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//user-name" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -183,7 +183,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//password" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//password" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -195,7 +195,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//background-validation" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//background-validation" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -207,7 +207,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//use-fast-fail" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//use-fast-fail" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -219,7 +219,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//idle-timeout-minutes" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//idle-timeout-minutes" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -231,7 +231,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//xa-resource-timeout" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//xa-resource-timeout" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -243,7 +243,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//track-statements" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//track-statements" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -255,7 +255,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//prepared-statement-cache-size" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//prepared-statement-cache-size" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -267,7 +267,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//check-valid-connection-sql" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//check-valid-connection-sql" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -279,7 +279,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//validate-on-match" in=".*ds-eap6.xml">
+                <xmlfile as="default" matches="//validate-on-match" in="{*}ds-eap6.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -291,7 +291,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:postgres')]" in=".*-ds.xml">
+                <xmlfile as="default" matches="//datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:postgres')]" in="{*}-ds.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -303,7 +303,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:oracle')]" in=".*-ds.xml">
+                <xmlfile as="default" matches="//datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:oracle')]" in="{*}-ds.xml">
                 </xmlfile>
             </when>
             <perform>
@@ -315,7 +315,7 @@
         </rule>
         <rule>
             <when>
-                <xmlfile as="default" matches="//datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:sqlserver')]" in=".*-ds.xml">
+                <xmlfile as="default" matches="//datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:sqlserver')]" in="{*}-ds.xml">
                 </xmlfile>
             </when>
             <perform>

diff --git a/rules-xml/src/test/java/org/jboss/windup/rules/xml/handlers/unit/XmlFileHandlerTest.java b/rules-xml/src/test/java/org/jboss/windup/rules/xml/handlers/unit/XmlFileHandlerTest.java
@@ -77,15 +77,15 @@ public void testXmlFileCondition() throws Exception
         // verify xmlfile
         Assert.assertEquals(null, xmlFile.getInputVariablesName());
         Assert.assertEquals("public", xmlFile.getPublicId());
-        Assert.assertEquals(".*", xmlFile.getInFile());
+        Assert.assertEquals("{*}", xmlFile.getInFilePattern().getPattern());
         Assert.assertEquals("/abc:project", xmlFile.getXpathString());
 
         Element secondXmlFile = xmlFileList.get(1);
         xmlFile = parser.<XmlFile> processElement(secondXmlFile);
         // verify xmlfile
         Assert.assertEquals(null, xmlFile.getInputVariablesName());
         Assert.assertEquals("public", xmlFile.getPublicId());
-        Assert.assertEquals(null, xmlFile.getInFile());
+        Assert.assertEquals(null, xmlFile.getInFilePattern());
         Assert.assertEquals(null, xmlFile.getXpathString());
     }
 
@@ -103,4 +103,4 @@ public void testXmlFileWithoutPublidIdAndXpath() throws Exception
         Element thirdXmlFile = xmlFileList.get(2);
         XmlFile xmlFile = parser.<XmlFile> processElement(thirdXmlFile);
     }
-}
+}