You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2020/05/28 21:00:18 UTC
[maven-filtering] branch master updated: just nit changes
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
The following commit(s) were added to refs/heads/master by this push:
new 2888788 just nit changes
2888788 is described below
commit 28887880e05e02ea90054e005dd543ec5aa9fb63
Author: olivier lamy <ol...@apache.org>
AuthorDate: Fri May 29 07:00:02 2020 +1000
just nit changes
Signed-off-by: olivier lamy <ol...@apache.org>
---
.../filtering/DefaultMavenResourcesFiltering.java | 20 +++++++++-----------
.../apache/maven/shared/filtering/PropertyUtils.java | 5 +++--
2 files changed, 12 insertions(+), 13 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 da690c3..ab73c41 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -149,7 +149,7 @@ public class DefaultMavenResourcesFiltering
if ( getLogger().isDebugEnabled() )
{
- String ls = System.getProperty( "line.separator" );
+ String ls = System.lineSeparator();
StringBuilder debugMessage =
new StringBuilder( "resource with targetPath " ).append( resource.getTargetPath() ).append( ls );
debugMessage.append( "directory " ).append( resource.getDirectory() ).append( ls );
@@ -400,24 +400,22 @@ public class DefaultMavenResourcesFiltering
reader = wrapper.getReader( reader );
}
- StringWriter writer = new StringWriter();
-
- try
+ try ( StringWriter writer = new StringWriter() )
{
IOUtil.copy( reader, writer );
+ String filteredFilename = writer.toString();
+
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "renaming filename " + name + " to " + filteredFilename );
+ }
+ return filteredFilename;
}
catch ( IOException e )
{
throw new MavenFilteringException( "Failed filtering filename" + name, e );
}
- String filteredFilename = writer.toString();
-
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "renaming filename " + name + " to " + filteredFilename );
- }
- return filteredFilename;
}
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
index 7e8e61f..8e81598 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -20,9 +20,10 @@ package org.apache.maven.shared.filtering;
*/
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
@@ -87,7 +88,7 @@ public final class PropertyUtils
final Properties fileProps = new Properties();
- try ( FileInputStream inStream = new FileInputStream( propFile ) )
+ try ( InputStream inStream = Files.newInputStream( propFile.toPath() ) )
{
fileProps.load( inStream );
}