sorting of regex results in pfile

cecom · Dec 27, 2017 · 2195f9a · 2195f9a
1 parent e1c0bbf
commit 2195f9a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/impl/src/main/java/com/geewhiz/pacify/model/utils/PFileResolver.java b/impl/src/main/java/com/geewhiz/pacify/model/utils/PFileResolver.java
@@ -25,6 +25,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import com.geewhiz.pacify.model.PFile;
@@ -74,6 +75,8 @@ private List<PFile> resolveRegEx() {
             result.add(pFile);
         }
 
+        Collections.sort(result);
+
         return result;
     }
 

diff --git a/.../resources/testPreConfigure/correct/archiveWithRegEx/expectedResult/correct-CMFile.pacify b/.../resources/testPreConfigure/correct/archiveWithRegEx/expectedResult/correct-CMFile.pacify
@@ -2,11 +2,11 @@
 <Pacify xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="..\..\..\..\..\..\..\..\model\src\main\resources\pacify.xsd">
     <Archive RelativePath="some.ear">
         <Archive RelativePath="archive1.jar">
-            <File RelativePath="subfolder/archive1_conf2.txt">
+            <File RelativePath="archive1_conf1.txt">
                 <Property Name="foobar2"/>
                 <Property Name="someReference"/>
             </File>
-            <File RelativePath="archive1_conf1.txt">
+            <File RelativePath="subfolder/archive1_conf2.txt">
                 <Property Name="foobar2"/>
                 <Property Name="someReference"/>
             </File>

diff --git a/...resources/testPreConfigure/correct/archiveWithRegEx2/expectedResult/correct-CMFile.pacify b/...resources/testPreConfigure/correct/archiveWithRegEx2/expectedResult/correct-CMFile.pacify
@@ -2,10 +2,10 @@
 <Pacify xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="..\..\..\..\..\..\..\..\model\src\main\resources\pacify.xsd">
     <Archive RelativePath="some.ear">
         <Archive RelativePath="archive1.jar">
-            <File RelativePath="subfolder/archive1_conf2.txt">
+            <File RelativePath="archive1_conf1.txt">
                 <Property Name="wohooo"/>
             </File>
-            <File RelativePath="archive1_conf1.txt">
+            <File RelativePath="subfolder/archive1_conf2.txt">
                 <Property Name="wohooo"/>
             </File>
         </Archive>

diff --git a/model/pom.xml b/model/pom.xml
@@ -40,6 +40,7 @@
                         <arg>-XtoString</arg>
                         <arg>-Xannotate</arg>
                         <arg>-Xcopyable</arg>
+                        <arg>-Xinject-code</arg>
                     </args>
                 </configuration>
                 <executions>

diff --git a/model/src/main/resources/pacify.xjb b/model/src/main/resources/pacify.xjb
@@ -1,7 +1,7 @@
 <jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance" xmlns:annox="http://annox.dev.java.net" jaxb:extensionBindingPrefixes="inheritance xjc annox"
+    xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance" xmlns:annox="http://annox.dev.java.net" jaxb:extensionBindingPrefixes="inheritance xjc annox" xmlns:ci="http://jaxb.dev.java.net/plugin/code-injector"
     jaxb:version="2.1">
-    >
+
     <jaxb:bindings schemaLocation="pacify.xsd" node="/xsd:schema">
 
         <jaxb:globalBindings>
@@ -30,7 +30,16 @@
 
         <jaxb:bindings node="xsd:complexType[@name='PFile']">
             <inheritance:extends>PFileBase</inheritance:extends>
+            <inheritance:implements><![CDATA[java.lang.Comparable<PFile>]]></inheritance:implements>
+            <ci:code>  
+	            <![CDATA[         
+					public int compareTo(PFile other) {
+					    return getRelativePath().compareTo(other.getRelativePath());
+					}
+				]]>
+            </ci:code>
         </jaxb:bindings>
+
         <jaxb:bindings node="xsd:complexType[@name='PFile']/*/xsd:element[@name='Property']">
             <jaxb:property name="PProperties" />
         </jaxb:bindings>