This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-converter.git
The following commit(s) were added to refs/heads/master by this push:
new dc6394c [DOXIATOOLS-61] Move code to Java 7
dc6394c is described below
commit dc6394c10936572c64895222301d6dde43ad8faf
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Oct 12 16:02:17 2019 +0200
[DOXIATOOLS-61] Move code to Java 7
---
.../org/apache/maven/doxia/DefaultConverter.java | 36 +++++--------
.../org/apache/maven/doxia/cli/CLIManager.java | 4 +-
.../org/apache/maven/doxia/util/ConverterUtil.java | 8 +--
.../java/org/apache/maven/doxia/ConverterTest.java | 62 ++++++----------------
4 files changed, 34 insertions(+), 76 deletions(-)
diff --git a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
index 7e6fbfc..270f64d 100644
--- a/src/main/java/org/apache/maven/doxia/DefaultConverter.java
+++ b/src/main/java/org/apache/maven/doxia/DefaultConverter.java
@@ -33,6 +33,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -608,23 +609,20 @@ public class DefaultConverter
+ "' is not a file, could not detect format." );
}
- for ( int i = 0; i < SUPPORTED_FROM_FORMAT.length; i++ )
+ for ( String supportedFromFormat : SUPPORTED_FROM_FORMAT )
{
- String supportedFromFormat = SUPPORTED_FROM_FORMAT[i];
-
// Handle Doxia text files
- if ( supportedFromFormat.equalsIgnoreCase( APT_PARSER )
- && isDoxiaFileName( f, supportedFromFormat ) )
+ if ( supportedFromFormat.equalsIgnoreCase( APT_PARSER ) &&
isDoxiaFileName( f, supportedFromFormat ) )
{
return supportedFromFormat;
}
- else if ( supportedFromFormat.equalsIgnoreCase( CONFLUENCE_PARSER )
- && isDoxiaFileName( f, supportedFromFormat ) )
+ else if ( supportedFromFormat.equalsIgnoreCase( CONFLUENCE_PARSER
) && isDoxiaFileName( f,
+ supportedFromFormat ) )
{
return supportedFromFormat;
}
- else if ( supportedFromFormat.equalsIgnoreCase( TWIKI_PARSER )
- && isDoxiaFileName( f, supportedFromFormat ) )
+ else if ( supportedFromFormat.equalsIgnoreCase( TWIKI_PARSER ) &&
isDoxiaFileName( f,
+ supportedFromFormat ) )
{
return supportedFromFormat;
}
@@ -635,33 +633,27 @@ public class DefaultConverter
{
continue;
}
- else if ( firstTag.equals( "article" )
- && supportedFromFormat.equalsIgnoreCase( DOCBOOK_PARSER ) )
+ else if ( firstTag.equals( "article" ) &&
supportedFromFormat.equalsIgnoreCase( DOCBOOK_PARSER ) )
{
return supportedFromFormat;
}
- else if ( firstTag.equals( "faqs" )
- && supportedFromFormat.equalsIgnoreCase( FML_PARSER ) )
+ else if ( firstTag.equals( "faqs" ) &&
supportedFromFormat.equalsIgnoreCase( FML_PARSER ) )
{
return supportedFromFormat;
}
- else if ( firstTag.equals( "document" )
- && supportedFromFormat.equalsIgnoreCase( XDOC_PARSER ) )
+ else if ( firstTag.equals( "document" ) &&
supportedFromFormat.equalsIgnoreCase( XDOC_PARSER ) )
{
return supportedFromFormat;
}
- else if ( firstTag.equals( "html" )
- && supportedFromFormat.equalsIgnoreCase( XHTML_PARSER ) )
+ else if ( firstTag.equals( "html" ) &&
supportedFromFormat.equalsIgnoreCase( XHTML_PARSER ) )
{
return supportedFromFormat;
}
}
- StringBuilder msg = new StringBuilder();
- msg.append( "Could not detect the Doxia format for file: " );
- msg.append( f.getAbsolutePath() );
- msg.append( "\n Specify explicitly the Doxia format." );
- throw new UnsupportedOperationException( msg.toString() );
+ throw new UnsupportedOperationException(
+ String.format( "Could not detect the Doxia format for file:
%s\n Specify explicitly the Doxia format.",
+ f.getAbsolutePath() ) );
}
/**
diff --git a/src/main/java/org/apache/maven/doxia/cli/CLIManager.java
b/src/main/java/org/apache/maven/doxia/cli/CLIManager.java
index ddaf786..5e513bc 100644
--- a/src/main/java/org/apache/maven/doxia/cli/CLIManager.java
+++ b/src/main/java/org/apache/maven/doxia/cli/CLIManager.java
@@ -190,10 +190,8 @@ class CLIManager
StringBuilder currentArg = null;
- for ( int i = 0; i < args.length; i++ )
+ for ( String arg : args )
{
- String arg = args[i];
-
boolean addedToBuffer = false;
if ( arg.startsWith( "\"" ) )
diff --git a/src/main/java/org/apache/maven/doxia/util/ConverterUtil.java
b/src/main/java/org/apache/maven/doxia/util/ConverterUtil.java
index 2e3c1dd..6877a85 100644
--- a/src/main/java/org/apache/maven/doxia/util/ConverterUtil.java
+++ b/src/main/java/org/apache/maven/doxia/util/ConverterUtil.java
@@ -61,9 +61,9 @@ public class ConverterUtil
Parser parser = null;
- for ( int i = 0; i < supportedFormats.length; i++ )
+ for ( String supportedFormat : supportedFormats )
{
- if ( format.equalsIgnoreCase( supportedFormats[i] ) )
+ if ( format.equalsIgnoreCase( supportedFormat ) )
{
parser = (Parser) plexus.lookup( Parser.ROLE, format );
}
@@ -106,9 +106,9 @@ public class ConverterUtil
SinkFactory factory = null;
- for ( int i = 0; i < supportedFormats.length; i++ )
+ for ( String supportedFormat : supportedFormats )
{
- if ( format.equalsIgnoreCase( supportedFormats[i] ) )
+ if ( format.equalsIgnoreCase( supportedFormat ) )
{
factory = (SinkFactory) plexus.lookup( SinkFactory.ROLE,
format );
}
diff --git a/src/test/java/org/apache/maven/doxia/ConverterTest.java
b/src/test/java/org/apache/maven/doxia/ConverterTest.java
index 71e7b0f..1cf073d 100644
--- a/src/test/java/org/apache/maven/doxia/ConverterTest.java
+++ b/src/test/java/org/apache/maven/doxia/ConverterTest.java
@@ -61,7 +61,7 @@ public class ConverterTest
converter = new DefaultConverter();
- formatOutput = Boolean.valueOf( System.getProperty( "format", "false"
) ).booleanValue();
+ formatOutput = Boolean.parseBoolean( System.getProperty( "format",
"false" ) );
}
/** {@inheritDoc} */
@@ -340,7 +340,7 @@ public class ConverterTest
catch ( ConverterException e )
{
// The TWiki parser is wrong for * <pre>some text</pre>
- if ( e.getMessage().indexOf( "Error validating the model" ) == -1 )
+ if ( !e.getMessage().contains( "Error validating the model" ) )
{
throw e;
}
@@ -441,26 +441,20 @@ public class ConverterTest
File outFile = new File( out );
outFile.getParentFile().mkdirs();
- OutputStream fo = null;
- try
+ try ( OutputStream fo = new FileOutputStream( outFile ) )
{
- fo = new FileOutputStream( outFile );
-
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- InputReaderWrapper input =
- InputReaderWrapper.valueOf( new FileReader( inFile ), from,
converter.getInputFormats() );
- OutputStreamWrapper output = OutputStreamWrapper.valueOf(
outputStream, to, "UTF-8", converter.getOutputFormats() );
+ InputReaderWrapper input = InputReaderWrapper.valueOf( new
FileReader( inFile ), from,
+ converter.getInputFormats() );
+ OutputStreamWrapper output = OutputStreamWrapper.valueOf(
outputStream, to, "UTF-8",
+ converter.getOutputFormats() );
converter.setFormatOutput( formatOutput );
converter.convert( input, output );
IOUtil.copy( outputStream.toByteArray(), fo );
}
- finally
- {
- IOUtil.close( fo );
- }
assertTrue( outFile.exists() );
assertTrue( outFile.length() != 0 );
@@ -484,27 +478,20 @@ public class ConverterTest
File outFile = new File( out );
outFile.getParentFile().mkdirs();
- OutputStream fo = null;
- try
+ try ( OutputStream fo = new FileOutputStream( outFile ) )
{
- fo = new FileOutputStream( outFile );
-
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- InputReaderWrapper input =
- InputReaderWrapper.valueOf( new FileReader( inFile ), from,
converter.getInputFormats() );
- OutputStreamWrapper output =
- OutputStreamWrapper.valueOf( outputStream, to, "UTF-8",
converter.getOutputFormats() );
+ InputReaderWrapper input = InputReaderWrapper.valueOf( new
FileReader( inFile ), from,
+ converter.getInputFormats() );
+ OutputStreamWrapper output = OutputStreamWrapper.valueOf(
outputStream, to, "UTF-8",
+ converter.getOutputFormats() );
converter.setFormatOutput( formatOutput );
converter.convert( input, output );
IOUtil.copy( outputStream.toByteArray(), fo );
}
- finally
- {
- IOUtil.close( fo );
- }
assertTrue( outFile.exists() );
assertTrue( outFile.length() != 0 );
@@ -528,11 +515,8 @@ public class ConverterTest
File outFile = new File( out );
outFile.getParentFile().mkdirs();
- FileWriter fw = null;
- try
+ try (FileWriter fw = new FileWriter( outFile ))
{
- fw = new FileWriter( outFile );
-
StringWriter writer = new StringWriter();
InputFileWrapper input =
@@ -548,10 +532,6 @@ public class ConverterTest
assertTrue( outFile.exists() );
assertTrue( outFile.length() != 0 );
}
- finally
- {
- IOUtil.close( fw );
- }
in = getBasedir() + "/src/test/resources/unit/apt/test.apt";
from = null;
@@ -562,10 +542,8 @@ public class ConverterTest
outFile = new File( out );
outFile.getParentFile().mkdirs();
- try
+ try (FileWriter fw = new FileWriter( outFile ))
{
- fw = new FileWriter( outFile );
-
StringWriter writer = new StringWriter();
InputFileWrapper input =
@@ -581,10 +559,6 @@ public class ConverterTest
assertTrue( outFile.exists() );
assertTrue( outFile.length() != 0 );
}
- finally
- {
- IOUtil.close( fw );
- }
in = getBasedir() + "/src/test/resources/unit/apt/test.unknown";
from = null;
@@ -595,10 +569,8 @@ public class ConverterTest
outFile = new File( out );
outFile.getParentFile().mkdirs();
- try
+ try (FileWriter fw = new FileWriter( outFile ))
{
- fw = new FileWriter( outFile );
-
InputFileWrapper input =
InputFileWrapper.valueOf( inFile.getAbsolutePath(), from,
converter.getInputFormats() );
OutputFileWrapper output =
@@ -613,10 +585,6 @@ public class ConverterTest
{
assertTrue( true );
}
- finally
- {
- IOUtil.close( fw );
- }
}
private String autoDetectEncoding( File f )
