[MPLUGIN-427] only emit simple parameter type for configuration (#163)

apache · Oct 26, 2022 · 8a76400 · 8a76400
1 parent 322a9bb
commit 8a76400
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/...src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java b/...src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java
@@ -587,7 +587,8 @@ else if ( type != DescriptorType.LIMITED_FOR_HELP_MOJO || parameter.isEditable()
 
                 w.startElement( parameter.getName() );
 
-                String parameterType = parameter.getType();
+                // strip type by parameter type (generics) information
+                String parameterType = StringUtils.chomp( parameter.getType(), "<" );
                 if ( StringUtils.isNotEmpty( parameterType ) )
                 {
                     w.addAttribute( "implementation", parameterType );

diff --git a/...tors/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java b/...tors/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
@@ -20,6 +20,7 @@
  */
 
 import org.apache.maven.model.Build;
+import org.apache.maven.plugin.descriptor.DuplicateParameterException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -114,14 +115,19 @@ public String getOutputDirectory()
                 return basedir + "/target";
             }
         } );
-
+        extendPluginDescriptor( pluginDescriptor );
         generator.execute( destinationDirectory, new DefaultPluginToolsRequest( mavenProject, pluginDescriptor ) );
 
         validate( destinationDirectory );
 
         FileUtils.deleteDirectory( destinationDirectory );
     }
 
+    protected void extendPluginDescriptor( PluginDescriptor pluginDescriptor ) throws DuplicateParameterException
+    {
+        // may be overwritten
+    }
+
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------

diff --git a/...test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java b/...test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGeneratorTest.java
@@ -29,12 +29,14 @@
 import java.net.URISyntaxException;
 import java.util.List;
 
+import org.apache.maven.plugin.descriptor.DuplicateParameterException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.apache.maven.tools.plugin.javadoc.JavadocLinkGenerator;
 import org.codehaus.plexus.component.repository.ComponentDependency;
+import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.testing.PlexusTest;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.junit.jupiter.api.Test;
@@ -50,6 +52,17 @@
 public class PluginDescriptorFilesGeneratorTest
     extends AbstractGeneratorTestCase
 {
+    @Override
+    protected void extendPluginDescriptor( PluginDescriptor pluginDescriptor ) throws DuplicateParameterException
+    {
+        Parameter parameterWithGenerics = new Parameter();
+        parameterWithGenerics.setName( "parameterWithGenerics" );
+        parameterWithGenerics.setType("java.util.Collection<java.lang.String>");
+        parameterWithGenerics.setExpression( "${customParam}" );
+        parameterWithGenerics.setDefaultValue( "a,b,c" );
+        pluginDescriptor.getMojos().get( 0 ).addParameter( parameterWithGenerics );
+    }
+
     @Override
     protected void validate( File destinationDirectory )
         throws Exception
@@ -113,8 +126,21 @@ private void checkMojo( MojoDescriptor mojoDescriptor )
 
         assertNotNull( mojoDescriptor.isDependencyResolutionRequired() );
 
-        // check the parameter.
+        // check the default parameter
         checkParameter( mojoDescriptor.getParameters().get( 0 ) );
+
+        // check another parameter with generics type information
+        Parameter parameterWithGenerics = mojoDescriptor.getParameters().get( 2 );
+        assertNotNull( parameterWithGenerics );
+        assertEquals( "parameterWithGenerics", parameterWithGenerics.getName() );
+        assertEquals( "java.util.Collection", parameterWithGenerics.getType() );
+
+        PlexusConfiguration configurations = mojoDescriptor.getMojoConfiguration();
+        assertNotNull( configurations );
+        PlexusConfiguration configuration = configurations.getChild( "parameterWithGenerics" );
+        assertEquals( "java.util.Collection", configuration.getAttribute( "implementation" ) );
+        assertEquals( "a,b,c", configuration.getAttribute( "default-value") );
+        assertEquals( "${customParam}", configuration.getValue() );
     }
 
     private void checkParameter( Parameter parameter )