Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MPDF-92] Require Java 7 at runtime #3

Closed
wants to merge 1 commit into from
Closed

[MPDF-92] Require Java 7 at runtime #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Expand Up @@ -92,6 +92,7 @@ under the License.
<doxiaVersion>1.9-SNAPSHOT</doxiaVersion>
<doxiaSitetoolsVersion>1.8.1</doxiaSitetoolsVersion>
<mavenVersion>2.2.1</mavenVersion>
<javaVersion>7</javaVersion>
</properties>

<dependencyManagement>
Expand Down
27 changes: 10 additions & 17 deletions src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java
View file
Open in desktop
Expand Up @@ -114,7 +114,6 @@ public DocumentModel readAndFilterDocumentDescriptor( File docDescriptor )
}
}

Reader reader = null;
try
{
// System properties
Expand Down Expand Up @@ -149,31 +148,25 @@ public Object getValue( final String expression )
final DateBean bean = new DateBean();
interpolator.addValueSource( new ObjectBasedValueSource( bean ) );

reader = ReaderFactory.newXmlReader( docDescriptor );

final String interpolatedDoc = interpolator.interpolate( IOUtil.toString( reader ) );
try ( Reader reader = ReaderFactory.newXmlReader( docDescriptor ) )
{
final String interpolatedDoc = interpolator.interpolate( IOUtil.toString( reader ) );

reader.close();
reader = null;
if ( log != null && log.isDebugEnabled() )
{
log.debug( "Interpolated document descriptor ("
+ docDescriptor.getAbsolutePath() + ")\n" + interpolatedDoc );
}

if ( log != null && log.isDebugEnabled() )
{
log.debug( "Interpolated document descriptor ("
+ docDescriptor.getAbsolutePath() + ")\n" + interpolatedDoc );
// No Strict
return new DocumentXpp3Reader().read( new StringReader( interpolatedDoc ), false );
}

// No Strict
return new DocumentXpp3Reader().read( new StringReader( interpolatedDoc ), false );
}
catch ( InterpolationException e )
{
final IOException io = new IOException( "Error interpolating document descriptor" );
io.initCause( e );
throw io;
}
finally
{
IOUtil.close( reader );
}
}
}
12 changes: 3 additions & 9 deletions src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
View file
Open in desktop
Expand Up @@ -35,7 +35,6 @@
import org.apache.maven.doxia.site.decoration.MenuItem;
import org.apache.maven.model.Developer;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.apache.commons.io.input.XmlStreamReader;

Expand Down Expand Up @@ -219,7 +218,7 @@ private static List<DocumentAuthor> getAuthors( MavenProject project )
return null;
}

final List<DocumentAuthor> ret = new ArrayList<DocumentAuthor>( 4 );
final List<DocumentAuthor> ret = new ArrayList<>( 4 );

for ( Object o : project.getDevelopers() )
{
Expand Down Expand Up @@ -305,21 +304,16 @@ private static String getProjectModelEncoding( MavenProject project )
}

String encoding = project.getModel().getModelEncoding();

// Workaround for MNG-4289
XmlStreamReader reader = null;
try
try ( XmlStreamReader reader = new XmlStreamReader( project.getFile() ) )
{
reader = new XmlStreamReader( project.getFile() );
encoding = reader.getEncoding();
}
catch ( IOException e )
{
// nop
}
finally
{
IOUtil.close( reader );
}

if ( StringUtils.isEmpty( encoding ) )
{
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/apache/maven/plugins/pdf/PdfAggregateMojo.java
View file
Open in desktop
Expand Up @@ -86,7 +86,6 @@ protected boolean isIncludeReports()
}

protected void prepareTempSiteDirectory( final File tmpSiteDir )
throws IOException
{
tmpSiteDir.mkdirs();
}
Expand Down Expand Up @@ -202,7 +201,7 @@ private Map<String, Object> loadToc( MavenProject project )
catch ( IOException e )
{
getLog().error( "Error while reading table of contents of module " + project.getArtifactId(), e );
return Collections.<String, Object>emptyMap();
return Collections.emptyMap();
}
}

Expand All @@ -224,7 +223,7 @@ private void addTOCItems( DocumentTOCItem parent, Map<String, Object> item, Stri

private String getStagedId( MavenProject p )
{
Deque<String> projectPath = new ArrayDeque<String>();
Deque<String> projectPath = new ArrayDeque<>();
projectPath.addFirst( p.getArtifactId() );
while ( p.getParent() != null )
{
Expand Down
78 changes: 11 additions & 67 deletions src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
View file
Open in desktop
Expand Up @@ -812,16 +812,10 @@ private DecorationModel getDefaultDecorationModel()

if ( descriptorFile.exists() )
{
XmlStreamReader reader = null;
try
try ( XmlStreamReader reader = new XmlStreamReader( descriptorFile ) )
{
reader = new XmlStreamReader( descriptorFile );

String siteDescriptorContent = IOUtil.toString( reader );

reader.close();
reader = null;

siteDescriptorContent =
siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, String>( 2 ), project,
siteDescriptorContent );
Expand All @@ -840,10 +834,6 @@ private DecorationModel getDefaultDecorationModel()
{
throw new MojoExecutionException( "Error when interpoling site descriptor", e );
}
finally
{
IOUtil.close( reader );
}
}

this.defaultDecorationModel = decoration;
Expand Down Expand Up @@ -938,24 +928,16 @@ private void debugLogGeneratedModel( final DocumentModel docModel )
final File doc = FileUtils.createTempFile( "pdf", ".xml", outputDir );
final DocumentXpp3Writer xpp3 = new DocumentXpp3Writer();

Writer w = null;
try
try ( Writer writer = WriterFactory.newXmlWriter( doc ) )
{
w = WriterFactory.newXmlWriter( doc );
xpp3.write( w, docModel );
w.close();
w = null;
xpp3.write( writer, docModel );
getLog().debug( "Generated a default document model: " + doc.getAbsolutePath() );
}
catch ( IOException e )
{
getLog().error( "Failed to write document model: " + e.getMessage() );
getLog().debug( e );
}
finally
{
IOUtil.close( w );
}
}
}

Expand Down Expand Up @@ -1174,7 +1156,7 @@ private List<MavenReport> getGeneratedMavenReports( Locale locale )
{
if ( this.generatedMavenReports == null )
{
this.generatedMavenReports = new HashMap<Locale, List<MavenReport>>( 2 );
this.generatedMavenReports = new HashMap<>( 2 );
}

if ( this.generatedMavenReports.get( locale ) == null )
Expand Down Expand Up @@ -1216,9 +1198,9 @@ protected void appendGeneratedReports( DocumentModel model, Locale locale )
documentTOCItem.setName( i18n.getString( "pdf-plugin", locale, "toc.project-info.item" ) );
documentTOCItem.setRef( "project-info" ); // see #generateMavenReports(Locale)

List<String> addedRef = new ArrayList<String>( 4 );
List<String> addedRef = new ArrayList<>( 4 );

List<DocumentTOCItem> items = new ArrayList<DocumentTOCItem>( 4 );
List<DocumentTOCItem> items = new ArrayList<>( 4 );

// append generated report defined as MavenReport
for ( final MavenReport report : getGeneratedMavenReports( locale ) )
Expand Down Expand Up @@ -1311,15 +1293,9 @@ private String getGeneratedDocumentTitle( final File f )
final IndexEntry entry = new IndexEntry( "index" );
final IndexingSink titleSink = new IndexingSink( entry );

Reader reader = null;
try
try ( Reader reader = ReaderFactory.newXmlReader( f ) )
{
reader = ReaderFactory.newXmlReader( f );

doxia.parse( reader, f.getParentFile().getName(), titleSink );

reader.close();
reader = null;
}
catch ( ParseException e )
{
Expand All @@ -1333,10 +1309,6 @@ private String getGeneratedDocumentTitle( final File f )
getLog().debug( e );
return null;
}
finally
{
IOUtil.close( reader );
}

return titleSink.getTitle();
}
Expand All @@ -1353,15 +1325,9 @@ private String getGeneratedDocumentTitle( final File f )
private boolean isValidGeneratedReportXdoc( String fullGoal, File generatedReport, String localReportName )
{
SinkAdapter sinkAdapter = new SinkAdapter();
Reader reader = null;
try
try ( Reader reader = ReaderFactory.newXmlReader( generatedReport ) )
{
reader = ReaderFactory.newXmlReader( generatedReport );

doxia.parse( reader, "xdoc", sinkAdapter );

reader.close();
reader = null;
}
catch ( ParseException e )
{
Expand Down Expand Up @@ -1403,10 +1369,6 @@ private boolean isValidGeneratedReportXdoc( String fullGoal, File generatedRepor

return false;
}
finally
{
IOUtil.close( reader );
}

return true;
}
Expand Down Expand Up @@ -1494,24 +1456,15 @@ protected static String getMavenVersion()
// if this ever changes, we will have to revisit this code.
final Properties properties = new Properties();

InputStream in = null;
try
try ( InputStream in = MavenProject.class.getClassLoader().getResourceAsStream(
"META-INF/maven/org.apache.maven/maven-core/pom.properties" ) )
{
in = MavenProject.class.getClassLoader().getResourceAsStream( "META-INF/maven/org.apache.maven/maven-core/"
+ "pom.properties" );

properties.load( in );
in.close();
in = null;
}
catch ( IOException ioe )
{
return "";
}
finally
{
IOUtil.close( in );
}

return properties.getProperty( "version" ).trim();
}
Expand Down Expand Up @@ -1539,19 +1492,10 @@ private static void writeGeneratedReport( String content, File toFile )
return;
}

Writer writer = null;
try
try ( Writer writer = WriterFactory.newXmlWriter( toFile ) )
{
writer = WriterFactory.newXmlWriter( toFile );
// see PdfSink#table()
writer.write( StringUtils.replace( content, "<table><table", "<table" ) );

writer.close();
writer = null;
}
finally
{
IOUtil.close( writer );
}
}

Expand Down
19 changes: 2 additions & 17 deletions src/main/java/org/apache/maven/plugins/pdf/TocFileHelper.java
View file
Open in desktop
Expand Up @@ -28,7 +28,6 @@

import org.apache.maven.doxia.document.DocumentTOC;
import org.apache.maven.doxia.document.DocumentTOCItem;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
import org.kopitubruk.util.json.IndentPadding;
Expand All @@ -55,33 +54,19 @@ static void saveTOC( File workingDirectory, DocumentTOC toc, Locale locale )
jsonConfig.addReflectClass( DocumentTOC.class );
jsonConfig.addReflectClass( DocumentTOCItem.class );

Writer writer = null;
try
try ( Writer writer = WriterFactory.newWriter( getTocFile( workingDirectory ), "UTF-8" ) )
{
writer = WriterFactory.newWriter( getTocFile( workingDirectory ), "UTF-8" );
JSONUtil.toJSON( toc, jsonConfig, writer );
writer.close();
writer = null;
}
finally
{
IOUtil.close( writer );
}
}

static Map<String, Object> loadToc( File workingDirectory )
throws IOException
{
Reader reader = null;
try
try ( Reader reader = ReaderFactory.newReader( getTocFile( workingDirectory ), "UTF-8" ) )
{
reader = ReaderFactory.newReader( getTocFile( workingDirectory ), "UTF-8" );
return (Map) JSONParser.parseJSON( reader );
}
finally
{
IOUtil.close( reader );
}
}

private static File getTocFile( File workingDirectory )
Expand Down
14 changes: 2 additions & 12 deletions src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
View file
Open in desktop
Expand Up @@ -118,19 +118,9 @@ private void assertFirstDocumentAuthor( DocumentAuthor author )
private DecorationModel getDecorationModelFromFile( File descriptorFile )
throws IOException, XmlPullParserException
{
Reader reader = null;

try
{
reader = ReaderFactory.newXmlReader( descriptorFile );
final DecorationModel decorationModel = new DecorationXpp3Reader().read( reader );
reader.close();
reader = null;
return decorationModel;
}
finally
try ( Reader reader = ReaderFactory.newXmlReader( descriptorFile ) )
{
IOUtil.close( reader );
return new DecorationXpp3Reader().read( reader );
}
}

Expand Down