You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/07/16 12:19:40 UTC
[maven-filtering] 01/01: replace deprecated code in favor java 7
core and apache commons libraries
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch i912
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit c09153c3e9dc8be31c3b0754eadbb74e72d459ba
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Jul 16 08:19:20 2020 -0400
replace deprecated code in favor java 7 core and apache commons libraries
---
.../filtering/DefaultMavenResourcesFiltering.java | 15 ++++----
.../filtering/DefaultMavenFileFilterTest.java | 26 +++++++-------
.../filtering/DefaultMavenReaderFilterTest.java | 10 +++---
.../DefaultMavenResourcesFilteringTest.java | 40 +++++++++-------------
.../maven/shared/filtering/EscapeStringTest.java | 17 ++++-----
.../IncrementalResourceFilteringTest.java | 4 +--
.../maven/shared/filtering/InvalidMarkTest.java | 4 +--
.../MuliLinesMavenResourcesFilteringTest.java | 4 +--
8 files changed, 56 insertions(+), 64 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index a3d8a81..067873b 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -28,13 +28,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.model.Resource;
import org.apache.maven.shared.utils.PathTool;
import org.apache.maven.shared.utils.ReaderFactory;
import org.apache.maven.shared.utils.StringUtils;
-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;
@@ -88,8 +88,8 @@ public class DefaultMavenResourcesFiltering
{
nonFilteredFileExtensions.addAll( userNonFilteredFileExtensions );
}
- boolean filteredFileExtension =
- !nonFilteredFileExtensions.contains( StringUtils.lowerCase( FileUtils.extension( fileName ) ) );
+ String extension = StringUtils.lowerCase( FilenameUtils.getExtension( fileName ) );
+ boolean filteredFileExtension = !nonFilteredFileExtensions.contains( extension );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "file " + fileName + " has a" + ( filteredFileExtension ? " " : " non " )
@@ -304,13 +304,14 @@ public class DefaultMavenResourcesFiltering
*/
static boolean isPropertiesFile( File file )
{
- return "properties".equals( StringUtils.lowerCase( FileUtils.extension( file.getName() ) ) );
+ String extension = StringUtils.lowerCase( FilenameUtils.getExtension( ( file.getName() ) ) );
+ return "properties".equals( extension );
}
private void handleDefaultFilterWrappers( MavenResourcesExecution mavenResourcesExecution )
throws MavenFilteringException
{
- List<FileUtils.FilterWrapper> filterWrappers = new ArrayList<>();
+ List<FilterWrapper> filterWrappers = new ArrayList<>();
if ( mavenResourcesExecution.getFilterWrappers() != null )
{
filterWrappers.addAll( mavenResourcesExecution.getFilterWrappers() );
@@ -450,7 +451,7 @@ public class DefaultMavenResourcesFiltering
try ( StringWriter writer = new StringWriter() )
{
- IOUtil.copy( reader, writer );
+ IOUtils.copy( reader, writer );
String filteredFilename = writer.toString();
if ( getLogger().isDebugEnabled() )
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
index 2eb0220..249aa79 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
@@ -22,6 +22,7 @@ package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.Reader;
import java.io.StringReader;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -29,10 +30,9 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Properties;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.project.MavenProject;
-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.PlexusTestCase;
/**
@@ -50,10 +50,7 @@ public class DefaultMavenFileFilterTest
throws Exception
{
super.setUp();
- if ( to.exists() )
- {
- FileUtils.forceDelete( to );
- }
+ Files.deleteIfExists( to.toPath() );
}
public void testNotOverwriteFile()
@@ -149,9 +146,10 @@ public class DefaultMavenFileFilterTest
List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers( req );
- Reader reader = wrappers.get( 0 ).getReader( new StringReader( "${filefilter} ${buildfilter}" ) );
-
- assertEquals( "true true", IOUtil.toString( reader ) );
+ try ( Reader reader = wrappers.get( 0 ).getReader( new StringReader( "${filefilter} ${buildfilter}" ) ) )
+ {
+ assertEquals( "true true", IOUtils.toString( reader ) );
+ }
}
// MSHARED-198: custom delimiters doesn't work as expected
@@ -169,10 +167,10 @@ public class DefaultMavenFileFilterTest
List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers( req );
Reader reader = wrappers.get( 0 ).getReader( new StringReader( "aaaFILTER.a.MEaaa" ) );
- assertEquals( "DONE", IOUtil.toString( reader ) );
+ assertEquals( "DONE", IOUtils.toString( reader ) );
reader = wrappers.get( 0 ).getReader( new StringReader( "abcFILTER.a.MEabc" ) );
- assertEquals( "DONE", IOUtil.toString( reader ) );
+ assertEquals( "DONE", IOUtils.toString( reader ) );
}
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the same line, the first one being left open
@@ -188,7 +186,9 @@ public class DefaultMavenFileFilterTest
List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers( req );
- Reader reader = wrappers.get( 0 ).getReader( new StringReader( "toto@titi.com ${foo}" ) );
- assertEquals( "toto@titi.com bar", IOUtil.toString( reader ) );
+ try ( Reader reader = wrappers.get( 0 ).getReader( new StringReader( "toto@titi.com ${foo}" ) ) )
+ {
+ assertEquals( "toto@titi.com bar", IOUtils.toString( reader ) );
+ }
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
index f440b25..49d6ec6 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
@@ -23,7 +23,7 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.Properties;
-import org.apache.maven.shared.utils.io.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -35,7 +35,6 @@ public class DefaultMavenReaderFilterTest
public void testJustDoSomeFiltering()
throws Exception
{
- assertNotNull( DefaultMavenReaderFilter.class );
MavenReaderFilter readerFilter = lookup( MavenReaderFilter.class );
StringReader src = new StringReader( "toto@titi.com ${foo}" );
@@ -46,8 +45,9 @@ public class DefaultMavenReaderFilterTest
req.setFiltering( true );
req.setAdditionalProperties( additionalProperties );
- final Reader filter = readerFilter.filter( req );
-
- assertEquals( "toto@titi.com bar", IOUtil.toString( filter ) );
+ try ( Reader filter = readerFilter.filter( req ) )
+ {
+ assertEquals( "toto@titi.com bar", IOUtils.toString( filter ) );
+ }
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
index 253634a..90b37ab 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -22,17 +22,17 @@ package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.settings.Settings;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
import org.codehaus.plexus.interpolation.ValueSource;
@@ -55,7 +55,7 @@ public class DefaultMavenResourcesFilteringTest
super.setUp();
if ( outputDirectory.exists() )
{
- FileUtils.forceDelete( outputDirectory );
+ FileUtils.deleteDirectory( outputDirectory );
}
outputDirectory.mkdirs();
}
@@ -383,34 +383,28 @@ public class DefaultMavenResourcesFilteringTest
assertTrue( filesAreIdentical( initialImageFile, imageFile ) );
}
- public static boolean filesAreIdentical( File expected, File current )
+ private static boolean filesAreIdentical( File expected, File current )
throws IOException
{
if ( expected.length() != current.length() )
{
return false;
}
-
- try ( FileInputStream expectedIn = new FileInputStream( expected );
- FileInputStream currentIn = new FileInputStream( current ) )
- {
-
- byte[] expectedBuffer = IOUtil.toByteArray( expectedIn );
- byte[] currentBuffer = IOUtil.toByteArray( currentIn );
- if ( expectedBuffer.length != currentBuffer.length )
+ byte[] expectedBuffer = Files.readAllBytes( expected.toPath() );
+ byte[] currentBuffer = Files.readAllBytes( current.toPath() );
+ if ( expectedBuffer.length != currentBuffer.length )
+ {
+ return false;
+ }
+ for ( int i = 0, size = expectedBuffer.length; i < size; i++ )
+ {
+ if ( expectedBuffer[i] != currentBuffer[i] )
{
return false;
}
- for ( int i = 0, size = expectedBuffer.length; i < size; i++ )
- {
- if ( expectedBuffer[i] != currentBuffer[i] )
- {
- return false;
- }
- }
}
- return true;
+ return true;
}
public void testIncludeOneFile()
@@ -758,12 +752,12 @@ public class DefaultMavenResourcesFilteringTest
File dir1 = new File( sourceDirectory, "dir1" );
dir1.mkdirs();
- FileUtils.fileWrite( new File( dir1, "foo.txt" ), "UTF-8", "This is a Test File" );
+ FileUtils.write( new File( dir1, "foo.txt" ), "This is a Test File", "UTF-8" );
File emptyDirectory = new File( sourceDirectory, "empty-directory" );
emptyDirectory.mkdirs();
- FileUtils.fileWrite( new File( emptyDirectory, ".gitignore" ), "UTF-8", "# .gitignore file" );
+ FileUtils.write( new File( emptyDirectory, ".gitignore" ), "# .gitignore file", "UTF-8" );
File emptyDirectoryChild = new File( sourceDirectory, "empty-directory-child" );
emptyDirectory.mkdirs();
@@ -771,7 +765,7 @@ public class DefaultMavenResourcesFilteringTest
File emptyDirectoryChildEmptyChild = new File( emptyDirectoryChild, "empty-child" );
emptyDirectoryChildEmptyChild.mkdirs();
- FileUtils.fileWrite( new File( emptyDirectoryChildEmptyChild, ".gitignore" ), "UTF-8", "# .gitignore file" );
+ FileUtils.write( new File( emptyDirectoryChildEmptyChild, ".gitignore" ), "# .gitignore file", "UTF-8" );
}
/**
diff --git a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
index 535d49c..7d0b426 100644
--- a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
@@ -20,15 +20,14 @@ package org.apache.maven.shared.filtering;
*/
import java.io.File;
-import java.io.FileInputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.model.Resource;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -49,7 +48,7 @@ public class EscapeStringTest
super.setUp();
if ( outputDirectory.exists() )
{
- FileUtils.forceDelete( outputDirectory );
+ FileUtils.deleteDirectory( outputDirectory );
}
outputDirectory.mkdirs();
}
@@ -89,11 +88,9 @@ public class EscapeStringTest
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
- try ( FileInputStream in = new FileInputStream( new File( outputDirectory, "content.xml" ) ) )
- {
- String content = IOUtil.toString( in );
- assertTrue( content.contains( "<broken-tag>Content with replacement: I am the replacement !</broken-tag>" ) );
- assertTrue( content.contains( "<broken-tag>Content with escaped replacement: Do not ${replaceThis} !</broken-tag>" ) );
- }
+ File file = new File( outputDirectory, "content.xml" );
+ String content = FileUtils.readFileToString( file, StandardCharsets.UTF_8 );
+ assertTrue( content.contains( "<broken-tag>Content with replacement: I am the replacement !</broken-tag>" ) );
+ assertTrue( content.contains( "<broken-tag>Content with escaped replacement: Do not ${replaceThis} !</broken-tag>" ) );
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
index 2234dc5..0353ec5 100644
--- a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
@@ -30,8 +30,8 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.model.Resource;
-import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.PlexusTestCase;
import org.sonatype.plexus.build.incremental.ThreadBuildContext;
import org.sonatype.plexus.build.incremental.test.TestIncrementalBuildContext;
@@ -51,7 +51,7 @@ public class IncrementalResourceFilteringTest
super.setUp();
if ( outputDirectory.exists() )
{
- FileUtils.forceDelete( outputDirectory );
+ FileUtils.deleteDirectory( outputDirectory );
}
outputDirectory.mkdirs();
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
index 0fd9042..324e94c 100644
--- a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
@@ -22,8 +22,8 @@ package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.Collections;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.model.Resource;
-import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -41,7 +41,7 @@ public class InvalidMarkTest
super.setUp();
if ( outputDirectory.exists() )
{
- FileUtils.forceDelete( outputDirectory );
+ FileUtils.deleteDirectory( outputDirectory );
}
outputDirectory.mkdirs();
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
index 32a6b66..c3eef47 100644
--- a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
@@ -26,8 +26,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.model.Resource;
-import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -47,7 +47,7 @@ public class MuliLinesMavenResourcesFilteringTest
super.setUp();
if ( outputDirectory.exists() )
{
- FileUtils.forceDelete( outputDirectory );
+ FileUtils.deleteDirectory( outputDirectory );
}
outputDirectory.mkdirs();
}