From f375619f9c094d2f4900f003133da5fee2c0ab25 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 22 May 2012 21:42:04 +0000 Subject: [PATCH] use hint rather than roleHint git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1341650 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/plugins/annotations/Component.java | 6 +++--- .../apache/maven/plugins/AbstractFirstMojo.java | 2 +- .../maven/plugin/coreit/AbstractFirstMojo.java | 2 +- .../apache/maven/plugin/coreit/FirstMojo.java | 2 +- .../JavaAnnotationsMojoDescriptorExtractor.java | 2 +- .../datamodel/ComponentAnnotationContent.java | 16 ++++++++-------- .../maven/tools/plugin/annotations/FooMojo.java | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java index 121041f..013d239 100644 --- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java +++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java @@ -45,8 +45,8 @@ public @interface Component Class role() default Object.class; /** - * role-hint of the component to inject. - * @return the role-hint + * hint of the component to inject. + * @return the hint */ - String roleHint() default ""; + String hint() default ""; } diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java index 775e12c..9858058 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java @@ -58,7 +58,7 @@ public abstract class AbstractFirstMojo /** * */ - @Component( role = ArtifactMetadataSource.class, roleHint = "maven" ) + @Component( role = ArtifactMetadataSource.class, hint = "maven" ) protected ArtifactMetadataSource artifactMetadataSource; } diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java index d05639c..e65430e 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java @@ -58,7 +58,7 @@ public abstract class AbstractFirstMojo /** * */ - @Component( role = ArtifactMetadataSource.class, roleHint = "maven" ) + @Component( role = ArtifactMetadataSource.class, hint = "maven" ) protected ArtifactMetadataSource artifactMetadataSource; } diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java index e78a4cd..72bfe45 100644 --- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java +++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java @@ -60,7 +60,7 @@ public class FirstMojo @Parameter( alias = "alias" ) private String aliasedParam; - @Component( role = MavenProjectHelper.class, roleHint = "test" ) + @Component( role = MavenProjectHelper.class, hint = "test" ) private Object projectHelper; public void execute() diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java index 4752754..117c032 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java @@ -546,7 +546,7 @@ public class JavaAnnotationsMojoDescriptorExtractor new org.apache.maven.plugin.descriptor.Parameter(); parameter.setName( componentAnnotationContent.getFieldName() ); parameter.setRequirement( new Requirement( componentAnnotationContent.getRoleClassName(), - componentAnnotationContent.roleHint() ) ); + componentAnnotationContent.hint() ) ); parameter.setDeprecated( componentAnnotationContent.getDeprecated() ); parameter.setSince( componentAnnotationContent.getSince() ); diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java index e2e069d..26d9ada 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java @@ -33,18 +33,18 @@ public class ComponentAnnotationContent { private String roleClassName; - private String roleHint; + private String hint; public ComponentAnnotationContent( String fieldName ) { super( fieldName ); } - public ComponentAnnotationContent( String fieldName, String role, String roleHint ) + public ComponentAnnotationContent( String fieldName, String role, String hint ) { this( fieldName ); this.roleClassName = role; - this.roleHint = roleHint; + this.hint = hint; } public Class role() @@ -63,14 +63,14 @@ public class ComponentAnnotationContent return roleClassName; } - public String roleHint() + public String hint() { - return roleHint == null ? "" : roleHint; + return hint == null ? "" : hint; } - public void roleHint( String roleHint ) + public void hint( String hint ) { - this.roleHint = roleHint; + this.hint = hint; } public Class annotationType() @@ -85,7 +85,7 @@ public class ComponentAnnotationContent sb.append( super.toString() ); sb.append( "ComponentAnnotationContent" ); sb.append( "{role='" ).append( roleClassName ).append( '\'' ); - sb.append( ", roleHint='" ).append( roleHint ).append( '\'' ); + sb.append( ", hint='" ).append( hint ).append( '\'' ); sb.append( '}' ); return sb.toString(); } diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java index a559325..1921d9a 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java @@ -61,7 +61,7 @@ public class FooMojo /** * */ - @Component( role = ArtifactMetadataSource.class, roleHint = "maven" ) + @Component( role = ArtifactMetadataSource.class, hint = "maven" ) protected ArtifactMetadataSource artifactMetadataSource; public void execute()