You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/19 20:29:25 UTC
[maven-jxr] branch IO created (now c6c53bc)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch IO
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git.
at c6c53bc fix a few generics warnings
This branch includes the following new commits:
new c6c53bc fix a few generics warnings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-jxr] 01/01: fix a few generics warnings
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch IO
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit c6c53bc40bd38ea5f845189f7f0673f49b2bf73f
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Tue May 19 16:29:09 2020 -0400
fix a few generics warnings
---
.../jxr/stubs/AggregateSubmodule2MavenProjectStub.java | 11 ++++++-----
.../plugin/jxr/stubs/AggregateTestMavenProjectStub.java | 14 +++++++-------
.../jxr/stubs/DefaultConfigurationMavenProjectStub.java | 14 +++++++-------
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java
index 227b6e1..11c788b 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.jxr.stubs;
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.ReportPlugin;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import java.util.ArrayList;
@@ -31,7 +32,7 @@ import java.util.List;
public class AggregateSubmodule2MavenProjectStub
extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
+ List<ReportPlugin> reportPlugins = new ArrayList<>();
public AggregateSubmodule2MavenProjectStub()
{
@@ -42,13 +43,13 @@ public class AggregateSubmodule2MavenProjectStub
setInceptionYear( "2006" );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add(
basedir + "/src/test/resources/unit/aggregate-test/submodule2/aggregate/test/submodule2" );
setCompileSourceRoots( compileSourceRoots );
//set the report plugins
- List reportPlugins = new ArrayList();
+ List<ReportPlugin> reportPlugins = new ArrayList<>();
setReportPlugins( reportPlugins );
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
@@ -56,12 +57,12 @@ public class AggregateSubmodule2MavenProjectStub
setArtifact( artifact );
}
- public void setReportPlugins( List reportPlugins )
+ public void setReportPlugins( List<ReportPlugin> reportPlugins )
{
this.reportPlugins = reportPlugins;
}
- public List getReportPlugins()
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java
index b7c7768..4a1e0cb 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java
@@ -37,7 +37,7 @@ import java.util.List;
public class AggregateTestMavenProjectStub
extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
+ List<ReportPlugin> reportPlugins = new ArrayList<>();
public AggregateTestMavenProjectStub()
{
@@ -62,15 +62,15 @@ public class AggregateTestMavenProjectStub
setInceptionYear( model.getInceptionYear() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/src/test/resources/unit/aggregate-test/aggregate/test" );
setCompileSourceRoots( compileSourceRoots );
//set the report plugins
- List reportPlugins = new ArrayList();
- for ( Iterator iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
+ List<ReportPlugin> reportPlugins = new ArrayList<>();
+ for ( Iterator<ReportPlugin> iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
{
- ReportPlugin plugin = (ReportPlugin) iter.next();
+ ReportPlugin plugin = iter.next();
reportPlugins.add( plugin );
}
setReportPlugins( reportPlugins );
@@ -81,12 +81,12 @@ public class AggregateTestMavenProjectStub
setExecutionRoot( true );
}
- public void setReportPlugins( List plugins )
+ public void setReportPlugins( List<ReportPlugin> plugins )
{
this.reportPlugins = plugins;
}
- public List getReportPlugins()
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java
index 3c7b202..4cdee6f 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java
@@ -37,7 +37,7 @@ import java.util.List;
public class DefaultConfigurationMavenProjectStub
extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
+ List<ReportPlugin> reportPlugins = new ArrayList<>();
public DefaultConfigurationMavenProjectStub()
{
@@ -62,15 +62,15 @@ public class DefaultConfigurationMavenProjectStub
setInceptionYear( model.getInceptionYear() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/src/test/resources/unit/default-configuration/def/configuration" );
setCompileSourceRoots( compileSourceRoots );
//set the report plugins
- List reportPlugins = new ArrayList();
- for ( Iterator iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
+ List<ReportPlugin> reportPlugins = new ArrayList<>();
+ for ( Iterator<ReportPlugin> iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
{
- ReportPlugin plugin = (ReportPlugin) iter.next();
+ ReportPlugin plugin = iter.next();
reportPlugins.add( plugin );
}
setReportPlugins( reportPlugins );
@@ -81,12 +81,12 @@ public class DefaultConfigurationMavenProjectStub
}
- public void setReportPlugins( List plugins )
+ public void setReportPlugins( List<ReportPlugin> plugins )
{
this.reportPlugins = plugins;
}
- public List getReportPlugins()
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}