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 2021/08/22 16:31:59 UTC
[maven-pdf-plugin] 02/02: [MPDF-98] Require Java 8
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MPDF-98
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 90e59a515c610a86357bacf8bba975397729bc8e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jun 4 10:25:24 2021 +0200
[MPDF-98] Require Java 8
---
pom.xml | 2 +-
.../org/apache/maven/plugins/pdf/DateBean.java | 4 ++--
.../maven/plugins/pdf/DocumentModelBuilder.java | 4 +---
.../apache/maven/plugins/pdf/PdfAggregateMojo.java | 2 +-
.../java/org/apache/maven/plugins/pdf/PdfMojo.java | 23 ++++++++--------------
.../plugins/pdf/DocumentModelBuilderTest.java | 1 -
.../org/apache/maven/plugins/pdf/PdfMojoTest.java | 6 ------
.../pdf/stubs/ModelBuilderMavenProjectStub.java | 5 ++---
8 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index fdad34c..2931e2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@ under the License.
<doxiaVersion>1.10</doxiaVersion>
<doxiaSitetoolsVersion>1.10</doxiaSitetoolsVersion>
<mavenVersion>3.1.1</mavenVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
diff --git a/src/main/java/org/apache/maven/plugins/pdf/DateBean.java b/src/main/java/org/apache/maven/plugins/pdf/DateBean.java
index 15b6d5d..68511ed 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/DateBean.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/DateBean.java
@@ -45,8 +45,8 @@ public class DateBean
private static final SimpleDateFormat SECOND = new SimpleDateFormat( "ss", Locale.US );
private static final SimpleDateFormat MILLI_SECOND = new SimpleDateFormat( "SSS", Locale.US );
private static final SimpleDateFormat DATE = new SimpleDateFormat( "yyyy-MM-dd", Locale.US );
- private static final SimpleDateFormat TIME = new SimpleDateFormat( "HH:mm:ss\'Z\'", Locale.US );
- private static final SimpleDateFormat DATE_TIME = new SimpleDateFormat( "yyyy-MM-dd\'T\'HH:mm:ss\'Z\'", Locale.US );
+ private static final SimpleDateFormat TIME = new SimpleDateFormat( "HH:mm:ss'Z'", Locale.US );
+ private static final SimpleDateFormat DATE_TIME = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US );
static
{
diff --git a/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java b/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
index d37028f..3e30f15 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
@@ -216,10 +216,8 @@ public class DocumentModelBuilder
final List<DocumentAuthor> ret = new ArrayList<>( 4 );
- for ( Object o : project.getDevelopers() )
+ for ( Developer developer : project.getDevelopers() )
{
- final Developer developer = (Developer) o;
-
final DocumentAuthor author = new DocumentAuthor();
author.setName( developer.getName() );
author.setEmail( developer.getEmail() );
diff --git a/src/main/java/org/apache/maven/plugins/pdf/PdfAggregateMojo.java b/src/main/java/org/apache/maven/plugins/pdf/PdfAggregateMojo.java
index 691c8a4..7576320 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/PdfAggregateMojo.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/PdfAggregateMojo.java
@@ -211,7 +211,7 @@ public class PdfAggregateMojo extends PdfMojo
tocItem.setName( (String) item.get( "name" ) );
tocItem.setRef( stagedId + "/" + item.get( "ref" ) );
- List<Map<String, Object>> items = (ArrayList) item.get( "items" );
+ List<Map<String, Object>> items = (List) item.get( "items" );
for ( Map<String, Object> it : items )
{
diff --git a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
index bb601cc..c5b7198 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
@@ -50,9 +50,7 @@ import org.apache.maven.doxia.index.IndexingSink;
import org.apache.maven.doxia.module.xdoc.XdocSink;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
-import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.impl.SinkAdapter;
-import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
import org.apache.maven.doxia.siterenderer.Renderer;
@@ -64,13 +62,11 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.reporting.exec.MavenReportExecution;
@@ -328,7 +324,7 @@ public class PdfMojo
/** {@inheritDoc} */
public void execute()
- throws MojoExecutionException, MojoFailureException
+ throws MojoExecutionException
{
init();
@@ -580,7 +576,7 @@ public class PdfMojo
String excludes = getDefaultExcludesWithLocales( getAvailableLocales(), getDefaultLocale() );
List<String> siteFiles =
siteDirectory.exists() ? FileUtils.getFileNames( siteDirectory, "**/*", excludes, false )
- : new ArrayList<String>();
+ : new ArrayList<>();
File siteDirectoryLocale = new File( siteDirectory, locale.getLanguage() );
if ( !locale.getLanguage().equals( getDefaultLocale().getLanguage() ) && siteDirectoryLocale.exists() )
{
@@ -773,7 +769,7 @@ public class PdfMojo
String siteDescriptorContent = IOUtil.toString( reader );
siteDescriptorContent =
- siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String, String>( 2 ), project,
+ siteTool.getInterpolatedSiteDescriptorContent( new HashMap<>( 2 ), project,
siteDescriptorContent );
decoration = new DecorationXpp3Reader().read( new StringReader( siteDescriptorContent ) );
@@ -839,7 +835,7 @@ public class PdfMojo
try
{
final SiteRenderingContext context =
- siteRenderer.createContextForSkin( skinArtifact, new HashMap<String, Object>( 2 ), decorationModel,
+ siteRenderer.createContextForSkin( skinArtifact, new HashMap<>( 2 ), decorationModel,
project.getName(), locale );
context.addSiteDirectory( new File( siteDirectory, locale.getLanguage() ) );
@@ -1115,10 +1111,7 @@ public class PdfMojo
this.generatedMavenReports = new HashMap<>( 2 );
}
- if ( this.generatedMavenReports.get( locale ) == null )
- {
- this.generatedMavenReports.put( locale, new ArrayList<MavenReport>( 2 ) );
- }
+ this.generatedMavenReports.computeIfAbsent( locale, k -> new ArrayList<>( 2 ) );
return this.generatedMavenReports.get( locale );
}
@@ -1409,16 +1402,16 @@ public class PdfMojo
*/
private static String getDefaultExcludesWithLocales( List<Locale> locales, Locale defaultLocale )
{
- String excludesLocales = FileUtils.getDefaultExcludesAsString();
+ StringBuilder excludesLocales = new StringBuilder( FileUtils.getDefaultExcludesAsString() );
for ( final Locale locale : locales )
{
if ( !locale.getLanguage().equals( defaultLocale.getLanguage() ) )
{
- excludesLocales = excludesLocales + ",**/" + locale.getLanguage() + "/*";
+ excludesLocales.append( ",**/" ).append( locale.getLanguage() ).append( "/*" );
}
}
- return excludesLocales;
+ return excludesLocales.toString();
}
/**
diff --git a/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java b/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
index 84ba98c..f8c2770 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
@@ -33,7 +33,6 @@ import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
import org.apache.maven.plugins.pdf.stubs.ModelBuilderMavenProjectStub;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
diff --git a/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java b/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
index 6d45d81..e6e77ad 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
@@ -37,10 +37,8 @@ public class PdfMojoTest
/**
* Tests the basic functioning of the pdf generation using the FO implementation.
*
- * @throws Exception if any.
*/
public void testPdfMojo()
- throws Exception
{
executePdfMojo( "pom.xml", "fo/maven-pdf-plugin-doc.pdf" );
}
@@ -48,10 +46,8 @@ public class PdfMojoTest
/**
* Tests the basic functioning of the pdf generation with iText.
*
- * @throws Exception if any.
*/
public void testITextImpl()
- throws Exception
{
executePdfMojo( "iText_pom.xml", "itext/maven-pdf-plugin-doc.pdf" );
}
@@ -59,10 +55,8 @@ public class PdfMojoTest
/**
* Tests the basic functioning of the pdf generation using the FO implementation.
*
- * @throws Exception if any.
*/
public void testPdfMojoNoDocDesriptor()
- throws Exception
{
executePdfMojo( "no_docdescriptor_pom.xml", "no/unnamed.pdf" );
}
diff --git a/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
index b74cf35..0883c6c 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
@@ -27,7 +27,6 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.IOUtil;
import org.apache.commons.io.input.XmlStreamReader;
/**
@@ -73,7 +72,7 @@ public class ModelBuilderMavenProjectStub
}
/** {@inheritDoc} */
- public List getDevelopers()
+ public List<Developer> getDevelopers()
{
return getModel().getDevelopers();
}
@@ -85,7 +84,7 @@ public class ModelBuilderMavenProjectStub
}
/** {@inheritDoc} */
- public void setDevelopers( List list )
+ public void setDevelopers( List<Developer> list )
{
getModel().setDevelopers( list );
}