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/20 11:07:58 UTC
[maven-jxr] branch master updated: fix a few generics warnings (#18)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
The following commit(s) were added to refs/heads/master by this push:
new 05841c8 fix a few generics warnings (#18)
05841c8 is described below
commit 05841c8203d794642050bc5d37e3e736b90aa12c
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Wed May 20 07:07:48 2020 -0400
fix a few generics warnings (#18)
* fix a few generics warnings
---
.../stubs/AggregateSubmodule1MavenProjectStub.java | 17 +----------------
.../stubs/AggregateSubmodule2MavenProjectStub.java | 16 ++++++----------
.../jxr/stubs/AggregateTestMavenProjectStub.java | 20 +++++---------------
.../stubs/DefaultConfigurationMavenProjectStub.java | 20 +++++---------------
.../stubs/ExcludeConfigurationMavenProjectStub.java | 20 +++++---------------
.../stubs/IncludeConfigurationMavenProjectStub.java | 21 +++++----------------
.../jxr/stubs/NoJavadocDirMavenProjectStub.java | 21 +++++----------------
.../NoJavadocLinkConfigurationMavenProjectStub.java | 21 +++++----------------
.../maven/plugin/jxr/stubs/PomMavenProjectStub.java | 4 ++--
.../jxr/stubs/TestSourceDirMavenProjectStub.java | 15 ++-------------
.../apache/maven/jxr/pacman/JavaFileImplTest.java | 7 +++----
11 files changed, 44 insertions(+), 138 deletions(-)
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java
index 45b8a30..40d55e8 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java
@@ -31,7 +31,6 @@ import java.util.List;
public class AggregateSubmodule1MavenProjectStub
extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
public AggregateSubmodule1MavenProjectStub()
{
@@ -42,28 +41,14 @@ public class AggregateSubmodule1MavenProjectStub
setInceptionYear( "2006" );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add(
basedir + "/src/test/resources/unit/aggregate-test/submodule1/aggregate/test/submodule1" );
setCompileSourceRoots( compileSourceRoots );
- //set the report plugins
- List reportPlugins = new ArrayList();
- setReportPlugins( reportPlugins );
-
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
setArtifact( artifact );
}
- public void setReportPlugins( List reportPlugins )
- {
- this.reportPlugins = reportPlugins;
- }
-
- public List getReportPlugins()
- {
- return reportPlugins;
- }
-
}
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..1cd6940 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();
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
public AggregateSubmodule2MavenProjectStub()
{
@@ -42,26 +43,21 @@ 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();
- setReportPlugins( reportPlugins );
+ reportPlugins = new ArrayList<>();
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
setArtifact( artifact );
}
- public void setReportPlugins( List reportPlugins )
- {
- this.reportPlugins = reportPlugins;
- }
-
- public List getReportPlugins()
+ @Override
+ 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..69d7a22 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();
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
public AggregateTestMavenProjectStub()
{
@@ -62,18 +62,12 @@ 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(); )
- {
- ReportPlugin plugin = (ReportPlugin) iter.next();
- reportPlugins.add( plugin );
- }
- setReportPlugins( reportPlugins );
+ reportPlugins = new ArrayList<>( model.getReporting().getPlugins() );
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
@@ -81,12 +75,8 @@ public class AggregateTestMavenProjectStub
setExecutionRoot( true );
}
- public void setReportPlugins( List plugins )
- {
- this.reportPlugins = plugins;
- }
-
- public List getReportPlugins()
+ @Override
+ 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..1d3d2f6 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();
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
public DefaultConfigurationMavenProjectStub()
{
@@ -62,18 +62,12 @@ 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(); )
- {
- ReportPlugin plugin = (ReportPlugin) iter.next();
- reportPlugins.add( plugin );
- }
- setReportPlugins( reportPlugins );
+ reportPlugins = new ArrayList<>( model.getReporting().getPlugins() );
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
@@ -81,12 +75,8 @@ public class DefaultConfigurationMavenProjectStub
}
- public void setReportPlugins( List plugins )
- {
- this.reportPlugins = plugins;
- }
-
- public List getReportPlugins()
+ @Override
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
index 200afb4..990c784 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
@@ -36,7 +36,7 @@ import java.util.List;
*/
public class ExcludeConfigurationMavenProjectStub extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
public ExcludeConfigurationMavenProjectStub()
{
@@ -61,18 +61,12 @@ public class ExcludeConfigurationMavenProjectStub extends MavenProjectStub
setInceptionYear( model.getInceptionYear() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/src/test/resources/unit/exclude-configuration/exclude/configuration" );
setCompileSourceRoots( compileSourceRoots );
// set the report plugins
- List reportPlugins = new ArrayList();
- for ( Iterator iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
- {
- ReportPlugin plugin = (ReportPlugin) iter.next();
- reportPlugins.add( plugin );
- }
- setReportPlugins( reportPlugins );
+ reportPlugins = new ArrayList<>( model.getReporting().getPlugins() );
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
@@ -80,12 +74,8 @@ public class ExcludeConfigurationMavenProjectStub extends MavenProjectStub
}
- public void setReportPlugins( List plugins )
- {
- this.reportPlugins = plugins;
- }
-
- public List getReportPlugins()
+ @Override
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
index 30a0469..78d3552 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
@@ -28,7 +28,6 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import java.io.File;
import java.io.FileReader;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -36,7 +35,7 @@ import java.util.List;
*/
public class IncludeConfigurationMavenProjectStub extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
public IncludeConfigurationMavenProjectStub()
{
@@ -61,19 +60,13 @@ public class IncludeConfigurationMavenProjectStub extends MavenProjectStub
setInceptionYear( model.getInceptionYear() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add(
basedir + "/src/test/resources/unit/include-configuration/include/configuration" );
setCompileSourceRoots( compileSourceRoots );
// set the report plugins
- List reportPlugins = new ArrayList();
- for ( Iterator iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
- {
- ReportPlugin plugin = (ReportPlugin) iter.next();
- reportPlugins.add( plugin );
- }
- setReportPlugins( reportPlugins );
+ reportPlugins = new ArrayList<>( model.getReporting().getPlugins() );
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
@@ -81,12 +74,8 @@ public class IncludeConfigurationMavenProjectStub extends MavenProjectStub
}
- public void setReportPlugins( List plugins )
- {
- this.reportPlugins = plugins;
- }
-
- public List getReportPlugins()
+ @Override
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java
index 3e19f49..70d0f95 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java
@@ -28,7 +28,6 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import java.io.File;
import java.io.FileReader;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -37,7 +36,7 @@ import java.util.List;
public class NoJavadocDirMavenProjectStub
extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
public NoJavadocDirMavenProjectStub()
{
@@ -62,30 +61,20 @@ public class NoJavadocDirMavenProjectStub
setInceptionYear( model.getInceptionYear() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/src/test/resources/unit/nojavadocdir-test/nojavadocdir/test" );
setCompileSourceRoots( compileSourceRoots );
//set the report plugins
- List reportPlugins = new ArrayList();
- for ( Iterator iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
- {
- ReportPlugin plugin = (ReportPlugin) iter.next();
- reportPlugins.add( plugin );
- }
- setReportPlugins( reportPlugins );
+ reportPlugins = new ArrayList<>( model.getReporting().getPlugins() );
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
setArtifact( artifact );
}
- public void setReportPlugins( List plugins )
- {
- this.reportPlugins = plugins;
- }
-
- public List getReportPlugins()
+ @Override
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java
index 516beef..ba01ee6 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java
@@ -28,7 +28,6 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import java.io.File;
import java.io.FileReader;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -37,7 +36,7 @@ import java.util.List;
public class NoJavadocLinkConfigurationMavenProjectStub
extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
+ List<ReportPlugin> reportPlugins = new ArrayList<>();
public NoJavadocLinkConfigurationMavenProjectStub()
{
@@ -62,19 +61,13 @@ public class NoJavadocLinkConfigurationMavenProjectStub
setInceptionYear( model.getInceptionYear() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add(
basedir + "/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink/configuration" );
setCompileSourceRoots( compileSourceRoots );
//set the report plugins
- List reportPlugins = new ArrayList();
- for ( Iterator iter = model.getReporting().getPlugins().iterator(); iter.hasNext(); )
- {
- ReportPlugin plugin = (ReportPlugin) iter.next();
- reportPlugins.add( plugin );
- }
- setReportPlugins( reportPlugins );
+ reportPlugins = new ArrayList<>( model.getReporting().getPlugins() );
Artifact artifact = new JxrPluginArtifactStub( getGroupId(), getArtifactId(), getVersion(), getPackaging() );
artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
@@ -82,12 +75,8 @@ public class NoJavadocLinkConfigurationMavenProjectStub
}
- public void setReportPlugins( List plugins )
- {
- this.reportPlugins = plugins;
- }
-
- public List getReportPlugins()
+ @Override
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java
index e5e79b5..99a8aae 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java
@@ -68,11 +68,11 @@ public class PomMavenProjectStub
build.setTestOutputDirectory( super.getBasedir() + "/target/test/unit/pom-test/target/test-classes" );
setBuild( build );
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
- List testCompileSourceRoots = new ArrayList();
+ List<String> testCompileSourceRoots = new ArrayList<>();
testCompileSourceRoots.add( getBasedir() + "/src/test/java" );
setTestCompileSourceRoots( testCompileSourceRoots );
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java
index 96e51bb..c61d429 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java
@@ -35,8 +35,7 @@ import java.util.List;
public class TestSourceDirMavenProjectStub
extends MavenProjectStub
{
- List reportPlugins = new ArrayList();
-
+
public TestSourceDirMavenProjectStub()
{
MavenXpp3Reader pomReader = new MavenXpp3Reader();
@@ -60,7 +59,7 @@ public class TestSourceDirMavenProjectStub
setInceptionYear( model.getInceptionYear() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/src/test/resources/unit/testsourcedir-test" );
setCompileSourceRoots( compileSourceRoots );
@@ -69,14 +68,4 @@ public class TestSourceDirMavenProjectStub
setArtifact( artifact );
}
-
- public void setReportPlugins( List plugins )
- {
- this.reportPlugins = plugins;
- }
-
- public List getReportPlugins()
- {
- return reportPlugins;
- }
}
diff --git a/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java b/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
index ee919ac..5c3a854 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
@@ -21,16 +21,15 @@ package org.apache.maven.jxr.pacman;
import org.junit.Test;
+import java.io.IOException;
import java.nio.file.Paths;
import java.util.Iterator;
-import java.util.List;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
public class JavaFileImplTest {
@Test
- public void testJXR_135_lotsOfNested()
- throws Exception
+ public void testJXR_135_lotsOfNested() throws IOException
{
JavaFileImpl javaFile = new JavaFileImpl( Paths.get(
"src/test/resources/jxr135/org/apache/maven/jxr/pacman/ClassWithNested.java" ),