From 778c621ddb07d55e7fe136594f42193741b2d01f Mon Sep 17 00:00:00 2001
From: imad <imad.a2@gmail.com>
Date: Tue, 26 Apr 2022 01:22:31 +0200
Subject: [PATCH 1/3] Support JSON format for parameter filter files
 #MRESOURCES-284

---
 pom.xml                                       |  10 +
 .../AbstractMavenFilteringRequest.java        |  21 ++
 .../maven/shared/filtering/BaseFilter.java    |  13 +-
 .../filtering/MavenResourcesExecution.java    |  51 ++++-
 .../shared/filtering/PropertiesJson.java      | 185 ++++++++++++++++++
 .../maven/shared/filtering/PropertyUtils.java |  44 ++++-
 .../filtering/DefaultMavenFileFilterTest.java |  16 +-
 .../DefaultMavenResourcesFilteringTest.java   |  36 ++--
 .../shared/filtering/PropertyUtilsTest.java   |  77 +++++++-
 9 files changed, 416 insertions(+), 37 deletions(-)
 create mode 100644 src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java

diff --git a/pom.xml b/pom.xml
index 12434295..c0dff56a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,11 @@
     <contributor>
       <name>Graham Leggett</name>
     </contributor>
+    <contributor>
+      <url>@ImadBL</url>
+      <name>Imad BELMOUJAHID</name>
+      <email>belmoujahid.i@gmail.com</email>
+    </contributor>
   </contributors>
 
   <dependencies>
@@ -95,6 +100,11 @@
       <artifactId>maven-shared-utils</artifactId>
       <version>3.3.4</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.2.2</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
diff --git a/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java b/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
index 0b10ab81..5afacebb 100644
--- a/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
@@ -28,6 +28,7 @@
 import org.apache.maven.project.MavenProject;
 
 /**
+ * @author <a href="mailto:BELMOUJAHID.I@Gmail.Com>Imad BELMOUJAHID</a> @ImadBL
  * @since 1.0-beta-3
  */
 public class AbstractMavenFilteringRequest
@@ -35,6 +36,8 @@ public class AbstractMavenFilteringRequest
 
     private MavenProject mavenProject;
 
+    private String rootNode;
+
     private List<String> filters;
 
     private boolean escapeWindowsPaths = true;
@@ -172,6 +175,24 @@ public void setFileFilters( List<String> paramfilters )
         setFilters( paramfilters );
     }
 
+    /**
+     * get RootNode
+     * @return String using with json file
+     */
+    public String getRootNode()
+    {
+        return rootNode;
+    }
+
+    /**
+     * set RootNode
+     * @param rootNode String using with json file
+     */
+    public void setRootNode( String rootNode )
+    {
+        this.rootNode = rootNode;
+    }
+
     /**
      * @since 1.0-beta-3
      * @return true if escape is activated false otherwise.
diff --git a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
index be8908fc..9d670d31 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -46,6 +46,9 @@
 import org.codehaus.plexus.interpolation.multi.MultiDelimiterStringSearchInterpolator;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
+/**
+ * @author <a href="mailto:BELMOUJAHID.I@Gmail.Com>Imad BELMOUJAHID</a> @ImadBL
+ */
 class BaseFilter
     extends AbstractLogEnabled
     implements DefaultFilterInfo
@@ -120,7 +123,7 @@ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final AbstractMav
 
         File basedir = request.getMavenProject() != null ? request.getMavenProject().getBasedir() : new File( "." );
 
-        loadProperties( filterProperties, basedir, request.getFileFilters(), baseProps );
+        loadProperties( filterProperties, basedir, request.getFileFilters(), baseProps, request.getRootNode() );
         if ( filterProperties.size() < 1 )
         {
             filterProperties.putAll( baseProps );
@@ -138,7 +141,7 @@ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final AbstractMav
                     buildFilters.removeAll( request.getFileFilters() );
                 }
 
-                loadProperties( filterProperties, basedir, buildFilters, baseProps );
+                loadProperties( filterProperties, basedir, buildFilters, baseProps, request.getRootNode() );
             }
 
             // Project properties
@@ -182,10 +185,11 @@ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final AbstractMav
     }
 
     /**
+     * UseRootThisNode this parameter is null (used only for JSON files) for more information ### MRESOURCES-284 ###
      * default visibility only for testing reason !
      */
     void loadProperties( Properties filterProperties, File basedir, List<String> propertiesFilePaths,
-                         Properties baseProps )
+                         Properties baseProps, String rootNode )
                              throws MavenFilteringException
     {
         if ( propertiesFilePaths != null )
@@ -203,7 +207,8 @@ void loadProperties( Properties filterProperties, File basedir, List<String> pro
                 try
                 {
                     File propFile = FileUtils.resolveFile( basedir, filterFile );
-                    Properties properties = PropertyUtils.loadPropertyFile( propFile, workProperties, getLogger() );
+                    Properties properties = PropertyUtils.loadPropertyFile( propFile, workProperties, getLogger(),
+                            rootNode );
                     filterProperties.putAll( properties );
                     workProperties.putAll( properties );
                 }
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
index 449e405b..287db33a 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
@@ -34,7 +34,7 @@
 
 /**
  * A bean to configure a resources filtering execution.
- *
+ * @author <a href="mailto:BELMOUJAHID.I@Gmail.Com>Imad BELMOUJAHID</a> @ImadBL
  * @author Olivier Lamy
  */
 public class MavenResourcesExecution
@@ -118,6 +118,11 @@ public class MavenResourcesExecution
      */
     private boolean flatten = false;
 
+    /**
+     * rootNode
+     */
+    private String rootNode;
+
     /**
      * Do nothing.
      */
@@ -126,6 +131,32 @@ public MavenResourcesExecution()
         // no op
     }
 
+    /**
+     *
+     * @param resources The list of resources.
+     * @param outputDirectory The output directory.
+     * @param mavenProject The maven project.
+     * @param encoding The given encoding.
+     * @param fileFilters The file filters.
+     * @param nonFilteredFileExtensions The extensions which should not being filtered.
+     * @param mavenSession The maven session.
+     * @param rootNode param used for json files
+     */
+    public MavenResourcesExecution( List<Resource> resources, File outputDirectory, MavenProject mavenProject,
+                                    String encoding, List<String> fileFilters, List<String> nonFilteredFileExtensions,
+                                    MavenSession mavenSession, String rootNode )
+    {
+        super( mavenProject, fileFilters, mavenSession );
+        this.encoding = encoding;
+        this.resources = resources;
+        this.outputDirectory = outputDirectory;
+        this.nonFilteredFileExtensions = nonFilteredFileExtensions;
+        this.useDefaultFilterWrappers = true;
+        this.addDefaultExcludes = true;
+        this.resourcesBaseDirectory = mavenProject.getBasedir();
+        this.rootNode = rootNode;
+    }
+
     /**
      * As we use a Maven project <code>useDefaultFilterWrappers</code> will be set to <code>true</code>. The
      * {@code useDefaultExcludes} is set to {@code true}.
@@ -320,6 +351,24 @@ public Reader getReader( Reader reader )
         } );
     }
 
+    /**
+     * get RootNode
+     * @return
+     */
+    public String getRootNode()
+    {
+        return rootNode;
+    }
+
+    /**
+     * set rootNode
+     * @param rootNode
+     */
+    public void setRootNode( String rootNode )
+    {
+        this.rootNode = rootNode;
+    }
+
     /**
      * @return The resource base directory.
      */
diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java b/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
new file mode 100644
index 00000000..08631fc9
--- /dev/null
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
@@ -0,0 +1,185 @@
+package org.apache.maven.shared.filtering;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * I added this class to support JSON files MRESOURCES-284
+ * @author <a href="mailto:belmoujahid.i@gmail.com">Imad BELMOUJAHID</a> @ImadBL
+ */
+public class PropertiesJson
+{
+    /**
+     * properties
+     */
+    private final Properties properties;
+
+    /**
+     * default constructor
+     */
+    public PropertiesJson ()
+    {
+        properties = new Properties ();
+    }
+
+    /**
+     *
+     * @return properties
+     */
+    public Properties getProperties ()
+    {
+        return properties;
+    }
+
+    /**
+     *
+     * @param fr
+     * @param useThisRoot
+     * @throws IOException
+     */
+    public void load ( File fr, String useThisRoot )
+            throws IOException
+    {
+        try ( FileReader reader = new FileReader ( fr ) )
+        {
+            for ( Map.Entry<String, String> e
+                    : getPropertiesFromString( IOUtils.toString( reader ), useThisRoot ).entrySet( ) )
+            {
+
+                this.properties.put ( e.getKey (), e.getValue () );
+            }
+        }
+    }
+
+    /**
+     *
+     * @param json
+     * @param useThisRoot
+     * @return
+     * @throws JsonProcessingException
+     */
+    private HashMap<String, String> getPropertiesFromString( String json, String useThisRoot )
+            throws IOException
+    {
+        int i = 0;
+        String str = "", r = "";
+        HashMap<String, String> hashMap = new HashMap<>();
+        ObjectMapper mapper = new ObjectMapper();
+        List<String> keys = new ArrayList<>();
+        JsonNode jsonNode = mapper.readTree( json );
+        getPropertiesFromJsonNode( hashMap, r, i, str, jsonNode, keys, useThisRoot );
+        return hashMap;
+    }
+
+    /**
+     *
+     * @param result
+     * @param r
+     * @param i
+     * @param str
+     * @param jsonNode
+     * @param keys
+     * @param useThisRoot
+     */
+    private void getPropertiesFromJsonNode ( HashMap<String, String> result, String r, int i, String str,
+                                             JsonNode jsonNode, List<String> keys, String useThisRoot )
+    {
+        if ( jsonNode.isObject() )
+        {
+            Iterator<String> fieldNames = jsonNode.fieldNames();
+            while ( fieldNames.hasNext() )
+            {
+                String fieldName = fieldNames.next();
+                keys.add ( fieldName );
+                if ( jsonNode.get( fieldName ).isObject() )
+                {
+                    i++;
+                    if ( i != 1 )
+                    {
+                        if ( str.isEmpty() )
+                        {
+                            str = fieldName;
+                        }
+                        else
+                        {
+                            str = str.concat ( "." ).concat( fieldName );
+                        }
+                    }
+                    else
+                    {
+                        r = fieldName;
+                    }
+                }
+                getPropertiesFromJsonNode ( result, r, i, str, jsonNode.get( fieldName ), keys, useThisRoot );
+            }
+            //str = "";
+            //i = 0;
+        }
+        else if ( jsonNode.isArray () )
+        {
+            ArrayNode arrayField = ( ArrayNode ) jsonNode;
+            for ( JsonNode node : arrayField )
+            {
+                getPropertiesFromJsonNode ( result, r, i, str, node, keys, useThisRoot ) ;
+            }
+        }
+        else
+        {
+            String key2;
+            if ( str.isEmpty () )
+            {
+                key2 = keys.get ( keys.size () - 1 );
+            }
+            else
+            {
+                key2 = str.concat ( "." ).concat ( keys.get ( keys.size() - 1 ) );
+            }
+            String s = r + "." + key2;
+
+            if ( null != useThisRoot && !useThisRoot.isEmpty() )
+            {
+                if ( s.startsWith( useThisRoot + "." ) )
+                {
+                    result.put ( s.replaceFirst( useThisRoot + ".", "" ), jsonNode.textValue(  ) );
+                }
+            }
+            else
+            {
+                result.put ( s, jsonNode.textValue() );
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
index b37f7de4..00e4c86e 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -32,6 +32,7 @@
 import org.codehaus.plexus.logging.Logger;
 
 /**
+ * @author <a href="mailto:BELMOUJAHID.I@Gmail.Com>Imad BELMOUJAHID</a> @ImadBL
  * @author <a href="mailto:kenney@neonics.com">Kenney Westerhof</a>
  * @author William Ferguson
  */
@@ -54,13 +55,14 @@ private PropertyUtils()
      *
      * @param propFile The property file to load.
      * @param baseProps Properties containing the initial values to substitute into the properties file.
+     * @param rootNode I have added this parameter for new feature with JSON files ### MRESOURCES-284 ###
      * @return Properties object containing the properties in the file with their values fully resolved.
      * @throws IOException if profile does not exist, or cannot be read.
      */
-    public static Properties loadPropertyFile( File propFile, Properties baseProps )
+    public static Properties loadPropertyFile( File propFile, Properties baseProps, String rootNode )
         throws IOException
     {
-        return loadPropertyFile( propFile, baseProps, null );
+        return loadPropertyFile( propFile, baseProps, null, rootNode );
     }
 
     /**
@@ -73,12 +75,14 @@ public static Properties loadPropertyFile( File propFile, Properties baseProps )
      * @param propFile The property file to load.
      * @param baseProps Properties containing the initial values to substitute into the properties file.
      * @param logger Logger instance
+     * @param rootNode I have added this parameter for new feature with JSON files ### MRESOURCES-284 ###
      * @return Properties object containing the properties in the file with their values fully resolved.
      * @throws IOException if profile does not exist, or cannot be read.
      *
      * @since 3.1.2
      */
-    public static Properties loadPropertyFile( File propFile, Properties baseProps, Logger logger )
+    public static Properties loadPropertyFile( File propFile, Properties baseProps, Logger logger,
+                                               String rootNode )
         throws IOException
     {
         if ( !propFile.exists() )
@@ -90,7 +94,17 @@ public static Properties loadPropertyFile( File propFile, Properties baseProps,
         
         try ( InputStream inStream = Files.newInputStream( propFile.toPath() ) )
         {
-            fileProps.load( inStream );
+            // I added this control to support JSON files
+            if ( propFile.getName().endsWith( ".json" ) )
+            {
+                PropertiesJson propertiesJson = new PropertiesJson();
+                propertiesJson.load( propFile, rootNode );
+                fileProps.putAll( propertiesJson.getProperties() );
+            }
+            else
+            {
+                fileProps.load( inStream );
+            }
         }
 
         final Properties combinedProps = new Properties();
@@ -122,13 +136,15 @@ public static Properties loadPropertyFile( File propFile, Properties baseProps,
      * @param propfile The property file to load
      * @param fail whether to throw an exception when the file cannot be loaded or to return null
      * @param useSystemProps whether to incorporate System.getProperties settings into the returned Properties object.
+     * @param rootNode I have added this parameter for new feature with JSON files ### MRESOURCES-284 ###
      * @return the loaded and fully resolved Properties object
      * @throws IOException if profile does not exist, or cannot be read.
      */
-    public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps )
+    public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps,
+                                               String rootNode )
         throws IOException
     {
-        return loadPropertyFile( propfile, fail, useSystemProps, null );
+        return loadPropertyFile( propfile, fail, useSystemProps, null, rootNode );
     }
 
     /**
@@ -138,12 +154,14 @@ public static Properties loadPropertyFile( File propfile, boolean fail, boolean
      * @param fail whether to throw an exception when the file cannot be loaded or to return null
      * @param useSystemProps whether to incorporate System.getProperties settings into the returned Properties object.
      * @param logger Logger instance
+     * @param rootNode I have added this parameter for new feature with JSON files ### MRESOURCES-284 ###
      * @return the loaded and fully resolved Properties object
      * @throws IOException if profile does not exist, or cannot be read.
      *
      * @since 3.1.2
      */
-    public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps, Logger logger )
+    public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps, Logger logger,
+                                               String rootNode )
         throws IOException
     {
 
@@ -157,7 +175,17 @@ public static Properties loadPropertyFile( File propfile, boolean fail, boolean
         final Properties resolvedProps = new Properties();
         try
         {
-            resolvedProps.putAll( loadPropertyFile( propfile, baseProps, logger ) );
+            // I added this control to support JSON files
+            if ( propfile.getName().endsWith( ".json" ) )
+            {
+                PropertiesJson propertiesJson = new PropertiesJson();
+                propertiesJson.load( propfile, rootNode );
+                resolvedProps.putAll( propertiesJson.getProperties() );
+            }
+            else
+            {
+                resolvedProps.putAll( loadPropertyFile( propfile, baseProps, logger, null ) );
+            }
         }
         catch ( FileNotFoundException e )
         {
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
index 249aa790..60230267 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
@@ -37,7 +37,7 @@
 
 /**
  * @author Olivier Lamy
- *
+ * @author <a href="mailto:BELMOUJAHID.I@Gmail.Com>Imad BELMOUJAHID</a> @ImadBL
  */
 public class DefaultMavenFileFilterTest
     extends PlexusTestCase
@@ -53,6 +53,10 @@ protected void setUp()
         Files.deleteIfExists( to.toPath() );
     }
 
+    /**
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
+     * @throws Exception
+     */
     public void testNotOverwriteFile()
         throws Exception
     {
@@ -71,11 +75,15 @@ public void testNotOverwriteFile()
 
         mavenFileFilter.copyFile( from, to, false, null, null );
 
-        Properties properties = PropertyUtils.loadPropertyFile( to, null );
+        Properties properties = PropertyUtils.loadPropertyFile( to, null, null );
         assertEquals( "${pom.version}", properties.getProperty( "version" ) );
 
     }
 
+    /**
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
+     * @throws Exception
+     */
     public void testOverwriteFile()
         throws Exception
     {
@@ -94,7 +102,7 @@ public void testOverwriteFile()
 
         mavenFileFilter.copyFile( from, to, false, null, null, true );
 
-        Properties properties = PropertyUtils.loadPropertyFile( to, null );
+        Properties properties = PropertyUtils.loadPropertyFile( to, null, null );
         assertEquals( "older file", properties.getProperty( "version" ) );
 
     }
@@ -124,7 +132,7 @@ public void testMultiFilterFileInheritance()
 
         final Properties filterProperties = new Properties();
 
-        mavenFileFilter.loadProperties( filterProperties, new File( getBasedir() ), filters, new Properties() );
+        mavenFileFilter.loadProperties( filterProperties, new File( getBasedir() ), filters, new Properties(), null );
 
         assertTrue( filterProperties.getProperty( "third_filter_key" ).equals( "first and second" ) );
     }
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
index db6a6f6b..5a67b88e 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -39,7 +39,7 @@
 
 /**
  * @author Olivier Lamy
- *
+ * @author <a href="mailto:BELMOUJAHID.I@Gmail.Com>Imad BELMOUJAHID</a> @ImadBL
  * @since 1.0-beta-1
  */
 public class DefaultMavenResourcesFilteringTest
@@ -273,6 +273,10 @@ private void assertFiltering( File initialImageFile, boolean escapeTest,
         assertTrue( filesAreIdentical( initialImageFile, imageFile ) );
     }
 
+    /**
+     * I added a null for rootNode parameter because it is only used with json file @ImadBL
+     * @throws Exception
+     */
     public void testAddingTokens()
         throws Exception
     {
@@ -307,12 +311,16 @@ public void testAddingTokens()
 
         mavenResourcesFiltering.filterResources( mavenResourcesExecution );
         Properties result =
-            PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
+            PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null, null );
         assertFalse( result.isEmpty() );
         assertEquals( mavenProject.getName(), result.get( "pomName" ) );
         assertFiltering( initialImageFile, false, false );
     }
 
+    /**
+     * I added a null for rootNode parameter because it is only used with json file @ImadBL
+     * @throws Exception
+     */
     public void testNoFiltering()
         throws Exception
     {
@@ -340,10 +348,10 @@ public void testNoFiltering()
 
         assertEquals( 7, outputDirectory.listFiles().length );
         Properties result =
-            PropertyUtils.loadPropertyFile( new File( outputDirectory, "empty-maven-resources-filtering.txt" ), null );
+            PropertyUtils.loadPropertyFile( new File( outputDirectory, "empty-maven-resources-filtering.txt" ), null, null );
         assertTrue( result.isEmpty() );
 
-        result = PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
+        result = PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null, null );
         assertFalse( result.isEmpty() );
 
         assertEquals( "${pom.version}", result.get( "version" ) );
@@ -774,6 +782,8 @@ private static void createTestDataStructure()
 
     /**
      * unit test for MSHARED-81 : https://issues.apache.org/jira/browse/MSHARED-81
+     *
+     * I added a null for rootNode parameter because it is only used with json file @ImadBL
      */
     @SuppressWarnings( "serial" )
     public void testMSHARED81()
@@ -809,22 +819,22 @@ public void testMSHARED81()
 
         mavenResourcesFiltering.filterResources( mavenResourcesExecution );
 
-        Properties filteredResult = PropertyUtils.loadPropertyFile( new File( output, "filtered.properties" ), null );
+        Properties filteredResult = PropertyUtils.loadPropertyFile( new File( output, "filtered.properties" ), null, null );
 
         Properties expectedFilteredResult =
             PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81",
                                                       "expected-filtered.properties" ),
-                                            null );
+                                            null, null );
 
         assertEquals( expectedFilteredResult, filteredResult );
 
         Properties nonFilteredResult =
-            PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ), null );
+            PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ), null, null );
 
         Properties expectedNonFilteredResult =
             PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81/resources",
                                                       "unfiltered.properties" ),
-                                            null );
+                                            null, null );
 
         assertTrue( nonFilteredResult.equals( expectedNonFilteredResult ) );
     }
@@ -868,6 +878,8 @@ public void testMSHARED81()
 
     /**
      * unit test for edge cases : https://issues.apache.org/jira/browse/MSHARED-228
+     *
+     * I added a null for rootNode parameter because it is only used with json file @ImadBL
      */
     @SuppressWarnings( "serial" )
     public void testEdgeCases()
@@ -905,22 +917,22 @@ public void testEdgeCases()
 
         mavenResourcesFiltering.filterResources( mavenResourcesExecution );
 
-        Properties filteredResult = PropertyUtils.loadPropertyFile( new File( output, "filtered.properties" ), null );
+        Properties filteredResult = PropertyUtils.loadPropertyFile( new File( output, "filtered.properties" ), null, null );
 
         Properties expectedFilteredResult =
             PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/edge-cases",
                                                       "expected-filtered.properties" ),
-                                            null );
+                                            null, null );
 
         assertEquals( expectedFilteredResult, filteredResult );
 
         Properties nonFilteredResult =
-            PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ), null );
+            PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ), null, null );
 
         Properties expectedNonFilteredResult =
             PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/edge-cases/resources",
                                                       "unfiltered.properties" ),
-                                            null );
+                                            null, null );
 
         assertTrue( nonFilteredResult.equals( expectedNonFilteredResult ) );
     }
diff --git a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
index 107d4066..a74bb1ff 100644
--- a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
@@ -29,6 +29,7 @@
 import org.codehaus.plexus.logging.Logger;
 
 /**
+ * @author <a href="mailto:BELMOUJAHID.I@Gmail.Com>Imad BELMOUJAHID</a> @ImadBL
  * @author Olivier Lamy
  * @since 1.0-beta-1
  *
@@ -38,6 +39,54 @@ public class PropertyUtilsTest
 {
     private static File testDirectory = new File( getBasedir(), "target/test-classes/" );
 
+    public void testBasicForJsonFile() throws IOException {
+
+        File basicProp = new File( testDirectory, "propertyutils-test.json" );
+        basicProp.deleteOnExit();
+
+        if ( basicProp.exists() )
+        {
+            basicProp.delete();
+        }
+
+        basicProp.createNewFile();
+        try ( FileWriter writer = new FileWriter( basicProp ) )
+        {
+            writer.write( "{ \"dev\" : { \"type\" : \"toto\", \"key2\" : \"value2\", " +
+                    "\"key3\" : {\"key4\" : \"value4\" } }, \"qualif\" : { \"type2\" : " +
+                    "\"toto1\", \"key5\" : \"value7\", \"key7\" : {\"key8\" : \"toto\"}}}\n" );
+            writer.flush();
+        }
+
+        Properties prop2 = PropertyUtils.loadPropertyFile( basicProp, false, false, null );
+        assertTrue( prop2.getProperty( "dev.type" ).equals( "toto" ) );
+        assertTrue( prop2.getProperty( "dev.key2" ).equals( "value2" ) );
+    }
+
+    public void testBasicForJsonFileWithrootNode() throws IOException {
+
+        File basicProp = new File( testDirectory, "propertyutils-test.json" );
+        basicProp.deleteOnExit();
+
+        if ( basicProp.exists() )
+        {
+            basicProp.delete();
+        }
+
+        basicProp.createNewFile();
+        try ( FileWriter writer = new FileWriter( basicProp ) )
+        {
+            writer.write( "{ \"dev\" : { \"type\" : \"toto\", \"key2\" : \"value2\", " +
+                    "\"key3\" : {\"key4\" : \"value4\" } }, \"qualif\" : { \"type2\" : " +
+                    "\"toto1\", \"key5\" : \"value7\", \"key7\" : {\"key8\" : \"toto\"}}}\n" );
+            writer.flush();
+        }
+
+        Properties prop2 = PropertyUtils.loadPropertyFile( basicProp, false, false, "dev" );
+        assertTrue( prop2.getProperty( "type" ).equals( "toto" ) );
+        assertTrue( prop2.getProperty( "key2" ).equals( "value2" ) );
+    }
+
     public void testBasic()
         throws Exception
     {
@@ -57,11 +106,15 @@ public void testBasic()
             writer.flush();
         }
 
-        Properties prop = PropertyUtils.loadPropertyFile( basicProp, false, false );
+        Properties prop = PropertyUtils.loadPropertyFile( basicProp, false, false, null );
         assertTrue( prop.getProperty( "key" ).equals( "gani_man" ) );
         assertTrue( prop.getProperty( "ghost" ).equals( "${non_existent}" ) );
     }
 
+    /**
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
+     * @throws Exception
+     */
     public void testSystemProperties()
         throws Exception
     {
@@ -79,10 +132,14 @@ public void testSystemProperties()
             writer.flush();
         }
 
-        Properties prop = PropertyUtils.loadPropertyFile( systemProp, false, true );
+        Properties prop = PropertyUtils.loadPropertyFile( systemProp, false, true, null );
         assertTrue( prop.getProperty( "key" ).equals( System.getProperty( "user.dir" ) ) );
     }
 
+    /**
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
+     * @throws Exception
+     */
     public void testException()
         throws Exception
     {
@@ -92,7 +149,7 @@ public void testException()
 
         try
         {
-            PropertyUtils.loadPropertyFile( nonExistent, true, false );
+            PropertyUtils.loadPropertyFile( nonExistent, true, false, null );
             assertTrue( "Exception failed", false );
         }
         catch ( Exception ex )
@@ -101,6 +158,10 @@ public void testException()
         }
     }
 
+    /**
+     * I added a null for rootNode parameter because it is only used with json file @ImadBL
+     * @throws Exception
+     */
     public void testloadpropertiesFile()
         throws Exception
     {
@@ -108,7 +169,7 @@ public void testloadpropertiesFile()
         Properties baseProps = new Properties();
         baseProps.put( "pom.version", "realVersion" );
 
-        Properties interpolated = PropertyUtils.loadPropertyFile( propertyFile, baseProps );
+        Properties interpolated = PropertyUtils.loadPropertyFile( propertyFile, baseProps, null );
         assertEquals( "realVersion", interpolated.get( "version" ) );
         assertEquals( "${foo}", interpolated.get( "foo" ) );
         assertEquals( "realVersion", interpolated.get( "bar" ) );
@@ -117,7 +178,7 @@ public void testloadpropertiesFile()
 
     /**
      * Test case to reproduce MSHARED-417
-     *
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
      * @throws IOException if problem writing file
      */
     public void testCircularReferences()
@@ -140,7 +201,7 @@ public void testCircularReferences()
 
         MockLogger logger = new MockLogger();
 
-        Properties prop = PropertyUtils.loadPropertyFile( basicProp, null, logger );
+        Properties prop = PropertyUtils.loadPropertyFile( basicProp, null, logger, null );
         assertEquals( "${test2}", prop.getProperty( "test" ) );
         assertEquals( "${test2}", prop.getProperty( "test2" ) );
         assertEquals( 2, logger.warnMsgs.size() );
@@ -150,7 +211,7 @@ public void testCircularReferences()
 
     /**
      * Test case to reproduce MSHARED-417
-     *
+     * I added a null for this parameter (rootNode) because it is only used with json file @ImadBL
      * @throws IOException if problem writing file
      */
     public void testCircularReferences3Vars()
@@ -174,7 +235,7 @@ public void testCircularReferences3Vars()
 
         MockLogger logger = new MockLogger();
 
-        Properties prop = PropertyUtils.loadPropertyFile( basicProp, null, logger );
+        Properties prop = PropertyUtils.loadPropertyFile( basicProp, null, logger, null );
         assertEquals( "${test2}", prop.getProperty( "test" ) );
         assertEquals( "${test3}", prop.getProperty( "test2" ) );
         assertEquals( "${test}", prop.getProperty( "test3" ) );

From 2735b81c0991c0406d716242687d8f728ce45cb3 Mon Sep 17 00:00:00 2001
From: imad <imad.a2@gmail.com>
Date: Tue, 26 Apr 2022 08:03:37 +0200
Subject: [PATCH 2/3] fix for read node of json file

---
 .../shared/filtering/PropertiesJson.java      | 43 ++++++-------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java b/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
index 08631fc9..5aa4c998 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
@@ -93,27 +93,24 @@ public void load ( File fr, String useThisRoot )
     private HashMap<String, String> getPropertiesFromString( String json, String useThisRoot )
             throws IOException
     {
-        int i = 0;
-        String str = "", r = "";
+        String str = "";
         HashMap<String, String> hashMap = new HashMap<>();
         ObjectMapper mapper = new ObjectMapper();
         List<String> keys = new ArrayList<>();
         JsonNode jsonNode = mapper.readTree( json );
-        getPropertiesFromJsonNode( hashMap, r, i, str, jsonNode, keys, useThisRoot );
+        getPropertiesFromJsonNode( hashMap, str, jsonNode, keys, useThisRoot );
         return hashMap;
     }
 
     /**
      *
      * @param result
-     * @param r
-     * @param i
      * @param str
      * @param jsonNode
      * @param keys
      * @param useThisRoot
      */
-    private void getPropertiesFromJsonNode ( HashMap<String, String> result, String r, int i, String str,
+    private void getPropertiesFromJsonNode ( HashMap<String, String> result, String str,
                                              JsonNode jsonNode, List<String> keys, String useThisRoot )
     {
         if ( jsonNode.isObject() )
@@ -125,9 +122,6 @@ private void getPropertiesFromJsonNode ( HashMap<String, String> result, String
                 keys.add ( fieldName );
                 if ( jsonNode.get( fieldName ).isObject() )
                 {
-                    i++;
-                    if ( i != 1 )
-                    {
                         if ( str.isEmpty() )
                         {
                             str = fieldName;
@@ -136,50 +130,39 @@ private void getPropertiesFromJsonNode ( HashMap<String, String> result, String
                         {
                             str = str.concat ( "." ).concat( fieldName );
                         }
-                    }
-                    else
-                    {
-                        r = fieldName;
-                    }
+                    getPropertiesFromJsonNode ( result, str, jsonNode.get( fieldName ), keys, useThisRoot );
+                    str = "";
+                }
+                else
+                {
+                    getPropertiesFromJsonNode ( result, str, jsonNode.get( fieldName ), keys, useThisRoot );
                 }
-                getPropertiesFromJsonNode ( result, r, i, str, jsonNode.get( fieldName ), keys, useThisRoot );
             }
-            //str = "";
-            //i = 0;
         }
         else if ( jsonNode.isArray () )
         {
             ArrayNode arrayField = ( ArrayNode ) jsonNode;
             for ( JsonNode node : arrayField )
             {
-                getPropertiesFromJsonNode ( result, r, i, str, node, keys, useThisRoot ) ;
+                getPropertiesFromJsonNode ( result, str, node, keys, useThisRoot ) ;
             }
         }
         else
         {
-            String key2;
-            if ( str.isEmpty () )
-            {
-                key2 = keys.get ( keys.size () - 1 );
-            }
-            else
-            {
-                key2 = str.concat ( "." ).concat ( keys.get ( keys.size() - 1 ) );
-            }
-            String s = r + "." + key2;
+            String s = str.concat ( "." ).concat ( keys.get ( keys.size() - 1 ) );
 
             if ( null != useThisRoot && !useThisRoot.isEmpty() )
             {
                 if ( s.startsWith( useThisRoot + "." ) )
                 {
-                    result.put ( s.replaceFirst( useThisRoot + ".", "" ), jsonNode.textValue(  ) );
+                    result.put ( s.replaceFirst( "^[a-zA-Z1-9]*.", "" ), jsonNode.textValue(  ) );
                 }
             }
             else
             {
                 result.put ( s, jsonNode.textValue() );
             }
-
+            str = "";
         }
     }
 }
\ No newline at end of file

From bbb1dfcd7a8cd51741cf402c35100047ffe3f5b4 Mon Sep 17 00:00:00 2001
From: imad <imad.a2@gmail.com>
Date: Wed, 27 Apr 2022 13:48:16 +0200
Subject: [PATCH 3/3] fix read sup node of json file

---
 .../shared/filtering/PropertiesJson.java      | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java b/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
index 5aa4c998..9e68495c 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertiesJson.java
@@ -74,7 +74,7 @@ public void load ( File fr, String useThisRoot )
     {
         try ( FileReader reader = new FileReader ( fr ) )
         {
-            for ( Map.Entry<String, String> e
+            for ( Map.Entry<String, Object> e
                     : getPropertiesFromString( IOUtils.toString( reader ), useThisRoot ).entrySet( ) )
             {
 
@@ -90,11 +90,11 @@ public void load ( File fr, String useThisRoot )
      * @return
      * @throws JsonProcessingException
      */
-    private HashMap<String, String> getPropertiesFromString( String json, String useThisRoot )
+    private HashMap<String, Object> getPropertiesFromString( String json, String useThisRoot )
             throws IOException
     {
         String str = "";
-        HashMap<String, String> hashMap = new HashMap<>();
+        HashMap<String, Object> hashMap = new HashMap<>();
         ObjectMapper mapper = new ObjectMapper();
         List<String> keys = new ArrayList<>();
         JsonNode jsonNode = mapper.readTree( json );
@@ -110,7 +110,7 @@ private HashMap<String, String> getPropertiesFromString( String json, String use
      * @param keys
      * @param useThisRoot
      */
-    private void getPropertiesFromJsonNode ( HashMap<String, String> result, String str,
+    private void getPropertiesFromJsonNode ( HashMap<String, Object> result, String str,
                                              JsonNode jsonNode, List<String> keys, String useThisRoot )
     {
         if ( jsonNode.isObject() )
@@ -122,20 +122,29 @@ private void getPropertiesFromJsonNode ( HashMap<String, String> result, String
                 keys.add ( fieldName );
                 if ( jsonNode.get( fieldName ).isObject() )
                 {
-                        if ( str.isEmpty() )
-                        {
-                            str = fieldName;
-                        }
-                        else
-                        {
-                            str = str.concat ( "." ).concat( fieldName );
-                        }
-                    getPropertiesFromJsonNode ( result, str, jsonNode.get( fieldName ), keys, useThisRoot );
-                    str = "";
+                    String r;
+                    if ( str != null && str.isEmpty () )
+                    {
+                        r = str.concat( fieldName );
+                    }
+                    else
+                    {
+                        r = str.concat( "." ).concat( fieldName );
+                    }
+                    getPropertiesFromJsonNode ( result, r, jsonNode.get( fieldName ), keys, useThisRoot );
                 }
                 else
                 {
-                    getPropertiesFromJsonNode ( result, str, jsonNode.get( fieldName ), keys, useThisRoot );
+                    String r;
+                    if ( str != null && str.isEmpty() )
+                    {
+                        r = str.concat( fieldName );
+                    }
+                    else
+                    {
+                        r = str.concat( "." ).concat( fieldName );
+                    }
+                    getPropertiesFromJsonNode ( result, r, jsonNode.get( fieldName ), keys, useThisRoot );
                 }
             }
         }
@@ -149,20 +158,19 @@ else if ( jsonNode.isArray () )
         }
         else
         {
-            String s = str.concat ( "." ).concat ( keys.get ( keys.size() - 1 ) );
 
             if ( null != useThisRoot && !useThisRoot.isEmpty() )
             {
-                if ( s.startsWith( useThisRoot + "." ) )
+                if ( str.startsWith( useThisRoot + "." ) )
                 {
-                    result.put ( s.replaceFirst( "^[a-zA-Z1-9]*.", "" ), jsonNode.textValue(  ) );
+                    result.put ( str.replaceFirst( "^[a-zA-Z1-9]*.", "" ), jsonNode.textValue(  ) );
                 }
             }
             else
             {
-                result.put ( s, jsonNode.textValue() );
+                result.put ( str, jsonNode.textValue() );
             }
-            str = "";
+
         }
     }
 }
\ No newline at end of file