[maven-toolchains-plugin] 01/02: WIP...checking.

[khmarbaise]

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

khmarbaise pushed a commit to branch AUTOJDK
in repository https://gitbox.apache.org/repos/asf/maven-toolchains-plugin.git

commit 9cde9be8904f035b60c8419d2550d78f7ba1c49b
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Sat Aug 6 13:15:57 2022 +0200

    WIP...checking.
---
 .../maven/plugins/toolchain/ToolchainConverter.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/plugins/toolchain/ToolchainConverter.java 
b/src/main/java/org/apache/maven/plugins/toolchain/ToolchainConverter.java
index 43e2b36..42cdf9c 100644
--- a/src/main/java/org/apache/maven/plugins/toolchain/ToolchainConverter.java
+++ b/src/main/java/org/apache/maven/plugins/toolchain/ToolchainConverter.java
@@ -19,8 +19,11 @@ package org.apache.maven.plugins.toolchain;
  * under the License.
  */
 
+import java.util.AbstractMap;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import 
org.codehaus.plexus.component.configurator.ComponentConfigurationException;
 import org.codehaus.plexus.component.configurator.ConfigurationListener;
@@ -70,7 +73,6 @@ public class ToolchainConverter
     private void processConfiguration( ToolchainsRequirement requirement,
                                        PlexusConfiguration configuration,
                                        ExpressionEvaluator expressionEvaluator 
)
-        throws ComponentConfigurationException
     {
         Map<String, Map<String, String>> map = new HashMap<>();
 
@@ -80,14 +82,19 @@ public class ToolchainConverter
             String type = tool.getName();
             PlexusConfiguration[] params = tool.getChildren();
 
-            Map<String, String> parameters = new HashMap<>();
-            for ( PlexusConfiguration param : params )
-            {
-                    parameters.put( param.getName(), param.getValue() );
-            }
+            Map<String, String> parameters =
+                    Arrays.stream( params ).collect( Collectors.toMap( 
PlexusConfiguration::getName,
+                            PlexusConfiguration::getValue ) );
             map.put( type, parameters );
         }
 
+        Arrays.stream( configuration.getChildren() )
+        .map( s ->
+            new AbstractMap.SimpleEntry<>( s.getName(),
+                    Arrays.stream( s.getChildren() ).collect( 
Collectors.toMap( PlexusConfiguration::getName,
+                            PlexusConfiguration::getValue ) ) )
+
+        ).collect( Collectors.toMap( k -> k, v -> v ) );
         requirement.toolchains = map;
     }
 }
\ No newline at end of file