You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/08/05 06:10:08 UTC
[maven-script-interpreter] 01/01: Drop dependency to
maven-shared-utils
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch shared-utils
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
commit 804fba24e1b013da11c6e64afca946c4bb0a7886
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Aug 5 08:09:53 2020 +0200
Drop dependency to maven-shared-utils
---
pom.xml | 6 +++---
.../maven/shared/scriptinterpreter/FileLogger.java | 8 +++-----
.../shared/scriptinterpreter/ScriptRunner.java | 20 ++++++++++++++------
.../shared/scriptinterpreter/FileLoggerTest.java | 6 +++---
.../shared/scriptinterpreter/ScriptRunnerTest.java | 22 +++++++++++-----------
5 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index 80a799b..27d1092 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,9 +61,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- <version>3.2.1</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
index b915090..d60433e 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
@@ -19,8 +19,6 @@ package org.apache.maven.shared.scriptinterpreter;
* under the License.
*/
-import org.apache.maven.shared.utils.io.IOUtil;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -128,10 +126,10 @@ public class FileLogger implements ExecutionLogger, AutoCloseable
if ( stream != null )
{
stream.flush();
+ stream.close();
+ stream = null;
}
-
- IOUtil.close( stream );
- }
+ }
private static class MirrorStreamWrapper extends OutputStream
{
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
index a3f0f2e..7cd4a7f 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
@@ -19,14 +19,14 @@ package org.apache.maven.shared.scriptinterpreter;
* under the License.
*/
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -115,7 +115,7 @@ public class ScriptRunner
*/
public void setScriptEncoding( String encoding )
{
- this.encoding = StringUtils.isNotEmpty( encoding ) ? encoding : null;
+ this.encoding = ( encoding != null && encoding.length() > 0 ) ? encoding : null;
}
/**
@@ -150,7 +150,7 @@ public class ScriptRunner
}
LOG.info( "run {} {}.{}",
- scriptDescription, relativeScriptPath, FileUtils.extension( scriptFile.getAbsolutePath() ) );
+ scriptDescription, relativeScriptPath, FilenameUtils.getExtension( scriptFile.getAbsolutePath() ) );
executeRun( scriptDescription, scriptFile, context, logger );
}
@@ -196,7 +196,15 @@ public class ScriptRunner
String script;
try
{
- script = FileUtils.fileRead( scriptFile, encoding );
+ byte[] bytes = Files.readAllBytes( scriptFile.toPath() );
+ if ( encoding != null )
+ {
+ script = new String( bytes, encoding );
+ }
+ else
+ {
+ script = new String( bytes );
+ }
}
catch ( IOException e )
{
@@ -275,7 +283,7 @@ public class ScriptRunner
*/
private ScriptInterpreter getInterpreter( File scriptFile )
{
- String ext = FileUtils.extension( scriptFile.getName() ).toLowerCase( Locale.ENGLISH );
+ String ext = FilenameUtils.getExtension( scriptFile.getName() ).toLowerCase( Locale.ENGLISH );
ScriptInterpreter interpreter = scriptInterpreters.get( ext );
if ( interpreter == null )
{
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java
index 8eee66c..2ed12a0 100644
--- a/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java
+++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/FileLoggerTest.java
@@ -19,11 +19,11 @@ package org.apache.maven.shared.scriptinterpreter;
* under the License.
*/
-import org.apache.maven.shared.utils.io.FileUtils;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -99,7 +99,7 @@ public class FileLoggerTest
}
assertTrue( outputFile.exists() );
- assertEquals( EXPECTED_LOG, FileUtils.fileRead( outputFile ) );
+ assertEquals( EXPECTED_LOG, new String( Files.readAllBytes(outputFile.toPath())) );
}
@Test
@@ -124,6 +124,6 @@ public class FileLoggerTest
assertEquals( EXPECTED_LOG, mirrorHandler.getLoggedMessage() );
assertTrue( outputFile.exists() );
- assertEquals( EXPECTED_LOG, FileUtils.fileRead( outputFile ) );
+ assertEquals( EXPECTED_LOG, new String( Files.readAllBytes(outputFile.toPath())) );
}
}
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
index 5437020..07df376 100644
--- a/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
+++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/ScriptRunnerTest.java
@@ -19,10 +19,10 @@ package org.apache.maven.shared.scriptinterpreter;
* under the License.
*/
-import org.apache.maven.shared.utils.io.FileUtils;
import org.junit.Test;
import java.io.File;
+import java.nio.file.Files;
import java.util.HashMap;
import java.util.Map;
@@ -55,7 +55,7 @@ public class ScriptRunnerTest
buildContext(), fileLogger );
}
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/bsh-test/verify.bsh" ).getPath() ) );
assertTrue( logContent.contains( "foo=bar" ) );
assertTrue( logContent.contains( "globalVar=Yeah baby it's rocks" ) );
@@ -81,7 +81,7 @@ public class ScriptRunnerTest
"return-null", null, fileLogger );
}
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/bsh-test/return-null.bsh" ).getPath() ) );
assertTrue( logContent.contains( "ok with null result" ) );
assertEquals( logContent, mirrorHandler.getLoggedMessage() );
@@ -112,7 +112,7 @@ public class ScriptRunnerTest
}
assertNotNull( catchedException );
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/bsh-test/failed.bsh" ).getPath() ) );
assertEquals( logContent, mirrorHandler.getLoggedMessage() );
}
@@ -143,7 +143,7 @@ public class ScriptRunnerTest
assertEquals( "Not true value", catchedException.getResult() );
assertEquals( "The test returned Not true value.", catchedException.getMessage() );
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/bsh-test/return-not-true.bsh" ).getPath() ) );
assertEquals( logContent, mirrorHandler.getLoggedMessage() );
}
@@ -168,7 +168,7 @@ public class ScriptRunnerTest
buildContext(), fileLogger );
}
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/bsh-test/verify.bsh" ).getPath() ) );
assertTrue( logContent.contains( "foo=bar" ) );
@@ -194,7 +194,7 @@ public class ScriptRunnerTest
buildContext(), fileLogger );
}
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue(
logContent.contains( new File( "src/test/resources/groovy-test/verify.groovy" ).getPath() ) );
assertTrue( logContent.contains( "foo=bar" ) );
@@ -222,7 +222,7 @@ public class ScriptRunnerTest
"return-null", null, fileLogger );
}
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue(
logContent.contains( new File( "src/test/resources/groovy-test/return-null.groovy" ).getPath() ) );
assertTrue( logContent.contains( "ok with null result" ) );
@@ -254,7 +254,7 @@ public class ScriptRunnerTest
}
assertNotNull( catchedException );
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/groovy-test/failed.groovy" ).getPath() ) );
assertEquals( logContent, mirrorHandler.getLoggedMessage() );
}
@@ -285,7 +285,7 @@ public class ScriptRunnerTest
assertEquals( false, catchedException.getResult() );
assertEquals( "The test returned false.", catchedException.getMessage() );
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/groovy-test/return-false.groovy" ).getPath() ) );
assertEquals( logContent, mirrorHandler.getLoggedMessage() );
}
@@ -308,7 +308,7 @@ public class ScriptRunnerTest
buildContext(), fileLogger );
}
- String logContent = FileUtils.fileRead( logFile );
+ String logContent = new String( Files.readAllBytes(logFile.toPath()));
assertTrue( logContent.contains( new File( "src/test/resources/groovy-test/verify.groovy" ).getPath() ) );
assertTrue( logContent.contains( "foo=bar" ) );