You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/07/23 09:49:09 UTC
svn commit: r1802719 [1/2] - in
/maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugins/javadoc/
main/java/org/apache/maven/plugins/javadoc/resolver/
test/java/org/apache/maven/plugins/javadoc/
test/java/org/apache/maven/plugi...
Author: rfscholte
Date: Sun Jul 23 09:49:09 2017
New Revision: 1802719
URL: http://svn.apache.org/viewvc?rev=1802719&view=rev
Log:
Java7 code cleanup (@Override, diamonds ,etc)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/ProxyServer.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject1TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject2TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultArtifactHandlerStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk5MavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk6MavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HelpFileMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarArchiveConfigProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarFailOnErrorMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/JavadocPluginArtifactStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk5TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/Jdk6TestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/NewlineTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/PomMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ProxyTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/QuotedPathMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SettingsStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StandardDocletConflictOptionsTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/StylesheetFileMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/SubpackagesTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletArtifactsMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TagletTestMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/TestJavadocMavenProjectStub.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/WrongEncodingOptionsTestMavenProjectStub.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java Sun Jul 23 09:49:09 2017
@@ -405,6 +405,7 @@ public abstract class AbstractFixJavadoc
/**
* {@inheritDoc}
*/
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -487,7 +488,7 @@ public abstract class AbstractFixJavadoc
{
return ( p.getCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<String>( p.getCompileSourceRoots() ) );
+ : new LinkedList<>( p.getCompileSourceRoots() ) );
}
/**
@@ -501,7 +502,7 @@ public abstract class AbstractFixJavadoc
{
return ( p.getCompileClasspathElements() == null
? Collections.<String>emptyList()
- : new LinkedList<String>( p.getCompileClasspathElements() ) );
+ : new LinkedList<>( p.getCompileClasspathElements() ) );
}
/**
@@ -540,7 +541,7 @@ public abstract class AbstractFixJavadoc
if ( !FIX_TAGS_ALL.equalsIgnoreCase( fixTags.trim() ) )
{
String[] split = StringUtils.split( fixTags, "," );
- List<String> filtered = new LinkedList<String>();
+ List<String> filtered = new LinkedList<>();
for ( String aSplit : split )
{
String s = aSplit.trim();
@@ -740,8 +741,8 @@ public abstract class AbstractFixJavadoc
getLog().info( "Clirr output file was created: " + clirrTextOutputFile.getAbsolutePath() );
}
- clirrNewClasses = new LinkedList<String>();
- clirrNewMethods = new LinkedHashMap<String, List<String>>();
+ clirrNewClasses = new LinkedList<>();
+ clirrNewMethods = new LinkedHashMap<>();
BufferedReader reader = null;
try
@@ -787,7 +788,7 @@ public abstract class AbstractFixJavadoc
list = clirrNewMethods.get( split[2].trim() );
if ( list == null )
{
- list = new ArrayList<String>();
+ list = new ArrayList<>();
}
splits2 = StringUtils.split( split[3].trim(), "'" );
if ( splits2.length != 3 )
@@ -802,7 +803,7 @@ public abstract class AbstractFixJavadoc
list = clirrNewMethods.get( split[2].trim() );
if ( list == null )
{
- list = new ArrayList<String>();
+ list = new ArrayList<>();
}
splits2 = StringUtils.split( split[3].trim(), "'" );
if ( splits2.length != 3 )
@@ -878,7 +879,7 @@ public abstract class AbstractFixJavadoc
return null;
}
- List<File> javaFiles = new LinkedList<File>();
+ List<File> javaFiles = new LinkedList<>();
for ( String sourceRoot : getProjectSourceRoots( project ) )
{
File f = new File( sourceRoot );
@@ -941,7 +942,7 @@ public abstract class AbstractFixJavadoc
throw new MojoExecutionException( "DependencyResolutionRequiredException: " + e.getMessage(), e );
}
- List<URL> urls = new ArrayList<URL>( classPath.size() );
+ List<URL> urls = new ArrayList<>( classPath.size() );
for ( String filename : classPath )
{
try
@@ -2966,7 +2967,7 @@ public abstract class AbstractFixJavadoc
{
if ( sinceClasses == null )
{
- sinceClasses = new ArrayList<String>();
+ sinceClasses = new ArrayList<>();
}
sinceClasses.add( javaClass.getFullyQualifiedName() );
}
@@ -3357,7 +3358,7 @@ public abstract class AbstractFixJavadoc
}
String[] javaClassContentLines = getLines( javaClassContent );
- List<String> list = new LinkedList<String>();
+ List<String> list = new LinkedList<>();
for ( int i = entity.getLineNumber() - 2; i >= 0; i-- )
{
String line = javaClassContentLines[i];
@@ -3467,7 +3468,7 @@ public abstract class AbstractFixJavadoc
return content;
}
- List<String> linesList = new LinkedList<String>( Arrays.asList( lines ) );
+ List<String> linesList = new LinkedList<>( Arrays.asList( lines ) );
Collections.reverse( linesList );
@@ -3546,7 +3547,7 @@ public abstract class AbstractFixJavadoc
private static String[] getLines( final String content )
throws IOException
{
- List<String> lines = new LinkedList<String>();
+ List<String> lines = new LinkedList<>();
BufferedReader reader = new BufferedReader( new StringReader( content ) );
String line = reader.readLine();
@@ -3624,7 +3625,7 @@ public abstract class AbstractFixJavadoc
if ( params[0].trim().equals( "<" ) && params[2].trim().equals( ">" ) )
{
String param = params[1];
- List<String> l = new ArrayList<String>( Arrays.asList( params ) );
+ List<String> l = new ArrayList<>( Arrays.asList( params ) );
l.set( 1, "<" + param + ">" );
l.remove( 0 );
l.remove( 1 );
@@ -3673,10 +3674,10 @@ public abstract class AbstractFixJavadoc
{
this.entity = entity;
this.isJavaMethod = isJavaMethod;
- this.namesTags = new LinkedList<String>();
- this.tagParams = new LinkedHashMap<String, String>();
- this.tagThrows = new LinkedHashMap<String, String>();
- this.unknownsTags = new LinkedList<String>();
+ this.namesTags = new LinkedList<>();
+ this.tagParams = new LinkedHashMap<>();
+ this.tagThrows = new LinkedHashMap<>();
+ this.unknownsTags = new LinkedList<>();
}
public List<String> getNamesTags()
@@ -3763,6 +3764,7 @@ public abstract class AbstractFixJavadoc
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
StringBuilder sb = new StringBuilder();
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java Sun Jul 23 09:49:09 2017
@@ -1795,7 +1795,7 @@ public abstract class AbstractJavadocMoj
return ( p.getCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<String>( p.getCompileSourceRoots() ) );
+ : new LinkedList<>( p.getCompileSourceRoots() ) );
}
/**
@@ -1811,7 +1811,7 @@ public abstract class AbstractJavadocMoj
return ( p.getExecutionProject().getCompileSourceRoots() == null
? Collections.<String>emptyList()
- : new LinkedList<String>( p.getExecutionProject().getCompileSourceRoots() ) );
+ : new LinkedList<>( p.getExecutionProject().getCompileSourceRoots() ) );
}
/**
@@ -2019,7 +2019,7 @@ public abstract class AbstractJavadocMoj
}
}
- List<String> arguments = new ArrayList<String>();
+ List<String> arguments = new ArrayList<>();
// ----------------------------------------------------------------------
// Wrap Javadoc options
@@ -2153,7 +2153,7 @@ public abstract class AbstractJavadocMoj
protected List<String> getFiles( List<String> sourcePaths )
throws MavenReportException
{
- List<String> files = new ArrayList<String>();
+ List<String> files = new ArrayList<>();
if ( StringUtils.isEmpty( subpackages ) )
{
String[] excludedPackages = getExcludedPackages();
@@ -2184,7 +2184,7 @@ public abstract class AbstractJavadocMoj
if ( StringUtils.isEmpty( sourcepath ) )
{
- sourcePaths = new ArrayList<String>( JavadocUtil.pruneDirs( project, getProjectSourceRoots( project ) ) );
+ sourcePaths = new ArrayList<>( JavadocUtil.pruneDirs( project, getProjectSourceRoots( project ) ) );
if ( project.getExecutionProject() != null )
{
@@ -2250,7 +2250,7 @@ public abstract class AbstractJavadocMoj
}
else
{
- sourcePaths = new ArrayList<String>( Arrays.asList( JavadocUtil.splitPath( sourcepath ) ) );
+ sourcePaths = new ArrayList<>( Arrays.asList( JavadocUtil.splitPath( sourcepath ) ) );
sourcePaths = JavadocUtil.pruneDirs( project, sourcePaths );
if ( getJavadocDirectory() != null )
{
@@ -2301,7 +2301,7 @@ public abstract class AbstractJavadocMoj
final SourceResolverConfig config = getDependencySourceResolverConfig();
- final List<TransformableFilter> andFilters = new ArrayList<TransformableFilter>();
+ final List<TransformableFilter> andFilters = new ArrayList<>();
final List<String> dependencyIncludes = dependencySourceIncludes;
final List<String> dependencyExcludes = dependencySourceExcludes;
@@ -2353,7 +2353,7 @@ public abstract class AbstractJavadocMoj
{
Set<Artifact> dependencyArtifacts = project.getDependencyArtifacts();
- List<String> artifactPatterns = new ArrayList<String>( dependencyArtifacts.size() );
+ List<String> artifactPatterns = new ArrayList<>( dependencyArtifacts.size() );
for ( Artifact artifact : dependencyArtifacts )
{
artifactPatterns.add( artifact.getGroupId() + ":" + artifact.getArtifactId() );
@@ -2459,7 +2459,7 @@ public abstract class AbstractJavadocMoj
private String[] getExcludedPackages()
throws MavenReportException
{
- Set<String> excluded = new LinkedHashSet<String>();
+ Set<String> excluded = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -2509,7 +2509,7 @@ public abstract class AbstractJavadocMoj
private static List<String> trimValues( List<String> items )
{
- List<String> result = new ArrayList<String>( items.size() );
+ List<String> result = new ArrayList<>( items.size() );
for ( String item : items )
{
String trimmed = item.trim();
@@ -2536,8 +2536,8 @@ public abstract class AbstractJavadocMoj
private String getClasspath()
throws MavenReportException
{
- List<String> classpathElements = new ArrayList<String>();
- Map<String, Artifact> compileArtifactMap = new HashMap<String, Artifact>();
+ List<String> classpathElements = new ArrayList<>();
+ Map<String, Artifact> compileArtifactMap = new HashMap<>();
if ( isTest() )
{
@@ -2548,7 +2548,7 @@ public abstract class AbstractJavadocMoj
if ( isAggregator() && project.isExecutionRoot() )
{
- List<String> reactorArtifacts = new ArrayList<String>();
+ List<String> reactorArtifacts = new ArrayList<>();
for ( MavenProject p : reactorProjects )
{
reactorArtifacts.add( p.getGroupId() + ':' + p.getArtifactId() );
@@ -2879,7 +2879,7 @@ public abstract class AbstractJavadocMoj
{
Set<BootclasspathArtifact> bootclasspathArtifacts = collectBootClasspathArtifacts();
- List<String> bootclassPath = new ArrayList<String>();
+ List<String> bootclassPath = new ArrayList<>();
for ( BootclasspathArtifact aBootclasspathArtifact : bootclasspathArtifacts )
{
if ( ( StringUtils.isNotEmpty( aBootclasspathArtifact.getGroupId() ) ) && ( StringUtils.isNotEmpty(
@@ -2919,7 +2919,7 @@ public abstract class AbstractJavadocMoj
throws MavenReportException
{
Set<DocletArtifact> docletArtifacts = collectDocletArtifacts();
- List<String> pathParts = new ArrayList<String>();
+ List<String> pathParts = new ArrayList<>();
for ( DocletArtifact docletArtifact : docletArtifacts )
{
@@ -2975,7 +2975,7 @@ public abstract class AbstractJavadocMoj
throws MavenReportException
{
Set<TagletArtifact> tArtifacts = collectTagletArtifacts();
- List<String> pathParts = new ArrayList<String>();
+ List<String> pathParts = new ArrayList<>();
for ( TagletArtifact tagletArtifact : tArtifacts )
{
@@ -3026,7 +3026,7 @@ public abstract class AbstractJavadocMoj
private Set<String> collectLinks()
throws MavenReportException
{
- Set<String> links = new LinkedHashSet<String>();
+ Set<String> links = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3066,7 +3066,7 @@ public abstract class AbstractJavadocMoj
private Set<Group> collectGroups()
throws MavenReportException
{
- Set<Group> groups = new LinkedHashSet<Group>();
+ Set<Group> groups = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3104,7 +3104,7 @@ public abstract class AbstractJavadocMoj
private Set<ResourcesArtifact> collectResourcesArtifacts()
throws MavenReportException
{
- Set<ResourcesArtifact> result = new LinkedHashSet<ResourcesArtifact>();
+ Set<ResourcesArtifact> result = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3142,7 +3142,7 @@ public abstract class AbstractJavadocMoj
private Set<BootclasspathArtifact> collectBootClasspathArtifacts()
throws MavenReportException
{
- Set<BootclasspathArtifact> result = new LinkedHashSet<BootclasspathArtifact>();
+ Set<BootclasspathArtifact> result = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3180,7 +3180,7 @@ public abstract class AbstractJavadocMoj
private Set<OfflineLink> collectOfflineLinks()
throws MavenReportException
{
- Set<OfflineLink> result = new LinkedHashSet<OfflineLink>();
+ Set<OfflineLink> result = new LinkedHashSet<>();
OfflineLink javaApiLink = getDefaultJavadocApiLink();
if ( javaApiLink != null )
@@ -3224,7 +3224,7 @@ public abstract class AbstractJavadocMoj
private Set<Tag> collectTags()
throws MavenReportException
{
- Set<Tag> tags = new LinkedHashSet<Tag>();
+ Set<Tag> tags = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3262,7 +3262,7 @@ public abstract class AbstractJavadocMoj
private Set<TagletArtifact> collectTagletArtifacts()
throws MavenReportException
{
- Set<TagletArtifact> tArtifacts = new LinkedHashSet<TagletArtifact>();
+ Set<TagletArtifact> tArtifacts = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3305,7 +3305,7 @@ public abstract class AbstractJavadocMoj
private Set<DocletArtifact> collectDocletArtifacts()
throws MavenReportException
{
- Set<DocletArtifact> dArtifacts = new LinkedHashSet<DocletArtifact>();
+ Set<DocletArtifact> dArtifacts = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3348,7 +3348,7 @@ public abstract class AbstractJavadocMoj
private Set<Taglet> collectTaglets()
throws MavenReportException
{
- Set<Taglet> result = new LinkedHashSet<Taglet>();
+ Set<Taglet> result = new LinkedHashSet<>();
if ( includeDependencySources )
{
@@ -3399,7 +3399,7 @@ public abstract class AbstractJavadocMoj
return Collections.emptyList();
}
- List<String> path = new ArrayList<String>();
+ List<String> path = new ArrayList<>();
try
{
@@ -4140,7 +4140,7 @@ public abstract class AbstractJavadocMoj
resourceResolver.resolveDependencyJavadocBundles( getDependencySourceResolverConfig() );
if ( dependencyJavadocBundles == null )
{
- dependencyJavadocBundles = new ArrayList<JavadocBundle>();
+ dependencyJavadocBundles = new ArrayList<>();
}
}
}
@@ -4236,7 +4236,7 @@ public abstract class AbstractJavadocMoj
private List<String> getPackageNamesOrFilesWithUnnamedPackages( List<String> sourcePaths, List<String> files,
boolean onlyPackageName )
{
- List<String> returnList = new ArrayList<String>();
+ List<String> returnList = new ArrayList<>();
if ( !StringUtils.isEmpty( sourcepath ) )
{
@@ -4881,7 +4881,7 @@ public abstract class AbstractJavadocMoj
private void addTagletsFromTagletArtifacts( List<String> arguments )
throws MavenReportException
{
- Set<TagletArtifact> tArtifacts = new LinkedHashSet<TagletArtifact>();
+ Set<TagletArtifact> tArtifacts = new LinkedHashSet<>();
if ( tagletArtifacts != null && tagletArtifacts.length > 0 )
{
tArtifacts.addAll( Arrays.asList( tagletArtifacts ) );
@@ -4917,7 +4917,7 @@ public abstract class AbstractJavadocMoj
return;
}
- List<String> tagletsPath = new ArrayList<String>();
+ List<String> tagletsPath = new ArrayList<>();
for ( TagletArtifact aTagletArtifact : tArtifacts )
{
@@ -5176,7 +5176,7 @@ public abstract class AbstractJavadocMoj
inputResourceName = inputResourceName.replaceFirst( "//*", "" );
}
- List<String> classPath = new ArrayList<String>();
+ List<String> classPath = new ArrayList<>();
classPath.add( project.getBuild().getSourceDirectory() );
URL resourceURL = getResource( classPath, inputResourceName );
@@ -5269,7 +5269,7 @@ public abstract class AbstractJavadocMoj
*/
private URL getResource( final List<String> classPath, final String resource )
{
- List<URL> urls = new ArrayList<URL>( classPath.size() );
+ List<URL> urls = new ArrayList<>( classPath.size() );
for ( String filename : classPath )
{
try
@@ -5362,14 +5362,14 @@ public abstract class AbstractJavadocMoj
getLog().debug( "Trying to add links for modules..." );
- Set<String> dependencyArtifactIds = new HashSet<String>();
+ Set<String> dependencyArtifactIds = new HashSet<>();
final Set<Artifact> dependencyArtifacts = project.getDependencyArtifacts();
for ( Artifact artifact : dependencyArtifacts )
{
dependencyArtifactIds.add( artifact.getId() );
}
- List<OfflineLink> modulesLinks = new ArrayList<OfflineLink>();
+ List<OfflineLink> modulesLinks = new ArrayList<>();
String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getOutputDirectory() );
for ( MavenProject p : reactorProjects )
{
@@ -5463,7 +5463,7 @@ public abstract class AbstractJavadocMoj
getLog().debug( "Trying to add links for dependencies..." );
- List<String> dependenciesLinks = new ArrayList<String>();
+ List<String> dependenciesLinks = new ArrayList<>();
final Set<Artifact> dependencies = project.getDependencyArtifacts();
for ( Artifact artifact : dependencies )
@@ -5808,12 +5808,12 @@ public abstract class AbstractJavadocMoj
return null;
}
- Plugin plugin = (Plugin) p.getBuild().getPluginsAsMap().get( pluginId );
+ Plugin plugin = p.getBuild().getPluginsAsMap().get( pluginId );
if ( ( plugin == null ) && ( p.getBuild().getPluginManagement() != null ) && (
p.getBuild().getPluginManagement().getPluginsAsMap() != null ) )
{
- plugin = (Plugin) p.getBuild().getPluginManagement().getPluginsAsMap().get( pluginId );
+ plugin = p.getBuild().getPluginManagement().getPluginsAsMap().get( pluginId );
}
return plugin;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocJar.java Sun Jul 23 09:49:09 2017
@@ -100,6 +100,7 @@ public class JavadocJar
*
* @deprecated
*/
+ @Deprecated
@Parameter( property = "destDir" )
private File destDir;
@@ -158,6 +159,7 @@ public class JavadocJar
private String classifier;
/** {@inheritDoc} */
+ @Override
public void doExecute()
throws MojoExecutionException
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java Sun Jul 23 09:49:09 2017
@@ -98,6 +98,7 @@ public class JavadocReport
// ----------------------------------------------------------------------
/** {@inheritDoc} */
+ @Override
public String getName( Locale locale )
{
if ( StringUtils.isEmpty( name ) )
@@ -109,6 +110,7 @@ public class JavadocReport
}
/** {@inheritDoc} */
+ @Override
public String getDescription( Locale locale )
{
if ( StringUtils.isEmpty( description ) )
@@ -120,6 +122,7 @@ public class JavadocReport
}
/** {@inheritDoc} */
+ @Override
public void generate( Sink sink, Locale locale )
throws MavenReportException
{
@@ -148,12 +151,14 @@ public class JavadocReport
}
/** {@inheritDoc} */
+ @Override
public String getOutputName()
{
return destDir + "/index";
}
/** {@inheritDoc} */
+ @Override
public boolean isExternalReport()
{
return true;
@@ -223,6 +228,7 @@ public class JavadocReport
* </tbody>
* </table>
*/
+ @Override
public boolean canGenerateReport()
{
boolean canGenerate = false;
@@ -252,12 +258,14 @@ public class JavadocReport
}
/** {@inheritDoc} */
+ @Override
public String getCategoryName()
{
return CATEGORY_PROJECT_REPORTS;
}
/** {@inheritDoc} */
+ @Override
public File getReportOutputDirectory()
{
if ( reportOutputDirectory == null )
@@ -273,6 +281,7 @@ public class JavadocReport
*
* @param reportOutputDirectory the directory file to be set
*/
+ @Override
public void setReportOutputDirectory( File reportOutputDirectory )
{
updateReportOutputDirectory( reportOutputDirectory, destDir );
@@ -301,6 +310,7 @@ public class JavadocReport
}
/** {@inheritDoc} */
+ @Override
public void doExecute()
throws MojoExecutionException, MojoFailureException
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java Sun Jul 23 09:49:09 2017
@@ -117,7 +117,7 @@ public class JavadocUtil
*/
public static List<String> pruneDirs( MavenProject project, List<String> dirs )
{
- List<String> pruned = new ArrayList<String>( dirs.size() );
+ List<String> pruned = new ArrayList<>( dirs.size() );
for ( String dir : dirs )
{
if ( dir == null )
@@ -149,7 +149,7 @@ public class JavadocUtil
*/
protected static List<String> pruneFiles( List<String> files )
{
- List<String> pruned = new ArrayList<String>( files.size() );
+ List<String> pruned = new ArrayList<>( files.size() );
for ( String f : files )
{
if ( !shouldPruneFile( f, pruned ) )
@@ -194,7 +194,7 @@ public class JavadocUtil
protected static List<String> getExcludedNames( List<String> sourcePaths, String[] subpackagesList,
String[] excludedPackages )
{
- List<String> excludedNames = new ArrayList<String>();
+ List<String> excludedNames = new ArrayList<>();
for ( String path : sourcePaths )
{
for ( String aSubpackagesList : subpackagesList )
@@ -290,7 +290,7 @@ public class JavadocUtil
return;
}
- List<String> excludes = new ArrayList<String>();
+ List<String> excludes = new ArrayList<>();
excludes.addAll( Arrays.asList( FileUtils.getDefaultExcludes() ) );
if ( StringUtils.isNotEmpty( excludedocfilessubdir ) )
@@ -342,7 +342,7 @@ public class JavadocUtil
*/
protected static List<String> getIncludedFiles( File sourceDirectory, String[] fileList, String[] excludePackages )
{
- List<String> files = new ArrayList<String>();
+ List<String> files = new ArrayList<>();
for ( String aFileList : fileList )
{
@@ -416,7 +416,7 @@ public class JavadocUtil
*/
protected static List<String> getExcludedPackages( String sourceDirectory, String[] excludePackagenames )
{
- List<String> files = new ArrayList<String>();
+ List<String> files = new ArrayList<>();
for ( String excludePackagename : excludePackagenames )
{
String[] fileList = FileUtils.getFilesFromExtension( sourceDirectory, new String[] { "java" } );
@@ -436,7 +436,7 @@ public class JavadocUtil
}
}
- List<String> excluded = new ArrayList<String>();
+ List<String> excluded = new ArrayList<>();
for ( String file : files )
{
int idx = file.lastIndexOf( File.separatorChar );
@@ -783,7 +783,7 @@ public class JavadocUtil
cl = new URLClassLoader( new URL[] { jarFile.toURI().toURL() }, null );
}
- List<String> tagletClasses = new ArrayList<String>();
+ List<String> tagletClasses = new ArrayList<>();
Class<?> tagletClass = cl.loadClass( "com.sun.tools.doclets.Taglet" );
for ( String s : classes )
@@ -1021,7 +1021,7 @@ public class JavadocUtil
return null;
}
- List<String> subpaths = new ArrayList<String>();
+ List<String> subpaths = new ArrayList<>();
PathTokenizer pathTokenizer = new PathTokenizer( path );
while ( pathTokenizer.hasMoreTokens() )
{
@@ -1074,7 +1074,7 @@ public class JavadocUtil
throw new IOException( "The jar '" + jarFile + "' doesn't exist or is not a file." );
}
- List<String> classes = new ArrayList<String>();
+ List<String> classes = new ArrayList<>();
JarInputStream jarStream = null;
try
@@ -1503,7 +1503,7 @@ public class JavadocUtil
return null;
}
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
StringTokenizer st = new StringTokenizer( src, "[,:;]" );
StringBuilder sb = new StringBuilder( 256 );
@@ -1540,7 +1540,7 @@ public class JavadocUtil
return null;
}
- List<T> result = new ArrayList<T>();
+ List<T> result = new ArrayList<>();
if ( single != null )
{
result.add( single );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java Sun Jul 23 09:49:09 2017
@@ -91,6 +91,7 @@ extends AbstractJavadocMojo
* {@inheritDoc}
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void doExecute()
throws MojoExecutionException, MojoFailureException
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestFixJavadocMojo.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestFixJavadocMojo.java Sun Jul 23 09:49:09 2017
@@ -47,27 +47,31 @@ public class TestFixJavadocMojo
extends AbstractFixJavadocMojo
{
/** {@inheritDoc} */
+ @Override
protected List<String> getProjectSourceRoots( MavenProject p )
{
return ( p.getTestCompileSourceRoots() == null ? Collections.<String>emptyList()
- : new LinkedList<String>( p.getTestCompileSourceRoots() ) );
+ : new LinkedList<>( p.getTestCompileSourceRoots() ) );
}
/** {@inheritDoc} */
+ @Override
protected List<String> getCompileClasspathElements( MavenProject p )
throws DependencyResolutionRequiredException
{
return ( p.getTestClasspathElements() == null ? Collections.<String>emptyList()
- : new LinkedList<String>( p.getTestClasspathElements() ) );
+ : new LinkedList<>( p.getTestClasspathElements() ) );
}
/** {@inheritDoc} */
+ @Override
protected String getArtifactType( MavenProject p )
{
return "test-jar";
}
/** {@inheritDoc} */
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocJar.java Sun Jul 23 09:49:09 2017
@@ -163,7 +163,7 @@ public class TestJavadocJar
@Override
protected List<String> getProjectBuildOutputDirs( MavenProject p )
{
- List<String> dirs = new ArrayList<String>();
+ List<String> dirs = new ArrayList<>();
if ( StringUtils.isNotEmpty( p.getBuild().getOutputDirectory() ) )
{
dirs.add( p.getBuild().getOutputDirectory() );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/TestJavadocReport.java Sun Jul 23 09:49:09 2017
@@ -241,7 +241,7 @@ public class TestJavadocReport
@Override
protected List<String> getProjectBuildOutputDirs( MavenProject p )
{
- List<String> dirs = new ArrayList<String>();
+ List<String> dirs = new ArrayList<>();
if ( StringUtils.isNotEmpty( p.getBuild().getOutputDirectory() ) )
{
dirs.add( p.getBuild().getOutputDirectory() );
@@ -263,7 +263,7 @@ public class TestJavadocReport
}
return ( p.getTestCompileSourceRoots() == null ? Collections.<String>emptyList()
- : new LinkedList<String>( p.getTestCompileSourceRoots() ) );
+ : new LinkedList<>( p.getTestCompileSourceRoots() ) );
}
@Override
@@ -275,7 +275,7 @@ public class TestJavadocReport
}
return ( p.getExecutionProject().getTestCompileSourceRoots() == null ? Collections.<String>emptyList()
- : new LinkedList<String>( p.getExecutionProject().getTestCompileSourceRoots() ) );
+ : new LinkedList<>( p.getExecutionProject().getTestCompileSourceRoots() ) );
}
@Override
@@ -327,7 +327,7 @@ public class TestJavadocReport
{
if ( links == null )
{
- links = new ArrayList<String>();
+ links = new ArrayList<>();
}
// TODO the prerequisite is that the main report is in apidocs
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/resolver/ResourceResolver.java Sun Jul 23 09:49:09 2017
@@ -104,9 +104,9 @@ public final class ResourceResolver exte
public List<JavadocBundle> resolveDependencyJavadocBundles( final SourceResolverConfig config )
throws IOException
{
- final List<JavadocBundle> bundles = new ArrayList<JavadocBundle>();
+ final List<JavadocBundle> bundles = new ArrayList<>();
- final Map<String, MavenProject> projectMap = new HashMap<String, MavenProject>();
+ final Map<String, MavenProject> projectMap = new HashMap<>();
if ( config.reactorProjects() != null )
{
for ( final MavenProject p : config.reactorProjects() )
@@ -117,7 +117,7 @@ public final class ResourceResolver exte
final List<Artifact> artifacts = config.project().getTestArtifacts();
- final List<Artifact> forResourceResolution = new ArrayList<Artifact>( artifacts.size() );
+ final List<Artifact> forResourceResolution = new ArrayList<>( artifacts.size() );
for ( final Artifact artifact : artifacts )
{
final String key = key( artifact.getGroupId(), artifact.getArtifactId() );
@@ -146,9 +146,9 @@ public final class ResourceResolver exte
public List<String> resolveDependencySourcePaths( final SourceResolverConfig config )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- final List<String> dirs = new ArrayList<String>();
+ final List<String> dirs = new ArrayList<>();
- final Map<String, MavenProject> projectMap = new HashMap<String, MavenProject>();
+ final Map<String, MavenProject> projectMap = new HashMap<>();
if ( config.reactorProjects() != null )
{
for ( final MavenProject p : config.reactorProjects() )
@@ -159,7 +159,7 @@ public final class ResourceResolver exte
final List<Artifact> artifacts = config.project().getTestArtifacts();
- final List<Artifact> forResourceResolution = new ArrayList<Artifact>( artifacts.size() );
+ final List<Artifact> forResourceResolution = new ArrayList<>( artifacts.size() );
for ( final Artifact artifact : artifacts )
{
final String key = key( artifact.getGroupId(), artifact.getArtifactId() );
@@ -182,9 +182,9 @@ public final class ResourceResolver exte
private static List<JavadocBundle> resolveBundleFromProject( SourceResolverConfig config, MavenProject project,
Artifact artifact ) throws IOException
{
- List<JavadocBundle> bundles = new ArrayList<JavadocBundle>();
+ List<JavadocBundle> bundles = new ArrayList<>();
- List<String> classifiers = new ArrayList<String>();
+ List<String> classifiers = new ArrayList<>();
if ( config.includeCompileSources() )
{
classifiers.add( AbstractJavadocMojo.JAVADOC_RESOURCES_ATTACHMENT_CLASSIFIER );
@@ -237,7 +237,7 @@ public final class ResourceResolver exte
final List<Artifact> artifacts )
throws IOException
{
- final List<Artifact> toResolve = new ArrayList<Artifact>( artifacts.size() );
+ final List<Artifact> toResolve = new ArrayList<>( artifacts.size() );
for ( final Artifact artifact : artifacts )
{
@@ -282,7 +282,7 @@ public final class ResourceResolver exte
}
}
- List<JavadocBundle> result = new ArrayList<JavadocBundle>();
+ List<JavadocBundle> result = new ArrayList<>();
if ( dirs != null )
{
@@ -325,7 +325,7 @@ public final class ResourceResolver exte
final List<Artifact> artifacts )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- final List<Artifact> toResolve = new ArrayList<Artifact>( artifacts.size() );
+ final List<Artifact> toResolve = new ArrayList<>( artifacts.size() );
for ( final Artifact artifact : artifacts )
{
@@ -370,7 +370,7 @@ public final class ResourceResolver exte
// NOTE: Since these are '-sources' and '-test-sources' artifacts, they won't actually
// resolve transitively...this is just used to aggregate resolution failures into a single
// exception.
- final Set<Artifact> artifactSet = new LinkedHashSet<Artifact>( artifacts );
+ final Set<Artifact> artifactSet = new LinkedHashSet<>( artifacts );
final ArtifactFilter filter;
if ( config.filter() != null )
@@ -382,7 +382,7 @@ public final class ResourceResolver exte
filter = null;
}
- final List<String> result = new ArrayList<String>( artifacts.size() );
+ final List<String> result = new ArrayList<>( artifacts.size() );
for ( final Artifact a : artifactSet )
{
if ( !validClassifiers.contains( a.getClassifier() ) || ( filter != null && !filter.include( a ) ) )
@@ -442,7 +442,7 @@ public final class ResourceResolver exte
private static List<String> resolveFromProject( final SourceResolverConfig config,
final MavenProject reactorProject, final Artifact artifact )
{
- final List<String> dirs = new ArrayList<String>();
+ final List<String> dirs = new ArrayList<>();
if ( config.filter() == null
|| new ArtifactIncludeFilterTransformer().transform( config.filter() ).include( artifact ) )
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojoTest.java Sun Jul 23 09:49:09 2017
@@ -191,6 +191,7 @@ public class AbstractFixJavadocMojoTest
protected class PrivateAbstractInheritableJavaEntity
extends AbstractInheritableJavaEntity
{
+ @Override
public int compareTo( Object o )
{
return 0;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java Sun Jul 23 09:49:09 2017
@@ -45,6 +45,7 @@ public class AggregatorJavadocReportTest
private File localRepo;
/** {@inheritDoc} */
+ @Override
protected void setUp()
throws Exception
{
@@ -186,7 +187,7 @@ public class AggregatorJavadocReportTest
throws Exception
{
File testPom = new File( unit, "aggregate-test/aggregate-test-plugin-config.xml" );
- JavadocReport mojo = (JavadocReport) lookupMojo( testPom );
+ JavadocReport mojo = lookupMojo( testPom );
mojo.execute();
File apidocs = new File( getBasedir(), "target/test/unit/aggregate-test/target/site/apidocs/" );
@@ -213,7 +214,7 @@ public class AggregatorJavadocReportTest
throws Exception
{
File testPom = new File( unit, "aggregate-resources-test/aggregate-resources-test-plugin-config.xml" );
- JavadocReport mojo = (JavadocReport) lookupMojo( testPom );
+ JavadocReport mojo = lookupMojo( testPom );
mojo.execute();
File apidocs = new File( getBasedir(), "target/test/unit/aggregate-resources-test/target/site/apidocs" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java Sun Jul 23 09:49:09 2017
@@ -62,6 +62,7 @@ public class FixJavadocMojoTest
private static boolean TEST_REPO_CREATED = false;
/** {@inheritDoc} */
+ @Override
protected void setUp()
throws Exception
{
@@ -676,7 +677,7 @@ public class FixJavadocMojoTest
private void invokeCompileGoal( File testPom, Log log )
throws MavenInvocationException
{
- List<String> goals = new ArrayList<String>();
+ List<String> goals = new ArrayList<>();
goals.add( "clean" );
goals.add( "compile" );
File invokerDir = new File( getBasedir(), "target/invoker" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocJarTest.java Sun Jul 23 09:49:09 2017
@@ -77,7 +77,7 @@ public class JavadocJarTest
//validate contents of jar file
ZipFile jar = new ZipFile( generatedFile );
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
for( Enumeration<? extends ZipEntry> entries = jar.entries(); entries.hasMoreElements(); )
{
ZipEntry entry = entries.nextElement();
@@ -171,7 +171,7 @@ public class JavadocJarTest
//validate contents of jar file
ZipFile jar = new ZipFile( generatedFile );
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
for (Enumeration<? extends ZipEntry> entries = jar.entries(); entries.hasMoreElements(); )
{
ZipEntry entry = entries.nextElement();
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java Sun Jul 23 09:49:09 2017
@@ -70,6 +70,7 @@ public class JavadocReportTest
private File localRepo;
/** {@inheritDoc} */
+ @Override
protected void setUp()
throws Exception
{
@@ -862,7 +863,7 @@ public class JavadocReportTest
}
// auth proxy
- Map<String, String> authentications = new HashMap<String, String>();
+ Map<String, String> authentications = new HashMap<>();
authentications.put( "foo", "bar" );
try
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/JavadocUtilTest.java Sun Jul 23 09:49:09 2017
@@ -375,7 +375,7 @@ public class JavadocUtilTest
}
}
- Map<String, String> authentications = new HashMap<String, String>();
+ Map<String, String> authentications = new HashMap<>();
authentications.put( "foo", "bar" );
// wrong auth
try
@@ -524,7 +524,7 @@ public class JavadocUtilTest
assertTrue( output.mkdirs() );
JavadocUtil.copyJavadocResources( output, input, null );
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" + File.separator
+ "sample-excluded1.gif" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir2" + File.separator
@@ -534,7 +534,7 @@ public class JavadocUtilTest
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" + File.separator
+ "sample-included2.gif" );
assertTrue( EqualsBuilder.reflectionEquals( expected, FileUtils.getFiles( output, null, null, false ) ) );
- expected = new ArrayList<String>();
+ expected = new ArrayList<>();
expected.add( "" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "excluded-dir1" );
@@ -556,13 +556,13 @@ public class JavadocUtilTest
assertTrue( output.mkdirs() );
JavadocUtil.copyJavadocResources( output, input, "excluded-dir1:excluded-dir2" );
- expected = new ArrayList<String>();
+ expected = new ArrayList<>();
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir1" + File.separator
+ "sample-included1.gif" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" + File.separator
+ "sample-included2.gif" );
assertTrue( EqualsBuilder.reflectionEquals( expected, FileUtils.getFiles( output, null, null, false ) ) );
- expected = new ArrayList<String>();
+ expected = new ArrayList<>();
expected.add( "" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir1" );
expected.add( "test" + File.separator + "doc-files" + File.separator + "included-dir2" );
@@ -580,12 +580,12 @@ public class JavadocUtilTest
public void testPruneDirs()
throws Exception
{
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add( getBasedir() + "/target/classes" );
list.add( getBasedir() + "/target/classes" );
list.add( getBasedir() + "/target/classes" );
- List<String> expected = new ArrayList<String>();
+ List<String> expected = new ArrayList<>();
expected.add( getBasedir() + "/target/classes" );
assertTrue( EqualsBuilder.reflectionEquals( expected, JavadocUtil.pruneDirs( null, list ) ) );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/ProxyServer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/ProxyServer.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/ProxyServer.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/ProxyServer.java Sun Jul 23 09:49:09 2017
@@ -188,6 +188,7 @@ class ProxyServer
}
/** {@inheritDoc} */
+ @Override
public void service( ServletRequest req, ServletResponse res )
throws ServletException, IOException
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject1TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject1TestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject1TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject1TestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -53,18 +53,20 @@ public class AggregateProject1TestMavenP
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/aggregate/test/project1" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-test/project1" );
}
/** {@inheritDoc} */
+ @Override
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject2TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject2TestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject2TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateProject2TestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -53,18 +53,20 @@ public class AggregateProject2TestMavenP
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( basedir + "/aggregate/test/project2" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-test/project2" );
}
/** {@inheritDoc} */
+ @Override
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject1TestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -58,18 +58,20 @@ public class AggregateResourcesProject1T
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-resources-test/project1/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir().getAbsolutePath() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-resources-test/project1" );
}
/** {@inheritDoc} */
+ @Override
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesProject2TestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -58,18 +58,20 @@ public class AggregateResourcesProject2T
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-resources-test/project2/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-resources-test/project2" );
}
/** {@inheritDoc} */
+ @Override
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateResourcesTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -53,17 +53,19 @@ public class AggregateResourcesTestMaven
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-resources-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-resources-test" );
}
/** {@inheritDoc} */
+ @Override
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/AggregateTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -52,30 +52,34 @@ public class AggregateTestMavenProjectSt
build.setFinalName( getModel().getArtifactId() );
build.setDirectory( super.getBasedir() + "/target/test/unit/aggregate-test/target" );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Build getBuild()
{
return build;
}
/** {@inheritDoc} */
+ @Override
public void setBuild( Build build )
{
this.build = build;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/aggregate-test" );
}
/** {@inheritDoc} */
+ @Override
public MavenProject getExecutionProject()
{
return this;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/CustomConfigurationMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -61,7 +61,7 @@ public class CustomConfigurationMavenPro
build.setDirectory( super.getBasedir() + "/target/test/unit/custom-configuration/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
String temp = getBasedir().getAbsolutePath();
if( !temp.startsWith( "/" ) )
{
@@ -72,30 +72,35 @@ public class CustomConfigurationMavenPro
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public Build getBuild()
{
return build;
}
/** {@inheritDoc} */
+ @Override
public void setBuild( Build build )
{
this.build = build;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/custom-configuration/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultArtifactHandlerStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultArtifactHandlerStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultArtifactHandlerStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultArtifactHandlerStub.java Sun Jul 23 09:49:09 2017
@@ -31,6 +31,7 @@ public class DefaultArtifactHandlerStub
private String language;
/** {@inheritDoc} */
+ @Override
public String getLanguage()
{
if ( language == null )
@@ -44,6 +45,7 @@ public class DefaultArtifactHandlerStub
/**
* @param language
*/
+ @Override
public void setLanguage( String language )
{
this.language = language;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DefaultConfigurationMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -56,24 +56,27 @@ public class DefaultConfigurationMavenPr
build.setDirectory( super.getBasedir() + "/target/test/unit/default-configuration/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/def/configuration" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/default-configuration/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -57,24 +57,27 @@ public class DocfilesTestMavenProjectStu
build.setDirectory( super.getBasedir() + "/target/test/unit/docfiles-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/docfiles/test" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/docfiles-test/" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocfilesWithJavaTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -47,12 +47,13 @@ public class DocfilesWithJavaTestMavenPr
build.setDirectory( super.getBasedir() + "/target/test/unit/docfiles-with-java-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/docfiles-with-java-test/src/main" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir(), "/src/test/resources/unit/docfiles-with-java-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletPathTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -56,24 +56,27 @@ public class DocletPathTestMavenProjectS
build.setDirectory( super.getBasedir() + "/target/test/unit/doclet-path-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/doclet/test" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/doclet-path-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/DocletTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -57,24 +57,27 @@ public class DocletTestMavenProjectStub
build.setDirectory( super.getBasedir() + "/target/test/unit/doclet-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/doclet/test" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public Scm getScm()
{
return scm;
}
/** {@inheritDoc} */
+ @Override
public void setScm( Scm scm )
{
this.scm = scm;
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/doclet-test" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk5MavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk5MavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk5MavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk5MavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -48,12 +48,14 @@ public class FixJdk5MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getArtifactId()
{
return getModel().getArtifactId();
}
/** {@inheritDoc} */
+ @Override
public String getGroupId()
{
String groupId = getModel().getGroupId();
@@ -67,6 +69,7 @@ public class FixJdk5MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getVersion()
{
String version = getModel().getVersion();
@@ -80,12 +83,14 @@ public class FixJdk5MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getPackaging()
{
return getModel().getPackaging();
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
// Using unit test dir
@@ -93,6 +98,7 @@ public class FixJdk5MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public File getFile()
{
return new File( getBasedir(), "pom.xml" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk6MavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk6MavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk6MavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixJdk6MavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -48,12 +48,14 @@ public class FixJdk6MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getArtifactId()
{
return getModel().getArtifactId();
}
/** {@inheritDoc} */
+ @Override
public String getGroupId()
{
String groupId = getModel().getGroupId();
@@ -67,6 +69,7 @@ public class FixJdk6MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getVersion()
{
String version = getModel().getVersion();
@@ -80,12 +83,14 @@ public class FixJdk6MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getPackaging()
{
return getModel().getPackaging();
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
// Using unit test dir
@@ -93,6 +98,7 @@ public class FixJdk6MavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public File getFile()
{
return new File( getBasedir(), "pom.xml" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/FixMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -48,12 +48,14 @@ public class FixMavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getArtifactId()
{
return getModel().getArtifactId();
}
/** {@inheritDoc} */
+ @Override
public String getGroupId()
{
String groupId = getModel().getGroupId();
@@ -67,6 +69,7 @@ public class FixMavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getVersion()
{
String version = getModel().getVersion();
@@ -80,12 +83,14 @@ public class FixMavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public String getPackaging()
{
return getModel().getPackaging();
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
// Using unit test dir
@@ -93,6 +98,7 @@ public class FixMavenProjectStub
}
/** {@inheritDoc} */
+ @Override
public File getFile()
{
return new File( getBasedir(), "pom.xml" );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java?rev=1802719&r1=1802718&r2=1802719&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/stubs/HeaderFooterTestMavenProjectStub.java Sun Jul 23 09:49:09 2017
@@ -49,12 +49,13 @@ public class HeaderFooterTestMavenProjec
build.setDirectory( super.getBasedir() + "/target/test/unit/header-footer-test/target" );
setBuild( build );
- List<String> compileSourceRoots = new ArrayList<String>();
+ List<String> compileSourceRoots = new ArrayList<>();
compileSourceRoots.add( getBasedir() + "/src/main/java" );
setCompileSourceRoots( compileSourceRoots );
}
/** {@inheritDoc} */
+ @Override
public File getBasedir()
{
return new File( super.getBasedir() + "/src/test/resources/unit/header-footer-test" );