From f9bf892e2566a1817ca72189a061d40ea97b3f39 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Fri, 11 Nov 2011 14:05:46 +0000 Subject: [PATCH] use generics and other little code improvements git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1200891 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/JavaMojoDescriptorExtractorTest.java | 13 ++++++------- .../src/test/resources/java-1.5/MyEnum.java | 6 +++--- .../src/test/resources/source3/TestAnnotation.java | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java b/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java index f9250bf..cf933da 100644 --- a/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java +++ b/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java @@ -28,6 +28,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.tools.plugin.DefaultPluginToolsRequest; import org.apache.maven.tools.plugin.ExtendedMojoDescriptor; import org.apache.maven.tools.plugin.PluginToolsRequest; +import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor; import org.codehaus.plexus.util.FileUtils; import java.io.File; @@ -55,13 +56,10 @@ public class JavaMojoDescriptorExtractorTest return result; } - public List extract( String directory ) + protected List extract( String directory ) throws Exception { - JavaMojoDescriptorExtractor extractor = new JavaMojoDescriptorExtractor(); - File sourceFile = fileOf( "dir-flag.txt" ); - File dir = sourceFile.getParentFile(); Model model = new Model(); @@ -77,6 +75,8 @@ public class JavaMojoDescriptorExtractorTest PluginToolsRequest request = new DefaultPluginToolsRequest( project, pluginDescriptor ).setEncoding( "UTF-8" ); + MojoDescriptorExtractor extractor = new JavaMojoDescriptorExtractor(); + return extractor.execute( request ); } @@ -87,9 +87,8 @@ public class JavaMojoDescriptorExtractorTest assertEquals( "Extracted mojos", 2, results.size() ); - for ( int i = 0; i < 2; i++ ) + for ( MojoDescriptor mojoDescriptor : results ) { - MojoDescriptor mojoDescriptor = (MojoDescriptor) results.get( i ); assertEquals( 1, mojoDescriptor.getParameters().size() ); Parameter parameter = (Parameter) mojoDescriptor.getParameters().get( 0 ); assertEquals( "project", parameter.getName() ); @@ -104,7 +103,7 @@ public class JavaMojoDescriptorExtractorTest assertEquals( 1, results.size() ); - MojoDescriptor mojoDescriptor = (MojoDescriptor) results.get( 0 ); + MojoDescriptor mojoDescriptor = results.get( 0 ); @SuppressWarnings( "unchecked" ) List parameters = mojoDescriptor.getParameters(); diff --git a/maven-plugin-tools-java/src/test/resources/java-1.5/MyEnum.java b/maven-plugin-tools-java/src/test/resources/java-1.5/MyEnum.java index 9a9f9d1..bc754d8 100644 --- a/maven-plugin-tools-java/src/test/resources/java-1.5/MyEnum.java +++ b/maven-plugin-tools-java/src/test/resources/java-1.5/MyEnum.java @@ -1,14 +1,14 @@ public enum MyEnum { - @Deprecated() + @Deprecated( ) SOME_VALUE, // cf. MPLUGIN-151 - @SuppressWarnings("all") + @SuppressWarnings( "all" ) ANOTHER_VALUE, - @SuppressWarnings(value = { "all" }) + @SuppressWarnings( value = { "all" } ) YET_ANOTHER_VALUE; } diff --git a/maven-plugin-tools-java/src/test/resources/source3/TestAnnotation.java b/maven-plugin-tools-java/src/test/resources/source3/TestAnnotation.java index 1e9e8b1..fd1ef9e 100644 --- a/maven-plugin-tools-java/src/test/resources/source3/TestAnnotation.java +++ b/maven-plugin-tools-java/src/test/resources/source3/TestAnnotation.java @@ -1,8 +1,8 @@ package source3; -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.ANNOTATION_TYPE) +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.ANNOTATION_TYPE ) +public @interface TestAnnotation +{ -public @interface TestAnnotation { - }