subject:"\[maven\-shared\-utils\] 01\/01\: \[MSHARED\-826\] Apply Java 7 syntax"

[maven-shared-utils] 01/01: [MSHARED-826] Apply Java 7 syntax

2020-03-25 Thread slachiewicz

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MSHARED-826
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git

commit f15f351599c7d35abcd53c47fca64f6b8196ece2
Author: rfscholte 
AuthorDate: Wed Jun 12 20:26:18 2019 +0200

[MSHARED-826] Apply Java 7 syntax
---
 .../org/apache/maven/shared/utils/PathTool.java|   4 +
 .../apache/maven/shared/utils/PropertyUtils.java   |  92 +++-
 .../org/apache/maven/shared/utils/StringUtils.java |   7 +-
 .../apache/maven/shared/utils/WriterFactory.java   |   1 -
 .../shared/utils/cli/CommandLineCallable.java  |   4 +-
 .../shared/utils/cli/CommandLineException.java |   1 -
 .../utils/cli/CommandLineTimeOutException.java |   1 -
 .../maven/shared/utils/cli/CommandLineUtils.java   |  12 +-
 .../apache/maven/shared/utils/cli/Commandline.java |  35 +---
 .../maven/shared/utils/cli/DefaultConsumer.java|   5 -
 .../maven/shared/utils/cli/StreamFeeder.java   |   1 -
 .../maven/shared/utils/cli/StreamPumper.java   |   1 +
 .../shared/utils/cli/WriterStreamConsumer.java |   4 -
 .../utils/cli/javatool/AbstractJavaTool.java   |  50 +
 .../cli/javatool/AbstractJavaToolRequest.java  |  16 +-
 .../utils/cli/javatool/JavaToolException.java  |   1 -
 .../maven/shared/utils/cli/shell/BourneShell.java  |  12 +-
 .../maven/shared/utils/cli/shell/CmdShell.java |   1 +
 .../apache/maven/shared/utils/cli/shell/Shell.java |   4 +-
 .../maven/shared/utils/introspection/ClassMap.java |   3 +-
 .../shared/utils/introspection/MethodMap.java  |   9 +-
 .../introspection/ReflectionValueExtractor.java|   1 -
 .../shared/utils/io/DirectoryWalkListener.java |   2 -
 .../maven/shared/utils/io/DirectoryWalker.java |   8 +-
 .../apache/maven/shared/utils/io/FileUtils.java| 233 ++---
 .../org/apache/maven/shared/utils/io/IOUtil.java   |  15 ++
 .../apache/maven/shared/utils/io/Java7Support.java | 171 +++
 .../maven/shared/utils/io/WalkCollector.java   |  10 +-
 .../shared/utils/logging/AnsiMessageBuilder.java   |  17 ++
 .../shared/utils/logging/PlainMessageBuilder.java  |  17 ++
 .../shared/utils/xml/PrettyPrintXMLWriter.java |  14 +-
 .../maven/shared/utils/xml/XmlStreamReader.java|   4 +-
 .../maven/shared/utils/xml/XmlWriterUtil.java  |   3 +-
 .../org/apache/maven/shared/utils/xml/Xpp3Dom.java |   8 +-
 .../maven/shared/utils/xml/Xpp3DomBuilder.java |  21 +-
 .../maven/shared/utils/xml/Xpp3DomUtils.java   |   2 +-
 .../ReflectionValueExtractorTest.java  |   2 +-
 .../shared/utils/testhelpers/ExceptionHelper.java  |   2 +
 .../shared/utils/xml/PrettyPrintXmlWriterTest.java |   1 -
 .../maven/shared/utils/xml/XmlWriterUtilTest.java  |   3 +-
 40 files changed, 253 insertions(+), 545 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/PathTool.java 
b/src/main/java/org/apache/maven/shared/utils/PathTool.java
index b616211..a273f14 100644
--- a/src/main/java/org/apache/maven/shared/utils/PathTool.java
+++ b/src/main/java/org/apache/maven/shared/utils/PathTool.java
@@ -20,6 +20,7 @@ package org.apache.maven.shared.utils;
  */
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.StringTokenizer;
 
 import javax.annotation.Nonnull;
@@ -32,7 +33,10 @@ import javax.annotation.Nullable;
  * This class originally got developed at Apache Anakia and later maintained
  * in maven-utils of Apache Maven-1.
  * Some external fixes by Apache Committers have been applied later.
+ * 
+ * @deprecated Use {@link Path} instead
  */
+@Deprecated
 public class PathTool
 {
 /**
diff --git a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java 
b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
index 4c211d5..6eed0ac 100644
--- a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
@@ -29,8 +29,6 @@ import java.util.Properties;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.apache.maven.shared.utils.io.IOUtil;
-
 /**
  *
  */
@@ -108,7 +106,7 @@ public class PropertyUtils
 Properties result = new Properties();
 if ( is != null )
 {
-try
+try ( InputStream in = is )
 {
 result.load( is );
 }
@@ -123,10 +121,6 @@ public class PropertyUtils
 {
 // ignore
 }
-finally
-{
-IOUtil.close( is );
-}
 return null;
 }
 
@@ -145,29 +139,21 @@ public class PropertyUtils
  */
 @Nonnull public static Properties loadOptionalProperties( final @Nullable 
URL url )
 {
-InputStream in = null;
-try
-{
-final Properties properties = new Properties();
+final Properties properties = new Properties();
 
-

[maven-shared-utils] 01/01: [MSHARED-826] Apply Java 7 syntax

2020-03-11 Thread slachiewicz

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MSHARED-826
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git

commit 328fbf5da1220cb17017a49b2b6c39998b964da9
Author: rfscholte 
AuthorDate: Wed Jun 12 20:26:18 2019 +0200

[MSHARED-826] Apply Java 7 syntax
---
 .../org/apache/maven/shared/utils/PathTool.java|   4 +
 .../apache/maven/shared/utils/PropertyUtils.java   |  92 +++-
 .../org/apache/maven/shared/utils/StringUtils.java |   7 +-
 .../apache/maven/shared/utils/WriterFactory.java   |   1 -
 .../shared/utils/cli/CommandLineCallable.java  |   4 +-
 .../shared/utils/cli/CommandLineException.java |   1 -
 .../utils/cli/CommandLineTimeOutException.java |   1 -
 .../maven/shared/utils/cli/CommandLineUtils.java   |  12 +-
 .../apache/maven/shared/utils/cli/Commandline.java |  35 +---
 .../maven/shared/utils/cli/DefaultConsumer.java|   5 -
 .../maven/shared/utils/cli/StreamFeeder.java   |   1 -
 .../maven/shared/utils/cli/StreamPumper.java   |   1 +
 .../shared/utils/cli/WriterStreamConsumer.java |   4 -
 .../utils/cli/javatool/AbstractJavaTool.java   |  50 +
 .../cli/javatool/AbstractJavaToolRequest.java  |  16 +-
 .../utils/cli/javatool/JavaToolException.java  |   1 -
 .../maven/shared/utils/cli/shell/BourneShell.java  |  12 +-
 .../maven/shared/utils/cli/shell/CmdShell.java |   1 +
 .../apache/maven/shared/utils/cli/shell/Shell.java |   4 +-
 .../maven/shared/utils/introspection/ClassMap.java |   3 +-
 .../shared/utils/introspection/MethodMap.java  |   9 +-
 .../introspection/ReflectionValueExtractor.java|   1 -
 .../shared/utils/io/DirectoryWalkListener.java |   2 -
 .../maven/shared/utils/io/DirectoryWalker.java |   8 +-
 .../apache/maven/shared/utils/io/FileUtils.java| 233 ++---
 .../org/apache/maven/shared/utils/io/IOUtil.java   |  15 ++
 .../apache/maven/shared/utils/io/Java7Support.java | 171 +++
 .../maven/shared/utils/io/WalkCollector.java   |  10 +-
 .../shared/utils/logging/AnsiMessageBuilder.java   |  17 ++
 .../shared/utils/logging/PlainMessageBuilder.java  |  17 ++
 .../shared/utils/xml/PrettyPrintXMLWriter.java |  14 +-
 .../maven/shared/utils/xml/XmlStreamReader.java|   4 +-
 .../maven/shared/utils/xml/XmlWriterUtil.java  |   3 +-
 .../org/apache/maven/shared/utils/xml/Xpp3Dom.java |   8 +-
 .../maven/shared/utils/xml/Xpp3DomBuilder.java |  21 +-
 .../maven/shared/utils/xml/Xpp3DomUtils.java   |   2 +-
 .../ReflectionValueExtractorTest.java  |   2 +-
 .../shared/utils/testhelpers/ExceptionHelper.java  |   2 +
 .../shared/utils/xml/PrettyPrintXmlWriterTest.java |   1 -
 .../maven/shared/utils/xml/XmlWriterUtilTest.java  |   3 +-
 40 files changed, 253 insertions(+), 545 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/PathTool.java 
b/src/main/java/org/apache/maven/shared/utils/PathTool.java
index b616211..a273f14 100644
--- a/src/main/java/org/apache/maven/shared/utils/PathTool.java
+++ b/src/main/java/org/apache/maven/shared/utils/PathTool.java
@@ -20,6 +20,7 @@ package org.apache.maven.shared.utils;
  */
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.StringTokenizer;
 
 import javax.annotation.Nonnull;
@@ -32,7 +33,10 @@ import javax.annotation.Nullable;
  * This class originally got developed at Apache Anakia and later maintained
  * in maven-utils of Apache Maven-1.
  * Some external fixes by Apache Committers have been applied later.
+ * 
+ * @deprecated Use {@link Path} instead
  */
+@Deprecated
 public class PathTool
 {
 /**
diff --git a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java 
b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
index 4c211d5..6eed0ac 100644
--- a/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
@@ -29,8 +29,6 @@ import java.util.Properties;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.apache.maven.shared.utils.io.IOUtil;
-
 /**
  *
  */
@@ -108,7 +106,7 @@ public class PropertyUtils
 Properties result = new Properties();
 if ( is != null )
 {
-try
+try ( InputStream in = is )
 {
 result.load( is );
 }
@@ -123,10 +121,6 @@ public class PropertyUtils
 {
 // ignore
 }
-finally
-{
-IOUtil.close( is );
-}
 return null;
 }
 
@@ -145,29 +139,21 @@ public class PropertyUtils
  */
 @Nonnull public static Properties loadOptionalProperties( final @Nullable 
URL url )
 {
-InputStream in = null;
-try
-{
-final Properties properties = new Properties();
+final Properties properties = new Properties();
 
-

[maven-shared-utils] 01/01: [MSHARED-826] Apply Java 7 syntax

2019-06-12 Thread rfscholte

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSHARED-826
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git

commit 392c19c947db0085e47650d1443e0491b378cbb3
Author: rfscholte 
AuthorDate: Wed Jun 12 20:26:18 2019 +0200

[MSHARED-826] Apply Java 7 syntax
---
 .../java/org/apache/maven/shared/utils/Expand.java |  26 +--
 .../org/apache/maven/shared/utils/PathTool.java|   4 +
 .../apache/maven/shared/utils/PropertyUtils.java   |  92 +++-
 .../org/apache/maven/shared/utils/StringUtils.java |   7 +-
 .../apache/maven/shared/utils/WriterFactory.java   |   1 -
 .../shared/utils/cli/CommandLineCallable.java  |   4 +-
 .../shared/utils/cli/CommandLineException.java |   1 -
 .../utils/cli/CommandLineTimeOutException.java |   1 -
 .../maven/shared/utils/cli/CommandLineUtils.java   |  12 +-
 .../apache/maven/shared/utils/cli/Commandline.java |  35 +---
 .../maven/shared/utils/cli/DefaultConsumer.java|   5 -
 .../maven/shared/utils/cli/StreamFeeder.java   |   1 -
 .../maven/shared/utils/cli/StreamPumper.java   |   1 +
 .../shared/utils/cli/WriterStreamConsumer.java |   4 -
 .../utils/cli/javatool/AbstractJavaTool.java   |  50 +
 .../cli/javatool/AbstractJavaToolRequest.java  |  16 +-
 .../utils/cli/javatool/JavaToolException.java  |   1 -
 .../maven/shared/utils/cli/shell/BourneShell.java  |  12 +-
 .../maven/shared/utils/cli/shell/CmdShell.java |   1 +
 .../apache/maven/shared/utils/cli/shell/Shell.java |   4 +-
 .../maven/shared/utils/introspection/ClassMap.java |   3 +-
 .../shared/utils/introspection/MethodMap.java  |   9 +-
 .../introspection/ReflectionValueExtractor.java|   1 -
 .../shared/utils/io/DirectoryWalkListener.java |   2 -
 .../maven/shared/utils/io/DirectoryWalker.java |   8 +-
 .../apache/maven/shared/utils/io/FileUtils.java| 233 ++---
 .../org/apache/maven/shared/utils/io/IOUtil.java   |  15 ++
 .../apache/maven/shared/utils/io/Java7Support.java | 171 +++
 .../maven/shared/utils/io/WalkCollector.java   |  10 +-
 .../shared/utils/logging/AnsiMessageBuilder.java   |  17 ++
 .../shared/utils/logging/PlainMessageBuilder.java  |  17 ++
 .../maven/shared/utils/reflection/Reflector.java   |  52 +
 .../shared/utils/xml/PrettyPrintXMLWriter.java |  14 +-
 .../maven/shared/utils/xml/XmlStreamReader.java|   4 +-
 .../maven/shared/utils/xml/XmlWriterUtil.java  |   3 +-
 .../org/apache/maven/shared/utils/xml/Xpp3Dom.java |   8 +-
 .../maven/shared/utils/xml/Xpp3DomBuilder.java |  21 +-
 .../maven/shared/utils/xml/Xpp3DomUtils.java   |   2 +-
 .../shared/utils/cli/CommandLineUtilsTest.java |   1 -
 .../ReflectionValueExtractorTest.java  |   2 +-
 .../shared/utils/testhelpers/ExceptionHelper.java  |   2 +
 .../shared/utils/xml/PrettyPrintXmlWriterTest.java |   1 -
 .../maven/shared/utils/xml/XmlWriterUtilTest.java  |   3 +-
 43 files changed, 263 insertions(+), 614 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/utils/Expand.java 
b/src/main/java/org/apache/maven/shared/utils/Expand.java
index 28c01ed..8eb2bc3 100644
--- a/src/main/java/org/apache/maven/shared/utils/Expand.java
+++ b/src/main/java/org/apache/maven/shared/utils/Expand.java
@@ -30,7 +30,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
 
 /**
  * Expand will unpack the given zip archive.
@@ -126,11 +125,8 @@ class Expand
 destDir = new File( System.getProperty( "user.dir" ) );
 }
 
-ZipInputStream in = null;
-try
+try ( ZipInputStream in = new ZipInputStream( new FileInputStream( 
srcFile ) ) )
 {
-in = new ZipInputStream( new FileInputStream( srcFile ) );
-
 for ( ZipEntry zipEntry = in.getNextEntry(); zipEntry != null; 
zipEntry = in.getNextEntry() )
 {
 String zipEntryName = zipEntry.getName();
@@ -138,13 +134,6 @@ class Expand
 
 extractFile( source, destDir, in, zipEntryName, zipEntryDate, 
zipEntry.isDirectory() );
 }
-
-in.close();
-in = null;
-}
-finally
-{
-IOUtil.close( in );
 }
 }
 
@@ -188,23 +177,14 @@ class Expand
 else
 {
 byte[] buffer = new byte[BUFFER_SIZE];
-OutputStream out = null;
-try
+
+try ( OutputStream out = new FileOutputStream( targetFile ) )
 {
-out = new FileOutputStream( targetFile );
-
 int len;
 while ( ( len = compressedInputStream.read( buffer ) ) >= 
0 )
 {
 out.write( buffer, 0, len );
 }
-
-

[maven-shared-utils] 01/01: [MSHARED-826] Apply Java 7 syntax

[maven-shared-utils] 01/01: [MSHARED-826] Apply Java 7 syntax

[maven-shared-utils] 01/01: [MSHARED-826] Apply Java 7 syntax

3 matches

Site Navigation

Mail list logo

Footer information