You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by GitBox <gi...@apache.org> on 2018/06/23 20:15:11 UTC
[GitHub] asfgit closed pull request #5: Java 7 code update and IDE hints
fixed
asfgit closed pull request #5: Java 7 code update and IDE hints fixed
URL: https://github.com/apache/maven-project-info-reports-plugin/pull/5
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
index 1243341..edccfa8 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -90,12 +90,6 @@
@Component
protected SiteTool siteTool;
- /**
- * Doxia Site Renderer component.
- */
- @Component
- protected Renderer siteRenderer;
-
/**
* Artifact Resolver component.
*/
@@ -120,21 +114,7 @@
// ----------------------------------------------------------------------
// Mojo parameters
// ----------------------------------------------------------------------
-
- /**
- * The output directory for the report. Note that this parameter is only evaluated if the goal is run directly from
- * the command line. If the goal is run indirectly as part of a site generation, the output directory configured in
- * the Maven Site Plugin is used instead.
- */
- @Parameter( property = "project.reporting.outputDirectory", required = true )
- protected File outputDirectory;
-
- /**
- * The Maven Project.
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- protected MavenProject project;
-
+
@Parameter( defaultValue = "${session}", readonly = true, required = true )
private MavenSession session;
@@ -222,7 +202,7 @@ public void execute()
DecorationModel model = new DecorationModel();
model.setBody( new Body() );
- Map<String, Object> attributes = new HashMap<String, Object>();
+ Map<String, Object> attributes = new HashMap<>();
attributes.put( "outputEncoding", "UTF-8" );
attributes.put( "project", project );
@@ -233,7 +213,8 @@ public void execute()
SiteRenderingContext siteContext = siteRenderer.createContextForSkin( defaultSkin, attributes,
model, getName( locale ), locale );
- RenderingContext context = new RenderingContext( outputDirectory, filename, null );
+ RenderingContext context = new RenderingContext(
+ outputDirectory, null, filename, null, null, false, null );
SiteRendererSink sink = new SiteRendererSink( context );
@@ -250,22 +231,7 @@ public void execute()
writer.close();
writer = null;
}
- catch ( RendererException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
- catch ( SiteToolException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
- catch ( MavenReportException e )
+ catch ( RendererException | IOException | SiteToolException | MavenReportException e )
{
throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+ " report generation.", e );
@@ -345,12 +311,12 @@ protected Plugin getPlugin( String pluginId )
return null;
}
- Plugin plugin = (Plugin) getProject().getBuild().getPluginsAsMap().get( pluginId );
+ Plugin plugin = getProject().getBuild().getPluginsAsMap().get( pluginId );
if ( ( plugin == null ) && ( getProject().getBuild().getPluginManagement() != null )
&& ( getProject().getBuild().getPluginManagement().getPluginsAsMap() != null ) )
{
- plugin = (Plugin) getProject().getBuild().getPluginManagement().getPluginsAsMap().get( pluginId );
+ plugin = getProject().getBuild().getPluginManagement().getPluginsAsMap().get( pluginId );
}
return plugin;
@@ -407,15 +373,12 @@ protected I18N getI18N( Locale locale )
File customBundleFile = new File( customBundle );
if ( customBundleFile.isFile() && customBundleFile.getName().endsWith( ".properties" ) )
{
- if ( !i18n.getClass().isAssignableFrom( CustomI18N.class ) )
+ if ( !i18n.getClass().isAssignableFrom( CustomI18N.class )
+ || !i18n.getDefaultLanguage().equals( locale.getLanguage() ) )
{
// first load
i18n = new CustomI18N( project, settings, customBundleFile, locale, i18n );
}
- else if ( !i18n.getDefaultLanguage().equals( locale.getLanguage() ) )
- {
- i18n = new CustomI18N( project, settings, customBundleFile, locale, i18n );
- }
}
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
index 0b72c7c..02a531a 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -38,13 +38,11 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.report.projectinfo.dependencies.Dependencies;
import org.apache.maven.report.projectinfo.dependencies.DependenciesReportConfiguration;
import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils;
import org.apache.maven.report.projectinfo.dependencies.renderer.DependenciesRenderer;
-import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
import org.apache.maven.shared.dependency.graph.DependencyNode;
@@ -72,12 +70,6 @@
// Mojo components
// ----------------------------------------------------------------------
- /**
- * Maven Project Builder component.
- */
- @Component
- private ProjectBuilder projectBuilder;
-
/**
* Dependency graph builder component.
*
@@ -102,14 +94,6 @@
@Component
private RepositoryMetadataManager repositoryMetadataManager;
- /**
- * Maven Artifact Factory component.
- *
- * @since 2.1
- */
- @Component
- private RepositorySystem repositorySystem;
-
// ----------------------------------------------------------------------
// Mojo parameters
// ----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
index 31697d4..c47376e 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -40,7 +40,6 @@
import org.apache.maven.model.Dependency;
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.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
@@ -84,12 +83,6 @@
// Mojo parameters
// ----------------------------------------------------------------------
- /**
- * The projects in the current build. The effective POM for each of these projects will written.
- */
- @Parameter( property = "reactorProjects", required = true, readonly = true )
- private List<MavenProject> reactorProjects;
-
/**
* Dependency tree builder, will use it to build dependency tree.
*/
@@ -98,7 +91,7 @@
private ArtifactFilter filter = null;
- private Map<MavenProject, DependencyNode> projectMap = new HashMap<MavenProject, DependencyNode>();
+ private Map<MavenProject, DependencyNode> projectMap = new HashMap<>();
// ----------------------------------------------------------------------
// Public methods
@@ -198,7 +191,7 @@ protected void executeReport( Locale locale )
private List<ReverseDependencyLink> getSnapshotDependencies( Map<String, List<ReverseDependencyLink>> dependencyMap )
// CHECKSTYLE_ON: LineLength
{
- List<ReverseDependencyLink> snapshots = new ArrayList<ReverseDependencyLink>();
+ List<ReverseDependencyLink> snapshots = new ArrayList<>();
for ( Map.Entry<String, List<ReverseDependencyLink>> entry : dependencyMap.entrySet() )
{
List<ReverseDependencyLink> depList = entry.getValue();
@@ -283,7 +276,7 @@ private void generateConvergence( Locale locale, Sink sink, DependencyAnalyzeRes
sink.text( dep.getGroupId() + ":" + dep.getArtifactId() );
sink.sectionTitle3_();
- List<ReverseDependencyLink> depList = new ArrayList<ReverseDependencyLink>();
+ List<ReverseDependencyLink> depList = new ArrayList<>();
depList.add( dependencyLink );
generateDependencyDetails( locale, sink, depList );
@@ -354,7 +347,7 @@ private void generateVersionDetails( Sink sink, Map<String, List<ReverseDependen
List<DependencyNode> projectNodes = getProjectNodes( depList );
- if ( projectNodes == null || projectNodes.size() == 0 )
+ if ( projectNodes.isEmpty() )
{
getLog().warn( "Can't find project nodes for dependency list: " + depList.get( 0 ).getDependency() );
return;
@@ -383,7 +376,7 @@ private void generateVersionDetails( Sink sink, Map<String, List<ReverseDependen
private List<DependencyNode> getProjectNodes( List<ReverseDependencyLink> depList )
{
- List<DependencyNode> projectNodes = new ArrayList<DependencyNode>();
+ List<DependencyNode> projectNodes = new ArrayList<>();
for ( ReverseDependencyLink depLink : depList )
{
@@ -426,12 +419,13 @@ private void serializeDependencyTree( DependencyNode rootNode, String key, Sink
visitor = new BuildingDependencyNodeVisitor( visitor );
- DependencyNodeFilter filter = createDependencyNodeFilter( key );
+ DependencyNodeFilter nodeFilter = createDependencyNodeFilter( key );
- if ( filter != null )
+ if ( nodeFilter != null )
{
CollectingDependencyNodeVisitor collectingVisitor = new CollectingDependencyNodeVisitor();
- DependencyNodeVisitor firstPassVisitor = new FilteringDependencyNodeVisitor( collectingVisitor, filter );
+ DependencyNodeVisitor firstPassVisitor = new FilteringDependencyNodeVisitor(
+ collectingVisitor, nodeFilter );
rootNode.accept( firstPassVisitor );
DependencyNodeFilter secondPassFilter =
@@ -449,7 +443,7 @@ private void serializeDependencyTree( DependencyNode rootNode, String key, Sink
*/
private DependencyNodeFilter createDependencyNodeFilter( String includes )
{
- List<DependencyNodeFilter> filters = new ArrayList<DependencyNodeFilter>();
+ List<DependencyNodeFilter> filters = new ArrayList<>();
// filter includes
if ( includes != null )
@@ -494,7 +488,7 @@ public DependencyNodeVisitor getSerializingDependencyNodeVisitor( Sink sink )
*/
private Map<String, List<ReverseDependencyLink>> getSortedUniqueArtifactMap( List<ReverseDependencyLink> depList )
{
- Map<String, List<ReverseDependencyLink>> uniqueArtifactMap = new TreeMap<String, List<ReverseDependencyLink>>();
+ Map<String, List<ReverseDependencyLink>> uniqueArtifactMap = new TreeMap<>();
for ( ReverseDependencyLink rdl : depList )
{
@@ -502,7 +496,7 @@ public DependencyNodeVisitor getSerializingDependencyNodeVisitor( Sink sink )
List<ReverseDependencyLink> projectList = uniqueArtifactMap.get( key );
if ( projectList == null )
{
- projectList = new ArrayList<ReverseDependencyLink>();
+ projectList = new ArrayList<>();
}
projectList.add( rdl );
uniqueArtifactMap.put( key, projectList );
@@ -742,9 +736,8 @@ private void iconError( Locale locale, Sink sink )
private DependencyAnalyzeResult analyzeDependencyTree()
throws MavenReportException
{
- Map<String, List<ReverseDependencyLink>> conflictingDependencyMap =
- new TreeMap<String, List<ReverseDependencyLink>>();
- Map<String, List<ReverseDependencyLink>> allDependencies = new TreeMap<String, List<ReverseDependencyLink>>();
+ Map<String, List<ReverseDependencyLink>> conflictingDependencyMap = new TreeMap<>();
+ Map<String, List<ReverseDependencyLink>> allDependencies = new TreeMap<>();
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest( getSession().getProjectBuildingRequest() );
@@ -812,7 +805,7 @@ private void getConflictingDependencyMap( Map<String, List<ReverseDependencyLink
List<ReverseDependencyLink> dependencyList = conflictingDependencyMap.get( key );
if ( dependencyList == null )
{
- dependencyList = new ArrayList<ReverseDependencyLink>();
+ dependencyList = new ArrayList<>();
}
// CHECKSTYLE_OFF: LineLength
@@ -849,7 +842,7 @@ private void getAllDependencyMap( Map<String, List<ReverseDependencyLink>> allDe
List<ReverseDependencyLink> reverseDepependencies = allDependencies.get( key );
if ( reverseDepependencies == null )
{
- reverseDepependencies = new ArrayList<ReverseDependencyLink>();
+ reverseDepependencies = new ArrayList<>();
}
if ( !containsDependency( reverseDepependencies, art ) )
@@ -914,12 +907,7 @@ private DependencyNode getNode( ProjectBuildingRequest buildingRequest )
{
try
{
- DependencyNode node =
- (DependencyNode) dependencyTreeBuilder.buildDependencyTree( buildingRequest.getProject(),
- localRepository,
- filter );
-
- return node;
+ return dependencyTreeBuilder.buildDependencyTree( buildingRequest.getProject(), localRepository, filter );
}
catch ( DependencyTreeBuilderException e )
{
@@ -938,7 +926,7 @@ private DependencyNode getNode( ProjectBuildingRequest buildingRequest )
Set<Artifact> children = null;
if ( node.getChildren() != null )
{
- children = new HashSet<Artifact>();
+ children = new HashSet<>();
for ( DependencyNode depNode : node.getChildren() )
{
children.add( depNode.getArtifact() );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
index ce494c9..9445a63 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
@@ -27,12 +27,10 @@
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.report.projectinfo.dependencies.ManagementDependencies;
import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils;
import org.apache.maven.report.projectinfo.dependencies.renderer.DependencyManagementRenderer;
-import org.apache.maven.repository.RepositorySystem;
/**
* Generates the Project Dependency Management report.
@@ -48,12 +46,6 @@
// Mojo components
// ----------------------------------------------------------------------
- /**
- * Maven Project Builder component.
- */
- @Component
- private ProjectBuilder projectBuilder;
-
/**
* Artifact metadata source component.
*
@@ -62,12 +54,6 @@
@Component
protected ArtifactMetadataSource artifactMetadataSource;
- /**
- * Maven Artifact Factory component.
- */
- @Component
- private RepositorySystem repositorySystem;
-
/**
* Repository metadata component.
*
diff --git a/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java b/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
index 15baca4..4865c68 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
@@ -109,10 +109,6 @@ public boolean canGenerateReport()
{
licenseUrl = getLicenseURL( project, url );
}
- catch ( MalformedURLException e )
- {
- getLog().error( e.getMessage() );
- }
catch ( IOException e )
{
getLog().error( e.getMessage() );
@@ -334,11 +330,6 @@ public void renderBody()
renderLicenseContent( licenseUrl );
}
}
- catch ( MalformedURLException e )
- {
- // I18N message
- paragraph( e.getMessage() );
- }
catch ( IOException e )
{
// I18N message
@@ -372,7 +363,7 @@ private void renderLicenseContent( URL licenseUrl )
if ( ( licenseContentLC.contains( "<!doctype html" ) || licenseContentLC.contains( "<html>" ) )
&& ( ( bodyStart >= 0 ) && ( bodyEnd > bodyStart ) ) )
{
- bodyStart = licenseContentLC.indexOf( ">", bodyStart ) + 1;
+ bodyStart = licenseContentLC.indexOf( '>', bodyStart ) + 1;
String body = licenseContent.substring( bodyStart, bodyEnd );
link( licenseUrl.toExternalForm(), getI18nString( "originalText" ) );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
index d2342f0..1bf8836 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
@@ -22,7 +22,6 @@
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.MailingList;
import org.apache.maven.model.Model;
-import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.Mojo;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -63,7 +62,7 @@ public boolean canGenerateReport()
public void executeReport( Locale locale )
{
MailingListsRenderer r =
- new MailingListsRenderer( getSink(), getProject().getModel(), getI18N( locale ), locale, getLog() );
+ new MailingListsRenderer( getSink(), getProject().getModel(), getI18N( locale ), locale );
r.render();
}
@@ -94,15 +93,11 @@ protected String getI18Nsection()
{
private final Model model;
- private final Log log;
-
- MailingListsRenderer( Sink sink, Model model, I18N i18n, Locale locale, Log log )
+ MailingListsRenderer( Sink sink, Model model, I18N i18n, Locale locale )
{
super( sink, i18n, locale );
-
this.model = model;
- this.log = log;
}
@Override
@@ -161,7 +156,7 @@ public void renderBody()
for ( MailingList mailingList : model.getMailingLists() )
{
- List<String> textRow = new ArrayList<String>();
+ List<String> textRow = new ArrayList<>();
// Validate here subsribe/unsubsribe lists and archives?
textRow.add( mailingList.getName() );
@@ -205,7 +200,7 @@ public void renderBody()
otherArchive = it.next();
// Reinit the list to beautify the display
- textRow = new ArrayList<String>();
+ textRow = new ArrayList<>();
// Name
textRow.add( " " );
@@ -262,14 +257,14 @@ private static String getArchiveServer( String uri )
int fromIndex;
if ( at >= 0 )
{
- fromIndex = uri.lastIndexOf( "/", at - 1 ) >= 0 ? 0 : at + 2;
+ fromIndex = uri.lastIndexOf( '/', at - 1 ) >= 0 ? 0 : at + 2;
}
else
{
fromIndex = 0;
}
- int from = uri.indexOf( "/", fromIndex );
+ int from = uri.indexOf( '/', fromIndex );
if ( from == -1 )
{
diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
index e46e457..b14d511 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
@@ -25,7 +25,6 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -52,16 +51,6 @@
public class PluginManagementReport
extends AbstractProjectInfoReport
{
- // ----------------------------------------------------------------------
- // Mojo components
- // ----------------------------------------------------------------------
-
- /**
- * Maven Project Builder component.
- */
- @Component
- private ProjectBuilder projectBuilder;
-
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
@@ -134,7 +123,7 @@ public boolean canGenerateReport()
* @param project {@link MavenProject}
* @param projectBuilder {@link ProjectBuilder}
* @param repositorySystem {@link RepositorySystem}
- * @param buildingRequest {@link ArtifactRepository}
+ * @param buildingRequest {@link ProjectBuildingRequest}
*/
public PluginManagementRenderer( Log log, Sink sink, Locale locale, I18N i18n, List<Plugin> plugins,
MavenProject project, ProjectBuilder projectBuilder,
@@ -164,10 +153,10 @@ protected String getI18Nsection()
@Override
public void renderBody()
{
- PluginManagement pluginManagement = project.getPluginManagement();
+ PluginManagement projectPluginManagement = project.getPluginManagement();
- if ( pluginManagement == null || pluginManagement.getPlugins() == null
- || pluginManagement.getPlugins().isEmpty() )
+ if ( projectPluginManagement == null || projectPluginManagement.getPlugins() == null
+ || projectPluginManagement.getPlugins().isEmpty() )
{
startSection( getTitle() );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
index 1c2159a..b831c91 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
@@ -32,7 +32,6 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -54,22 +53,6 @@
public class PluginsReport
extends AbstractProjectInfoReport
{
- // ----------------------------------------------------------------------
- // Mojo components
- // ----------------------------------------------------------------------
-
- /**
- * Maven Project Builder component.
- */
- @Component
- private ProjectBuilder projectBuilder;
-
- /**
- * Maven Artifact Factory component.
- */
- @Component
- private RepositorySystem repositorySystem;
-
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
@@ -142,7 +125,7 @@ protected String getI18Nsection()
* @param project {@link MavenProject}
* @param projectBuilder {@link ProjectBuilder}
* @param repositorySystem {@link RepositorySystem}
- * @param localRepository {@link ArtifactRepository}
+ * @param buildingRequest {@link ProjectBuildingRequest}
*
*/
public PluginsRenderer( Log log, Sink sink, Locale locale, I18N i18n, List<Plugin> plugins,
@@ -154,9 +137,9 @@ public PluginsRenderer( Log log, Sink sink, Locale locale, I18N i18n, List<Plugi
this.log = log;
- this.plugins = new ArrayList<Plugin>( plugins );
+ this.plugins = new ArrayList<>( plugins );
- this.reports = new ArrayList<ReportPlugin>( reports );
+ this.reports = new ArrayList<>( reports );
this.project = project;
@@ -195,7 +178,7 @@ private void renderSectionPlugins( boolean isPlugins )
startSection( getI18nString( isPlugins ? "build.title" : "report.title" ) );
- if ( list == null || list.isEmpty() )
+ if ( list.isEmpty() )
{
paragraph( getI18nString( isPlugins ? "nolist" : "report.nolist" ) ) ;
@@ -211,7 +194,7 @@ private void renderSectionPlugins( boolean isPlugins )
List<ArtifactRepository> artifactRepositories = project.getPluginArtifactRepositories();
if ( artifactRepositories == null )
{
- artifactRepositories = new ArrayList<ArtifactRepository>();
+ artifactRepositories = new ArrayList<>();
}
ProjectBuildingRequest buildRequest = new DefaultProjectBuildingRequest( buildingRequest );
@@ -301,7 +284,7 @@ public String getVersion()
public static List<GAV> pluginsToGAV( List<Plugin> plugins )
{
- List<GAV> result = new ArrayList<GAV>( plugins.size() );
+ List<GAV> result = new ArrayList<>( plugins.size() );
for ( Plugin plugin : plugins )
{
result.add( new GAV( plugin ) );
@@ -311,7 +294,7 @@ public String getVersion()
public static List<GAV> reportPluginsToGAV( List<ReportPlugin> reportPlugins, MavenProject project )
{
- List<GAV> result = new ArrayList<GAV>( reportPlugins.size() );
+ List<GAV> result = new ArrayList<>( reportPlugins.size() );
for ( ReportPlugin reportPlugin : reportPlugins )
{
result.add( new GAV( reportPlugin, project ) );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java b/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
index 50d581c..b7d5181 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
@@ -180,6 +180,7 @@ public static String getContent( URL url, MavenProject project, Settings setting
Authenticator.setDefault( new Authenticator()
{
/** {@inheritDoc} */
+ @Override
protected PasswordAuthentication getPasswordAuthentication()
{
return new PasswordAuthentication( userName, pwd.toCharArray() );
@@ -209,7 +210,7 @@ protected PasswordAuthentication getPasswordAuthentication()
}
/**
- * @param factory not null
+ * @param repositorySystem not null
* @param artifact not null
* @param projectBuilder not null
* @param buildingRequest not null
@@ -367,11 +368,7 @@ public void checkServerTrusted( final X509Certificate[] chain, final String auth
( (HttpsURLConnection) conn ).setSSLSocketFactory( sslSocketFactory );
}
- catch ( NoSuchAlgorithmException e1 )
- {
- // ignore
- }
- catch ( KeyManagementException e )
+ catch ( NoSuchAlgorithmException | KeyManagementException e1 )
{
// ignore
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
index 1f8f196..c709efd 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
@@ -26,7 +26,6 @@
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.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
@@ -35,7 +34,6 @@
import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -828,7 +826,7 @@ public ScmRepository getScmRepository( String scmUrl )
}
ScmRepository repo = null;
- List<String> messages = new ArrayList<String>();
+ List<String> messages = new ArrayList<>();
try
{
messages.addAll( scmManager.validateScmRepository( scmUrl ) );
@@ -838,7 +836,7 @@ public ScmRepository getScmRepository( String scmUrl )
messages.add( e.getMessage() );
}
- if ( messages.size() > 0 )
+ if ( !messages.isEmpty() )
{
StringBuilder sb = new StringBuilder();
boolean isIntroAdded = false;
@@ -877,20 +875,6 @@ public ScmRepository getScmRepository( String scmUrl )
{
repo = scmManager.makeScmRepository( scmUrl );
}
- catch ( NoSuchScmProviderException e )
- {
- if ( log.isDebugEnabled() )
- {
- log.debug( e.getMessage(), e );
- }
- }
- catch ( ScmRepositoryException e )
- {
- if ( log.isDebugEnabled() )
- {
- log.debug( e.getMessage(), e );
- }
- }
catch ( Exception e )
{
// Should be already catched
diff --git a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
index a99ce06..554c8ce 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
@@ -245,7 +245,7 @@ private boolean isJavaProject( MavenProject project )
{
try
{
- if ( FileUtils.getFileNames( sourceDir, "**/*.java", null, false ).size() > 0 )
+ if ( !FileUtils.getFileNames( sourceDir, "**/*.java", null, false ).isEmpty() )
{
return true;
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
index efd30e6..531870e 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
@@ -31,7 +31,6 @@
import org.apache.maven.model.Contributor;
import org.apache.maven.model.Developer;
import org.apache.maven.model.Model;
-import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.codehaus.plexus.i18n.I18N;
@@ -82,7 +81,7 @@ public void executeReport( Locale locale )
{
// CHECKSTYLE_OFF: LineLength
ProjectTeamRenderer r =
- new ProjectTeamRenderer( getSink(), project.getModel(), getI18N( locale ), locale, getLog(), showAvatarImages );
+ new ProjectTeamRenderer( getSink(), project.getModel(), getI18N( locale ), locale, showAvatarImages );
// CHECKSTYLE_ON: LineLength
r.render();
@@ -138,7 +137,7 @@ protected String getI18Nsection()
private final String protocol;
- ProjectTeamRenderer( Sink sink, Model model, I18N i18n, Locale locale, Log log, boolean showAvatarImages )
+ ProjectTeamRenderer( Sink sink, Model model, I18N i18n, Locale locale, boolean showAvatarImages )
{
super( sink, i18n, locale );
@@ -167,9 +166,6 @@ public void renderBody()
{
startSection( getI18nString( "intro.title" ) );
- // To handle JS
- StringBuilder javascript = new StringBuilder();
-
// Introduction
paragraph( getI18nString( "intro.description1" ) );
paragraph( getI18nString( "intro.description2" ) );
@@ -195,13 +191,9 @@ public void renderBody()
tableHeader( requiredHeaders );
- // To handle JS
- int developersRowId = 0;
for ( Developer developer : developers )
{
- renderTeamMember( developer, developersRowId, headersMap, javascript );
-
- developersRowId++;
+ renderTeamMember( developer, headersMap );
}
endTable();
@@ -229,13 +221,9 @@ public void renderBody()
tableHeader( requiredHeaders );
- // To handle JS
- int contributorsRowId = 0;
for ( Contributor contributor : contributors )
{
- renderTeamMember( contributor, contributorsRowId, headersMap, javascript );
-
- contributorsRowId++;
+ renderTeamMember( contributor, headersMap );
}
endTable();
@@ -246,8 +234,7 @@ public void renderBody()
endSection();
}
- private void renderTeamMember( Contributor member, int rowId, Map<String, Boolean> headersMap,
- StringBuilder javascript )
+ private void renderTeamMember( Contributor member, Map<String, Boolean> headersMap )
{
sink.tableRow();
@@ -269,10 +256,8 @@ private void renderTeamMember( Contributor member, int rowId, Map<String, Boolea
sink.figure_();
sink.tableCell_();
}
- String type = "contributor";
if ( member instanceof Developer )
{
- type = "developer";
if ( headersMap.get( ID ) == Boolean.TRUE )
{
String id = ( (Developer) member ).getId();
@@ -360,7 +345,7 @@ private String getGravatarUrl( String email )
{
md = MessageDigest.getInstance( "MD5" );
md.update( email.getBytes() );
- byte byteData[] = md.digest();
+ byte[] byteData = md.digest();
StringBuilder sb = new StringBuilder();
final int lowerEightBitsOnly = 0xff;
for ( byte aByteData : byteData )
@@ -381,7 +366,7 @@ private String getGravatarUrl( String email )
*/
private String[] getRequiredContrHeaderArray( Map<String, Boolean> requiredHeaders )
{
- List<String> requiredArray = new ArrayList<String>();
+ List<String> requiredArray = new ArrayList<>();
String image = getI18nString( "contributors.image" );
String name = getI18nString( "contributors.name" );
String email = getI18nString( "contributors.email" );
@@ -390,14 +375,13 @@ private String getGravatarUrl( String email )
String organizationUrl = getI18nString( "contributors.organizationurl" );
String roles = getI18nString( "contributors.roles" );
String timeZone = getI18nString( "contributors.timezone" );
- String actualTime = getI18nString( "contributors.actualtime" );
String properties = getI18nString( "contributors.properties" );
if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages )
{
requiredArray.add( image );
}
- setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl,
- roles, timeZone, actualTime, properties );
+ setRequiredArray( requiredHeaders, requiredArray, name, email, url, organization, organizationUrl,
+ roles, timeZone, properties );
return requiredArray.toArray( new String[requiredArray.size()] );
}
@@ -408,7 +392,7 @@ private String getGravatarUrl( String email )
*/
private String[] getRequiredDevHeaderArray( Map<String, Boolean> requiredHeaders )
{
- List<String> requiredArray = new ArrayList<String>();
+ List<String> requiredArray = new ArrayList<>();
String image = getI18nString( "developers.image" );
String id = getI18nString( "developers.id" );
@@ -419,7 +403,6 @@ private String getGravatarUrl( String email )
String organizationUrl = getI18nString( "developers.organizationurl" );
String roles = getI18nString( "developers.roles" );
String timeZone = getI18nString( "developers.timezone" );
- String actualTime = getI18nString( "developers.actualtime" );
String properties = getI18nString( "developers.properties" );
if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages )
@@ -431,16 +414,15 @@ private String getGravatarUrl( String email )
requiredArray.add( id );
}
- setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl,
- roles, timeZone, actualTime, properties );
+ setRequiredArray( requiredHeaders, requiredArray, name, email, url, organization, organizationUrl,
+ roles, timeZone, properties );
- return requiredArray.toArray( new String[requiredArray.size()] );
+ return requiredArray.toArray( new String[ 0 ] );
}
/**
* @param requiredHeaders
* @param requiredArray
- * @param image
* @param name
* @param email
* @param url
@@ -448,12 +430,11 @@ private String getGravatarUrl( String email )
* @param organizationUrl
* @param roles
* @param timeZone
- * @param actualTime
* @param properties
*/
- private void setRequiredArray( Map<String, Boolean> requiredHeaders, List<String> requiredArray, String image,
+ private void setRequiredArray( Map<String, Boolean> requiredHeaders, List<String> requiredArray,
String name, String email, String url, String organization,
- String organizationUrl, String roles, String timeZone, String actualTime,
+ String organizationUrl, String roles, String timeZone,
String properties )
{
if ( requiredHeaders.get( NAME ) == Boolean.TRUE )
@@ -497,7 +478,7 @@ private void setRequiredArray( Map<String, Boolean> requiredHeaders, List<String
*/
private Map<String, Boolean> checkRequiredHeaders( List<? extends Contributor> units )
{
- Map<String, Boolean> requiredHeaders = new HashMap<String, Boolean>();
+ Map<String, Boolean> requiredHeaders = new HashMap<>();
requiredHeaders.put( IMAGE, Boolean.FALSE );
requiredHeaders.put( ID, Boolean.FALSE );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
index 6e8b0a9..f33a1ee 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
@@ -119,7 +119,7 @@ public boolean hasDependencies()
return projectDependencies;
}
- projectDependencies = new ArrayList<Artifact>();
+ projectDependencies = new ArrayList<>();
for ( DependencyNode dep : dependencyNode.getChildren() )
{
projectDependencies.add( dep.getArtifact() );
@@ -138,7 +138,7 @@ public boolean hasDependencies()
return projectTransitiveDependencies;
}
- projectTransitiveDependencies = new ArrayList<Artifact>( getAllDependencies() );
+ projectTransitiveDependencies = new ArrayList<>( getAllDependencies() );
projectTransitiveDependencies.removeAll( getProjectDependencies() );
return projectTransitiveDependencies;
@@ -154,7 +154,7 @@ public boolean hasDependencies()
return allDependencies;
}
- allDependencies = new ArrayList<Artifact>();
+ allDependencies = new ArrayList<>();
addAllChildrenDependencies( dependencyNode );
@@ -179,13 +179,13 @@ public boolean hasDependencies()
return transitiveDependenciesByScope;
}
- transitiveDependenciesByScope = new HashMap<String, List<Artifact>>();
+ transitiveDependenciesByScope = new HashMap<>();
for ( Artifact artifact : getTransitiveDependencies() )
{
List<Artifact> multiValue = transitiveDependenciesByScope.get( artifact.getScope() );
if ( multiValue == null )
{
- multiValue = new ArrayList<Artifact>();
+ multiValue = new ArrayList<>();
}
if ( !multiValue.contains( artifact ) )
@@ -203,13 +203,13 @@ public boolean hasDependencies()
return dependenciesByScope;
}
- dependenciesByScope = new HashMap<String, List<Artifact>>();
+ dependenciesByScope = new HashMap<>();
for ( Artifact artifact : getProjectDependencies() )
{
List<Artifact> multiValue = dependenciesByScope.get( artifact.getScope() );
if ( multiValue == null )
{
- multiValue = new ArrayList<Artifact>();
+ multiValue = new ArrayList<>();
}
if ( !multiValue.contains( artifact ) )
@@ -232,7 +232,7 @@ public JarData getJarDependencyDetails( Artifact artifact )
{
if ( dependencyDetails == null )
{
- dependencyDetails = new HashMap<String, JarData>();
+ dependencyDetails = new HashMap<>();
}
JarData jarData = dependencyDetails.get( artifact.getId() );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
index 5b17d41..3346a7d 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
@@ -48,7 +48,7 @@
*/
public DependencyVersionMap()
{
- idsToNode = new HashMap<String, List<DependencyNode>>();
+ idsToNode = new HashMap<>();
}
/**
@@ -83,7 +83,7 @@ public boolean endVisit( DependencyNode node )
*/
public List<List<DependencyNode>> getConflictedVersionNumbers()
{
- List<List<DependencyNode>> output = new ArrayList<List<DependencyNode>>();
+ List<List<DependencyNode>> output = new ArrayList<>();
for ( List<DependencyNode> nodes : idsToNode.values() )
{
if ( containsConflicts( nodes ) )
@@ -104,7 +104,7 @@ private void addDependency( DependencyNode node )
List<DependencyNode> nodes = idsToNode.get( key );
if ( nodes == null )
{
- nodes = new ArrayList<DependencyNode>();
+ nodes = new ArrayList<>();
idsToNode.put( key, nodes );
}
nodes.add( node );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
index 7f407f9..92c76e0 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
@@ -33,34 +33,34 @@
*/
public class ManagementDependencies
{
- private final List<Dependency> managementDependencies;
+ private final List<Dependency> dependencies;
/**
* @param projectDependencies the list of dependencies.
*/
public ManagementDependencies( List<Dependency> projectDependencies )
{
- this.managementDependencies = projectDependencies;
+ this.dependencies = projectDependencies;
}
/**
- * @return <code>true</code> if managementDependencies is not null and not empty.
+ * @return <code>true</code> if dependencies is not null and not empty.
*/
public boolean hasDependencies()
{
- return ( managementDependencies != null ) && ( !this.managementDependencies.isEmpty() );
+ return ( dependencies != null ) && ( !this.dependencies.isEmpty() );
}
/**
- * @return managementDependencies
+ * @return dependencies
*/
public List<Dependency> getManagementDependencies()
{
- return new ArrayList<Dependency>( managementDependencies );
+ return new ArrayList<>( dependencies );
}
/**
- * @return the managementDependencies by scope
+ * @return the dependencies by scope
* @see Artifact#SCOPE_COMPILE
* @see Artifact#SCOPE_PROVIDED
* @see Artifact#SCOPE_RUNTIME
@@ -69,14 +69,14 @@ public boolean hasDependencies()
*/
public Map<String, List<Dependency>> getManagementDependenciesByScope()
{
- Map<String, List<Dependency>> dependenciesByScope = new HashMap<String, List<Dependency>>();
- for ( Dependency dependency : managementDependencies )
+ Map<String, List<Dependency>> dependenciesByScope = new HashMap<>();
+ for ( Dependency dependency : dependencies )
{
String scope = dependency.getScope() != null ? dependency.getScope() : Artifact.SCOPE_COMPILE;
List<Dependency> multiValue = dependenciesByScope.get( scope );
if ( multiValue == null )
{
- multiValue = new ArrayList<Dependency>();
+ multiValue = new ArrayList<>();
}
multiValue.add( dependency );
dependenciesByScope.put( scope, multiValue );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
index bad2d99..7f689be 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
@@ -61,12 +61,12 @@
/**
* @param log {@link Log}
- * @param mavenProjectBuilder {@link MavenProjectBuilder}
- * @param factory {@link ArtifactFactory}
+ * @param projectBuilder {@link ProjectBuilder}
+ * @param repositorySystem {@link RepositorySystem}
* @param resolver {@link ArtifactResolver}
* @param remoteRepositories {@link ArtifactRepository}
* @param pluginRepositories {@link ArtifactRepository}
- * @param localRepository {@link ArtifactRepository}
+ * @param buildingRequest {@link ProjectBuildingRequest}
* @param repositoryMetadataManager {@link RepositoryMetadataManager}
*/
public RepositoryUtils( Log log, ProjectBuilder projectBuilder, RepositorySystem repositorySystem,
@@ -91,7 +91,7 @@ public void resolve( Artifact artifact )
throws ArtifactResolverException
{
List<ArtifactRepository> repos =
- new ArrayList<ArtifactRepository>( pluginRepositories.size() + remoteRepositories.size() );
+ new ArrayList<>( pluginRepositories.size() + remoteRepositories.size() );
repos.addAll( pluginRepositories );
repos.addAll( remoteRepositories );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index d8e2c71..c1e0f23 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -111,6 +111,7 @@
private static final long serialVersionUID = 1L;
/** {@inheritDoc} */
+ @Override
public Object put( String key, Object value )
{
// handle multiple values as a set to avoid duplicates
@@ -118,7 +119,7 @@ public Object put( String key, Object value )
SortedSet<Object> valueList = (SortedSet<Object>) get( key );
if ( valueList == null )
{
- valueList = new TreeSet<Object>();
+ valueList = new TreeSet<>();
}
valueList.add( value );
return super.put( key, valueList );
@@ -133,7 +134,7 @@ public Object put( String key, Object value )
static
{
- Set<String> jarSubtype = new HashSet<String>();
+ Set<String> jarSubtype = new HashSet<>();
jarSubtype.add( "jar" );
jarSubtype.add( "war" );
jarSubtype.add( "ear" );
@@ -237,6 +238,7 @@ public void renderBody()
/** {@inheritDoc} */
// workaround for MPIR-140
// TODO Remove me when MSHARED-390 has been resolved
+ @Override
protected void startSection( String name )
{
startSection( name, name );
@@ -313,6 +315,7 @@ protected void startSection( String anchor, String name )
/** {@inheritDoc} */
// workaround for MPIR-140
// TODO Remove me when MSHARED-390 has been resolved
+ @Override
protected void endSection()
{
switch ( section )
@@ -806,7 +809,7 @@ private void renderArtifactRow( Artifact artifact, boolean withClassifier, boole
log.warn( "Unable to create Maven project from repository.", e );
}
- String content[];
+ String[] content;
if ( withClassifier )
{
content =
@@ -1186,6 +1189,7 @@ private boolean hasSealed( List<Artifact> artifacts )
}
/** {@inheritDoc} */
+ @Override
public StringBuffer format( long fs, StringBuffer result, FieldPosition fieldPosition )
{
if ( fs > 1000 * 1000 * 1000 )
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
index c11f6d8..e22083b 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
@@ -80,8 +80,7 @@
* @param artifactMetadataSource {@link ArtifactMetadataSource}
* @param repositorySystem {@link RepositorySystem}
* @param projectBuilder {@link ProjectBuilder}
- * @param remoteRepositories {@link ArtifactRepository}
- * @param localRepository {@link ArtifactRepository}
+ * @param buildingRequest {@link ProjectBuildingRequest}
* @param repoUtils {@link RepositoryUtils}
*/
public DependencyManagementRenderer( Sink sink, Locale locale, I18N i18n, Log log,
@@ -240,7 +239,7 @@ private void renderDependenciesForScope( String scope, List<Dependency> artifact
}
// select latest, assuming pom information will be the most accurate
- if ( versions.size() > 0 )
+ if ( !versions.isEmpty() )
{
ArtifactVersion maxArtifactVersion = Collections.max( versions );
diff --git a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
index 7dde513..cf8d2f3 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -188,7 +188,7 @@ protected AbstractProjectInfoReport createReportMojo( String goal, File pluginXm
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
- setVariableValueToObject( mojo, "remoteRepositories", mojo.project.getRemoteArtifactRepositories() );
+ setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );
return mojo;
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
index 58504cf..a7bea00 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
@@ -100,7 +100,7 @@ public void testReportWithWrongUrl()
try
{
mojo.execute();
- assertTrue( "IllegalArgumentException NOT catched", false );
+ fail( "IllegalArgumentException NOT catched" );
}
catch ( IllegalArgumentException e )
{
@@ -116,7 +116,7 @@ public void testReportWithWrongUrl()
try
{
mojo.execute();
- assertTrue( "IllegalArgumentException NOT catched", false );
+ fail( "IllegalArgumentException NOT catched" );
}
catch ( Exception e )
{
@@ -132,7 +132,7 @@ public void testReportWithWrongUrl()
try
{
mojo.execute();
- assertTrue( "IllegalArgumentException NOT catched", false );
+ fail( "IllegalArgumentException NOT catched" );
}
catch ( Exception e )
{
diff --git a/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyArtifactStubFactory.java b/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyArtifactStubFactory.java
index 7edbadb..e67d63b 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyArtifactStubFactory.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyArtifactStubFactory.java
@@ -52,16 +52,11 @@ public Artifact createArtifact( String groupId, String artifactId, VersionRange
if ( !flattenedPath )
{
- StringBuilder path = new StringBuilder( 128 );
-
- path.append( groupId.replace( '.', '/' ) ).append( '/' );
-
- path.append( artifactId ).append( '/' );
-
- path.append( ArtifactUtils.toSnapshotVersion( versionRange.getRecommendedVersion().toString() ) );
-
// don't use flatten directories, won't happen at runtime
- setWorkingDir( new File( workingDir, path.toString() ) );
+ String path = groupId.replace( '.', '/' ) + '/' +
+ artifactId + '/' +
+ ArtifactUtils.toSnapshotVersion( versionRange.getRecommendedVersion().toString() );
+ setWorkingDir( new File( workingDir, path ) );
}
Artifact artifact =
diff --git a/src/test/java/org/apache/maven/report/projectinfo/stubs/ModulesVariableSettingInterpolationStub.java b/src/test/java/org/apache/maven/report/projectinfo/stubs/ModulesVariableSettingInterpolationStub.java
index 06544f6..25cd799 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/stubs/ModulesVariableSettingInterpolationStub.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/stubs/ModulesVariableSettingInterpolationStub.java
@@ -20,6 +20,7 @@
*/
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -37,6 +38,6 @@ protected String getPOM()
@Override
public List<String> getModules()
{
- return Arrays.<String>asList( "subproject-site-url" );
+ return Collections.singletonList( "subproject-site-url" );
}
}
diff --git a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
index 5edad2a..4e41f19 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
@@ -101,11 +101,11 @@ public ProjectInfoProjectStub()
build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/" + model.getArtifactId() + "/target/test-classes" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List<String> testCompileSourceRoots = new ArrayList<String>();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( getBasedir() + "/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services