[MNG-6847] Use diamond operator
Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.UseDiamondOperator?organizationId=QXBhY2hlIE1hdmVu
Co-authored-by: Moderne <team@moderne.io>
diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
index b58cb3f..13ea8c0 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
@@ -62,7 +62,7 @@
{
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
- List<ChangeLogSet> changeLogSets = new ArrayList<ChangeLogSet>();
+ List<ChangeLogSet> changeLogSets = new ArrayList<>();
parser.parse( stream, new ChangeLogHandler( changeLogSets ) );
@@ -74,7 +74,7 @@
{
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
- List<ChangeLogSet> changeLogSets = new ArrayList<ChangeLogSet>();
+ List<ChangeLogSet> changeLogSets = new ArrayList<>();
// CHECKSTYLE_OFF: MagicNumber
BufferedReader br = new BufferedReader( reader, 8192 );
diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
index 2026106..b0278ef 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
@@ -196,7 +196,7 @@
}
else if ( "changeset".equals( qName ) )
{
- bufEntries = new LinkedList<ChangeSet>();
+ bufEntries = new LinkedList<>();
currentPattern = attributes.getValue( "datePattern" );
if ( currentPattern == null )
diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
index 8bf7f4f..d335a30 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
@@ -494,8 +494,8 @@
*/
private void initializeDeveloperMaps()
{
- developersById = new HashMap<String, Developer>();
- developersByName = new HashMap<String, Developer>();
+ developersById = new HashMap<>();
+ developersByName = new HashMap<>();
if ( developers != null )
{
@@ -636,7 +636,7 @@
{
try
{
- List<ChangeLogSet> changeSets = new ArrayList<ChangeLogSet>();
+ List<ChangeLogSet> changeSets = new ArrayList<>();
ScmRepository repository = getScmRepository();
@@ -805,9 +805,9 @@
{
if ( patternArray == null )
{
- return new ArrayList<Pattern>();
+ return new ArrayList<>();
}
- List<Pattern> patterns = new ArrayList<Pattern>( patternArray.length );
+ List<Pattern> patterns = new ArrayList<>( patternArray.length );
for ( String string : patternArray )
{
//replaces * with [/\]* (everything but file seperators)
@@ -1304,7 +1304,7 @@
return 0;
}
- HashMap<String, List<ChangeFile>> fileList = new HashMap<String, List<ChangeFile>>();
+ HashMap<String, List<ChangeFile>> fileList = new HashMap<>();
for ( ChangeSet entry : entries )
{
@@ -1319,7 +1319,7 @@
}
else
{
- list = new LinkedList<ChangeFile>();
+ list = new LinkedList<>();
list.add( file );
@@ -1356,7 +1356,7 @@
initReportUrls();
- List<ChangeSet> sortedEntries = new ArrayList<ChangeSet>( entries );
+ List<ChangeSet> sortedEntries = new ArrayList<>( entries );
Collections.sort( sortedEntries, new Comparator<ChangeSet>()
{
public int compare( ChangeSet changeSet0, ChangeSet changeSet1 )
diff --git a/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java b/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
index d43a19d..2ab9e21 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
@@ -218,9 +218,9 @@
*/
private void initDeveloperDetails( ChangeLogSet set )
{
- commits = new HashMap<String, List<ChangeSet>>();
+ commits = new HashMap<>();
- files = new HashMap<String, Map<String, ChangeFile>>();
+ files = new HashMap<>();
countDevCommits( set.getChangeSets() );
@@ -242,7 +242,7 @@
if ( list == null )
{
- list = new LinkedList<ChangeSet>();
+ list = new LinkedList<>();
commits.put( developer, list );
}
@@ -265,7 +265,7 @@
if ( filesMap == null )
{
- filesMap = new HashMap<String, ChangeFile>();
+ filesMap = new HashMap<>();
files.put( developer, filesMap );
}
diff --git a/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java b/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
index 38b35ea..f4efe21 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
@@ -213,9 +213,9 @@
*/
private List<List<ChangeFile>> getOrderedFileList( Collection<ChangeSet> entries )
{
- List<List<ChangeFile>> list = new LinkedList<List<ChangeFile>>();
+ List<List<ChangeFile>> list = new LinkedList<>();
- Map<String, List<ChangeFile>> map = new HashMap<String, List<ChangeFile>>();
+ Map<String, List<ChangeFile>> map = new HashMap<>();
for ( ChangeSet entry : entries )
{
@@ -225,7 +225,7 @@
if ( revisions == null )
{
- revisions = new LinkedList<ChangeFile>();
+ revisions = new LinkedList<>();
map.put( file.getName(), revisions );
}
diff --git a/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java b/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
index 4eef04f..651bf83 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
@@ -47,17 +47,17 @@
@Test
public void testCompareByNumberOfCommits()
{
- List<ChangeFile> list1 = new ArrayList<ChangeFile>();
+ List<ChangeFile> list1 = new ArrayList<>();
list1.add( new ChangeFile( "anything" ) );
- List<ChangeFile> list2 = new ArrayList<ChangeFile>();
+ List<ChangeFile> list2 = new ArrayList<>();
assertTrue( "Test compare by commits, less than", comparator.compare( list1, list2 ) < 0 );
- list1 = new ArrayList<ChangeFile>();
+ list1 = new ArrayList<>();
list1.add( new ChangeFile( "anything" ) );
- list2 = new ArrayList<ChangeFile>();
+ list2 = new ArrayList<>();
list2.add( new ChangeFile( "one thing" ) );
list2.add( new ChangeFile( "something" ) );
@@ -67,21 +67,21 @@
@Test
public void testCompareByRevision()
{
- List<ChangeFile> list1 = new ArrayList<ChangeFile>();
+ List<ChangeFile> list1 = new ArrayList<>();
list1.add( new ChangeFile( "changefile-1", "123" ) );
list1.add( new ChangeFile( "changefile-1", "234" ) );
- List<ChangeFile> list2 = new ArrayList<ChangeFile>();
+ List<ChangeFile> list2 = new ArrayList<>();
list2.add( new ChangeFile( "changefile-2", "246" ) );
list2.add( new ChangeFile( "changefile-2", "468" ) );
assertTrue( "Test compare by revision, less than", comparator.compare( list1, list2 ) < 0 );
- list1 = new ArrayList<ChangeFile>();
+ list1 = new ArrayList<>();
list1.add( new ChangeFile( "changefile-1", "246" ) );
list1.add( new ChangeFile( "changefile-1", "468" ) );
- list2 = new ArrayList<ChangeFile>();
+ list2 = new ArrayList<>();
list2.add( new ChangeFile( "changefile-2", "123" ) );
list2.add( new ChangeFile( "changefile-2", "234" ) );
@@ -91,21 +91,21 @@
@Test
public void testCompareByName()
{
- List<ChangeFile> list1 = new ArrayList<ChangeFile>();
+ List<ChangeFile> list1 = new ArrayList<>();
list1.add( new ChangeFile( "changefile-1", "123" ) );
list1.add( new ChangeFile( "changefile-1", "468" ) );
- List<ChangeFile> list2 = new ArrayList<ChangeFile>();
+ List<ChangeFile> list2 = new ArrayList<>();
list2.add( new ChangeFile( "changefile-2", "246" ) );
list2.add( new ChangeFile( "changefile-2", "468" ) );
assertTrue( "Test compare by name, less than", comparator.compare( list1, list2 ) < 0 );
- list1 = new ArrayList<ChangeFile>();
+ list1 = new ArrayList<>();
list1.add( new ChangeFile( "changefile-1", "246" ) );
list1.add( new ChangeFile( "changefile-1", "468" ) );
- list2 = new ArrayList<ChangeFile>();
+ list2 = new ArrayList<>();
list2.add( new ChangeFile( "changefile-2", "123" ) );
list2.add( new ChangeFile( "changefile-2", "234" ) );
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java
index f47dc9e..3d117ce 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java
@@ -35,7 +35,7 @@
{
super();
- List<Developer> developers = new ArrayList<Developer>();
+ List<Developer> developers = new ArrayList<>();
Developer developer = new Developer();
developer.setName( "Edwin Punzalan" );
