[MRESOURCES-284] Support JSON format for parameter filter files

pom.xml

@@ -69,7 +69,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenFilteringVersion>3.2.0</mavenFilteringVersion>
+    <mavenFilteringVersion>3.3.0-SNAPSHOT</mavenFilteringVersion>
     <mavenVersion>3.1.0</mavenVersion>
     <javaVersion>7</javaVersion>
     <project.build.outputTimestamp>2020-08-05T15:25:21Z</project.build.outputTimestamp>
@@ -79,6 +79,10 @@ under the License.
     <contributor>
       <name>Graham Leggett</name>
     </contributor>
+    <contributor>
+      <name>Imad BELMOUJAHID</name>
+      <email>[email protected]</email>
+    </contributor>
   </contributors>
 
   <dependencies>

src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java

@@ -50,7 +50,7 @@
 /**
  * Copy resources for the main source code to the main output directory. Always uses the project.build.resources element
  * to specify the resources to copy.
- *
+ * @author <a href="mailto:[email protected]>Imad BELMOUJAHID</a> @ImadBL
  * @author <a href="[email protected]">Michal Maczka</a>
  * @author <a href="mailto:[email protected]">Jason van Zyl</a>
  * @author Andreas Hoheneder
@@ -208,6 +208,14 @@ public class ResourcesMojo
     @Parameter
     protected LinkedHashSet<String> delimiters;
 
+    /**
+     * This parameter is used in particular for filters properties files with format json.
+     * if this parameter is not empty, we select all the parameters who are the nodes start with this parameter
+     * This helps us to add a ROOT node FOR EACH environment in a same JSON file
+     */
+    @Parameter
+    protected String rootNode;
+
     /**
      * Use default delimiters in addition to custom delimiters, if any.
      *
@@ -349,6 +357,9 @@ public void execute()
             // Handle MRESOURCES-171
             mavenResourcesExecution.setPropertiesEncoding( propertiesEncoding );
 
+            // Set rootNode for new feature with json file ### MRESOURCES-284 ###
+            mavenResourcesExecution.setRootNode( rootNode );
+
             if ( nonFilteredFileExtensions != null )
             {
                 mavenResourcesExecution.setNonFilteredFileExtensions( nonFilteredFileExtensions );

src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java

@@ -24,6 +24,9 @@
 
 import org.apache.maven.shared.filtering.PropertyUtils;
 
+/**
+ * @author <a href="mailto:[email protected]>Imad BELMOUJAHID</a> @ImadBL
+ */
 public class BasicPropertyUtilsTest
     extends AbstractPropertyUtilsTest
 {
@@ -58,41 +61,44 @@ protected File getValidationFile()
 
     /**
      * load property test case can be adjusted by modifying the basic.properties and basic_validation properties
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
      *
      * @throws Exception
      */
     public void testBasicLoadProperty_FF()
         throws Exception
     {
-        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, false, false );
+        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, false, false, null );
 
         assertNotNull( prop );
         assertTrue( validateProperties( prop ) );
     }
 
     /**
      * load property test case can be adjusted by modifying the basic.properties and basic_validation properties
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
      *
      * @throws Exception
      */
     public void testBasicLoadProperty_TF()
         throws Exception
     {
-        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, true, false );
+        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, true, false, null );
 
         assertNotNull( prop );
         assertTrue( validateProperties( prop ) );
     }
 
     /**
      * load property test case can be adjusted by modifying the basic.properties and basic_validation properties
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
      *
      * @throws Exception
      */
     public void testBasicLoadProperty_TT()
         throws Exception
     {
-        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, true, true );
+        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, true, true, null );
 
         validationProp.putAll( System.getProperties() );
         assertNotNull( prop );
@@ -101,13 +107,14 @@ public void testBasicLoadProperty_TT()
 
     /**
      * load property test case can be adjusted by modifying the basic.properties and basic_validation properties
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
      *
      * @throws Exception
      */
     public void testNonExistentProperty()
         throws Exception
     {
-        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, true, true );
+        Properties prop = PropertyUtils.loadPropertyFile( propertyFile, true, true, null );
 
         validationProp.putAll( System.getProperties() );
         assertNotNull( prop );

src/test/java/org/apache/maven/plugins/resources/PropertyUtilsExceptionTest.java

@@ -25,18 +25,22 @@
 import org.apache.maven.shared.filtering.PropertyUtils;
 import org.junit.Test;
 
+/**
+ * @author <a href="mailto:[email protected]>Imad BELMOUJAHID</a> @ImadBL
+ */
 public class PropertyUtilsExceptionTest
 {
 
     /**
      * load property test case can be adjusted by modifying the basic.properties and basic_validation properties
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
      *
      * @throws Exception
      */
     @Test( expected = FileNotFoundException.class )
     public void loadPropertyFileShouldFailWithFileNotFoundException()
         throws Exception
     {
-        PropertyUtils.loadPropertyFile( new File( "NON_EXISTENT_FILE" ), true, true );
+        PropertyUtils.loadPropertyFile( new File( "NON_EXISTENT_FILE" ), true, true, null );
     }
 }