[maven] branch master updated: [MNG-7751] Provide a way to inject XmlNode into plugins (#1071)

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new 56ee6a878d [MNG-7751] Provide a way to inject XmlNode into plugins 
(#1071)
56ee6a878d is described below

commit 56ee6a878d25ebeee01f9a4f7431b35aced945a4
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jun 12 21:39:23 2023 +0200

    [MNG-7751] Provide a way to inject XmlNode into plugins (#1071)
---
 .../internal/DefaultBeanConfigurator.java          | 40 ++++++++++++++++++++++
 .../internal/EnhancedConverterLookup.java          |  1 +
 2 files changed, 41 insertions(+)

diff --git 
a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
 
b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
index 7053409804..732a9d8ad8 100644
--- 
a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
+++ 
b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
@@ -24,15 +24,20 @@ import javax.inject.Singleton;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
+import org.apache.maven.api.xml.XmlNode;
 import org.apache.maven.configuration.BeanConfigurationException;
 import org.apache.maven.configuration.BeanConfigurationPathTranslator;
 import org.apache.maven.configuration.BeanConfigurationRequest;
 import org.apache.maven.configuration.BeanConfigurationValuePreprocessor;
 import org.apache.maven.configuration.BeanConfigurator;
+import org.apache.maven.internal.xml.XmlNodeImpl;
 import 
org.codehaus.plexus.component.configurator.ComponentConfigurationException;
 import org.codehaus.plexus.component.configurator.ConfigurationListener;
+import 
org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter;
 import 
org.codehaus.plexus.component.configurator.converters.basic.AbstractBasicConverter;
 import 
org.codehaus.plexus.component.configurator.converters.composite.ObjectWithFieldsConverter;
 import 
org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup;
@@ -133,6 +138,41 @@ public class DefaultBeanConfigurator implements 
BeanConfigurator {
         }
     }
 
+    static class XmlConverter extends AbstractConfigurationConverter {
+        @Override
+        public boolean canConvert(Class<?> type) {
+            return XmlNode.class.equals(type);
+        }
+
+        @Override
+        public Object fromConfiguration(
+                final ConverterLookup lookup,
+                final PlexusConfiguration configuration,
+                final Class<?> type,
+                final Class<?> enclosingType,
+                final ClassLoader loader,
+                final ExpressionEvaluator evaluator,
+                final ConfigurationListener listener)
+                throws ComponentConfigurationException {
+
+            try {
+                return toXml(configuration, evaluator);
+            } catch (ExpressionEvaluationException e) {
+                throw new ComponentConfigurationException("Unable to convert 
configuration to xml node", e);
+            }
+        }
+
+        XmlNode toXml(PlexusConfiguration config, ExpressionEvaluator 
evaluator) throws ExpressionEvaluationException {
+            List<XmlNode> children = new ArrayList<>();
+            for (PlexusConfiguration c : config.getChildren()) {
+                children.add(toXml(c, evaluator));
+            }
+            String name = config.getName();
+            Object value = evaluator.evaluate(config.getValue());
+            return new XmlNodeImpl(name, value != null ? value.toString() : 
null, null, children, null);
+        }
+    }
+
     static class PathConverter extends AbstractBasicConverter {
         @Override
         public boolean canConvert(Class<?> type) {
diff --git 
a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java
 
b/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java
index e8c2ed1a19..55c2a5c864 100644
--- 
a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java
+++ 
b/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java
@@ -29,6 +29,7 @@ class EnhancedConverterLookup implements ConverterLookup {
 
     EnhancedConverterLookup() {
         registerConverter(new DefaultBeanConfigurator.PathConverter());
+        registerConverter(new DefaultBeanConfigurator.XmlConverter());
     }
 
     @Override