diff --git a/maven-filtering/pom.xml b/maven-filtering/pom.xml index 20ff47ba7..4b500bcd7 100644 --- a/maven-filtering/pom.xml +++ b/maven-filtering/pom.xml @@ -1,23 +1,27 @@ - + 4.0.0 @@ -64,7 +68,7 @@ Graham Leggett - + org.apache.maven @@ -91,6 +95,7 @@ plexus-build-api 0.0.7 + com.google.code.findbugs jsr305 diff --git a/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java index ed2183162..5f2251c4b 100644 --- a/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java +++ b/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java @@ -43,25 +43,23 @@ import org.apache.maven.shared.utils.io.FileUtils; import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper; import org.apache.maven.shared.utils.io.IOUtil; +import org.codehaus.plexus.component.annotations.Component; +import org.codehaus.plexus.component.annotations.Requirement; import org.sonatype.plexus.build.incremental.BuildContext; /** * @author Olivier Lamy - * @plexus.component role="org.apache.maven.shared.filtering.MavenFileFilter" role-hint="default" */ +@Component( role = org.apache.maven.shared.filtering.MavenFileFilter.class, hint = "default" ) public class DefaultMavenFileFilter extends BaseFilter implements MavenFileFilter { - /** - * @plexus.requirement - */ + @Requirement private MavenReaderFilter readerFilter; - /** - * @plexus.requirement - */ + @Requirement private BuildContext buildContext; /** {@inheritDoc} */ diff --git a/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java b/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java index 6e608c6f9..c5821cd8b 100644 --- a/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java +++ b/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java @@ -28,11 +28,12 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper; +import org.codehaus.plexus.component.annotations.Component; /** * @author Kristian Rosenvold - * @plexus.component role="org.apache.maven.shared.filtering.MavenReaderFilter" role-hint="default" */ +@Component( role = org.apache.maven.shared.filtering.MavenReaderFilter.class, hint = "default" ) public class DefaultMavenReaderFilter extends BaseFilter implements MavenReaderFilter diff --git a/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java index b694caf7c..a6e76b73e 100644 --- a/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java +++ b/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java @@ -37,6 +37,8 @@ import org.apache.maven.shared.utils.io.FileUtils; import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper; import org.apache.maven.shared.utils.io.IOUtil; +import org.codehaus.plexus.component.annotations.Component; +import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; @@ -45,8 +47,8 @@ /** * @author Olivier Lamy - * @plexus.component role="org.apache.maven.shared.filtering.MavenResourcesFiltering" role-hint="default" */ +@Component( role = MavenResourcesFiltering.class, hint = "default" ) public class DefaultMavenResourcesFiltering extends AbstractLogEnabled implements MavenResourcesFiltering, Initializable @@ -58,11 +60,12 @@ public class DefaultMavenResourcesFiltering private List defaultNonFilteredFileExtensions; - /** - * @plexus.requirement - */ + @Requirement private BuildContext buildContext; + @Requirement + private MavenFileFilter mavenFileFilter; + // ------------------------------------------------ // Plexus lifecycle // ------------------------------------------------ @@ -79,11 +82,6 @@ public void initialize() this.defaultNonFilteredFileExtensions.add( "png" ); } - /** - * @plexus.requirement role-hint="default" - */ - private MavenFileFilter mavenFileFilter; - /** {@inheritDoc} */ public void filterResources( List resources, File outputDirectory, MavenProject mavenProject, String encoding, List fileFilters, List nonFilteredFileExtensions, diff --git a/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java index 27263ebed..8c198cc97 100644 --- a/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java +++ b/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java @@ -48,7 +48,6 @@ public class DefaultMavenResourcesFilteringTest File outputDirectory = new File( getBasedir(), "target/DefaultMavenResourcesFilteringTest" ); - @SuppressWarnings( "ResultOfMethodCallIgnored" ) protected void setUp() throws Exception { @@ -73,8 +72,7 @@ public void testSimpleFiltering() projectProperties.put( "foo", "bar" ); projectProperties.put( "java.version", "zloug" ); mavenProject.setProperties( projectProperties ); - MavenResourcesFiltering mavenResourcesFiltering = - (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() ); + MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class ); String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering"; File initialImageFile = new File( unitFilesDir, "happy_duke.gif" ); @@ -118,12 +116,13 @@ public void testSessionFiltering() Settings settings = new Settings(); settings.setLocalRepository( System.getProperty( "localRepository", - System.getProperty( "maven.repo.local", "/path/to/local/repo" ) ) ); + System.getProperty( "maven.repo.local", + "/path/to/local/repo" ) ) ); MavenSession session = new StubMavenSession( settings ); mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, "UTF-8", filtersFile, - Collections. emptyList(), session ); + Collections.emptyList(), session ); Properties result = new Properties(); FileInputStream in = null; @@ -223,8 +222,9 @@ public void testWithMavenResourcesExecutionWithAdditionnalProperties() } @SuppressWarnings( "ConstantConditions" ) - private void assertFiltering( File baseDir, File initialImageFile, boolean escapeTest, boolean additionnalProperties ) - throws Exception + private void assertFiltering( File baseDir, File initialImageFile, boolean escapeTest, + boolean additionnalProperties ) + throws Exception { assertEquals( 7, outputDirectory.listFiles().length ); Properties result = new Properties(); @@ -362,7 +362,7 @@ public void testNoFiltering() resource.setDirectory( unitFilesDir ); resource.setFiltering( false ); mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, "UTF-8", null, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); assertEquals( 7, outputDirectory.listFiles().length ); Properties result = @@ -445,7 +445,7 @@ public void testIncludeOneFile() MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesFiltering.filterResources( mavenResourcesExecution ); File[] files = outputDirectory.listFiles(); @@ -482,11 +482,11 @@ public void testIncludeOneFileAndDirectory() MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesFiltering.filterResources( mavenResourcesExecution ); File[] files = outputDirectory.listFiles(); - assertNotNull( files); + assertNotNull( files ); assertEquals( 2, files.length ); File includeFile = new File( outputDirectory, "includefile.txt" ); assertTrue( includeFile.exists() ); @@ -524,7 +524,7 @@ public void testExcludeOneFile() MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesFiltering.filterResources( mavenResourcesExecution ); File[] files = outputDirectory.listFiles(); @@ -581,7 +581,7 @@ public void testTargetAbsolutePath() MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesFiltering.filterResources( mavenResourcesExecution ); File[] files = targetPathFile.listFiles(); @@ -616,7 +616,7 @@ public void testTargetPath() MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesFiltering.filterResources( mavenResourcesExecution ); File targetPathFile = new File( outputDirectory, "testTargetPath" ); @@ -648,7 +648,7 @@ public void testEmptyDirectories() } ); MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", Collections.EMPTY_LIST, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesExecution.setIncludeEmptyDirs( true ); mavenResourcesFiltering.filterResources( mavenResourcesExecution ); @@ -720,7 +720,7 @@ public void testMSHARED81() File output = new File( outputDirectory, "MSHARED-81" ); MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.EMPTY_LIST, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesExecution.setIncludeEmptyDirs( true ); mavenResourcesExecution.setEscapeString( "\\" ); @@ -730,7 +730,8 @@ public void testMSHARED81() Properties expectedFilteredResult = PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81", - "expected-filtered.properties" ), null ); + "expected-filtered.properties" ), + null ); System.out.println( "\nExpected:\n" ); expectedFilteredResult.list( System.out ); @@ -744,7 +745,8 @@ public void testMSHARED81() Properties expectedNonFilteredResult = PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81/resources", - "unfiltered.properties" ), null ); + "unfiltered.properties" ), + null ); assertTrue( nonFilteredResult.equals( expectedNonFilteredResult ) ); } @@ -786,7 +788,7 @@ public void testEdgeCases() File output = new File( outputDirectory, "edge-cases" ); MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.EMPTY_LIST, - Collections. emptyList(), new StubMavenSession() ); + Collections.emptyList(), new StubMavenSession() ); mavenResourcesExecution.setIncludeEmptyDirs( true ); mavenResourcesExecution.setEscapeString( "\\" ); @@ -796,7 +798,8 @@ public void testEdgeCases() Properties expectedFilteredResult = PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/edge-cases", - "expected-filtered.properties" ), null ); + "expected-filtered.properties" ), + null ); System.out.println( "\nExpected:\n" ); expectedFilteredResult.list( System.out ); @@ -810,7 +813,8 @@ public void testEdgeCases() Properties expectedNonFilteredResult = PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/edge-cases/resources", - "unfiltered.properties" ), null ); + "unfiltered.properties" ), + null ); assertTrue( nonFilteredResult.equals( expectedNonFilteredResult ) ); } @@ -839,7 +843,7 @@ public void testFilterFileName() MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( Collections.singletonList( resource ), outputDirectory, mavenProject, "UTF-8", - Collections. emptyList(), Collections. emptyList(), + Collections.emptyList(), Collections.emptyList(), new StubMavenSession() ); mavenResourcesExecution.setFilterFilenames( true ); mavenResourcesFiltering.filterResources( mavenResourcesExecution );