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-ear-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 400a2d2 [MNG-6847] Use diamond operator (#96)
400a2d2 is described below
commit 400a2d245d00b80682ae9e10c56d60c8e6a88d67
Author: Tim te Beek <[email protected]>
AuthorDate: Wed Aug 30 13:34:41 2023 +0200
[MNG-6847] Use diamond operator (#96)
Use this link to re-run the recipe:
https://app.moderne.io/recipes/org.openrewrite.staticanalysis.UseDiamondOperator?organizationId=QXBhY2hlIE1hdmVu
Co-authored-by: Moderne <[email protected]>
---
src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java | 4 ++--
src/main/java/org/apache/maven/plugins/ear/EarMojo.java | 4 ++--
.../org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java | 8 ++++----
.../org/apache/maven/plugins/ear/util/ArtifactRepository.java | 2 +-
.../apache/maven/plugins/ear/util/ArtifactTypeMappingService.java | 6 +++---
.../java/org/apache/maven/plugins/ear/util/JavaEEVersion.java | 2 +-
.../java/org/apache/maven/plugins/ear/AbstractEarTestBase.java | 2 +-
.../java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java | 4 ++--
.../org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java
b/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java
index 1c0a244..704f158 100644
--- a/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java
@@ -204,7 +204,7 @@ public abstract class AbstractEarMojo
outputFileNameMapping, typeMappingService
);
getLog().debug( "Resolving ear modules ..." );
- List<EarModule> allModules = new ArrayList<EarModule>();
+ List<EarModule> allModules = new ArrayList<>();
try
{
if ( modules != null && modules.length > 0 )
@@ -394,7 +394,7 @@ public abstract class AbstractEarMojo
final String jmxName = jboss.getChild( JbossConfiguration.JMX_NAME
).getValue();
final String moduleOrder = jboss.getChild(
JbossConfiguration.MODULE_ORDER ).getValue();
- final List<String> dataSources = new ArrayList<String>();
+ final List<String> dataSources = new ArrayList<>();
final PlexusConfiguration dataSourcesEl = jboss.getChild(
JbossConfiguration.DATASOURCES );
if ( dataSourcesEl != null )
{
diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
index ea0bc20..3f11163 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
@@ -492,7 +492,7 @@ public class EarMojo
private List<String> createUnpackList()
throws MojoExecutionException
{
- List<String> unpackTypesList = new ArrayList<String>();
+ List<String> unpackTypesList = new ArrayList<>();
if ( unpackTypes != null )
{
unpackTypesList = Arrays.asList( unpackTypes.split( "," ) );
@@ -532,7 +532,7 @@ public class EarMojo
*/
protected String[] getExcludes()
{
- List<String> excludeList = new ArrayList<String>(
FileUtils.getDefaultExcludesAsList() );
+ List<String> excludeList = new ArrayList<>(
FileUtils.getDefaultExcludesAsList() );
if ( earSourceExcludes != null && !"".equals( earSourceExcludes ) )
{
excludeList.addAll( Arrays.asList( StringUtils.split(
earSourceExcludes, "," ) ) );
diff --git
a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
index de70e2f..d792f61 100644
--- a/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/GenerateApplicationXmlMojo.java
@@ -288,7 +288,7 @@ public class GenerateApplicationXmlMojo
private List<SecurityRole> buildSecurityRoles()
throws EarPluginException
{
- final List<SecurityRole> result = new ArrayList<SecurityRole>();
+ final List<SecurityRole> result = new ArrayList<>();
if ( security == null )
{
return result;
@@ -349,7 +349,7 @@ public class GenerateApplicationXmlMojo
private List<EnvEntry> buildEnvEntries()
throws EarPluginException
{
- final List<EnvEntry> result = new ArrayList<EnvEntry>();
+ final List<EnvEntry> result = new ArrayList<>();
if ( envEntries == null )
{
return result;
@@ -404,7 +404,7 @@ public class GenerateApplicationXmlMojo
private List<EjbRef> buildEjbEntries()
throws EarPluginException
{
- final List<EjbRef> result = new ArrayList<EjbRef>();
+ final List<EjbRef> result = new ArrayList<>();
if ( ejbRefs == null )
{
return result;
@@ -454,7 +454,7 @@ public class GenerateApplicationXmlMojo
private List<ResourceRef> buildResourceRefs()
throws EarPluginException
{
- final List<ResourceRef> result = new ArrayList<ResourceRef>();
+ final List<ResourceRef> result = new ArrayList<>();
if ( resourceRefs == null )
{
return result;
diff --git
a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java
b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java
index 558c19d..5baed1f 100644
--- a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java
+++ b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactRepository.java
@@ -129,7 +129,7 @@ public class ArtifactRepository
*/
public Set<Artifact> getArtifacts( String groupId, String artifactId,
String type )
{
- final Set<Artifact> result = new TreeSet<Artifact>();
+ final Set<Artifact> result = new TreeSet<>();
for ( Artifact a : artifacts )
{
// If the groupId, the artifactId and if the
diff --git
a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java
b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java
index a3105c4..3c11213 100644
---
a/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java
+++
b/src/main/java/org/apache/maven/plugins/ear/util/ArtifactTypeMappingService.java
@@ -54,8 +54,8 @@ public class ArtifactTypeMappingService
*/
public ArtifactTypeMappingService()
{
- this.typeMappings = new HashMap<String, List<String>>();
- this.customMappings = new HashMap<String, String>();
+ this.typeMappings = new HashMap<>();
+ this.customMappings = new HashMap<>();
init();
}
@@ -170,7 +170,7 @@ public class ArtifactTypeMappingService
// Initialize the mapping with the standard artifact types
for ( String type : EarModuleFactory.getStandardArtifactTypes() )
{
- List<String> typeMapping = new ArrayList<String>();
+ List<String> typeMapping = new ArrayList<>();
typeMapping.add( type );
this.typeMappings.put( type, typeMapping );
}
diff --git a/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
b/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
index 61b5057..8e6173f 100644
--- a/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
+++ b/src/main/java/org/apache/maven/plugins/ear/util/JavaEEVersion.java
@@ -47,7 +47,7 @@ public class JavaEEVersion
private static final String VERSION_10 = "10";
- private static final Map<String, JavaEEVersion> VERSION_MAP = new
HashMap<String, JavaEEVersion>();
+ private static final Map<String, JavaEEVersion> VERSION_MAP = new
HashMap<>();
/**
* Represents the J2EE 1.3 version.
diff --git
a/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java
b/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java
index 8c47ba5..31c312e 100644
--- a/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java
+++ b/src/test/java/org/apache/maven/plugins/ear/AbstractEarTestBase.java
@@ -49,7 +49,7 @@ public abstract class AbstractEarTestBase
protected Set<Artifact> createArtifacts( String[] artifactIds, String[]
classifiers )
{
- Set<Artifact> result = new TreeSet<Artifact>();
+ Set<Artifact> result = new TreeSet<>();
ArtifactHandlerTestStub artifactHandler = new ArtifactHandlerTestStub(
"jar" );
for ( int i = 0; i < artifactIds.length; i++ )
{
diff --git
a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
index 58141a5..b3c6cd1 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/AbstractEarPluginIT.java
@@ -254,7 +254,7 @@ public abstract class AbstractEarPluginIT
File dir = getEarDirectory( baseDir, projectName );
// Let's build the expected directories sort list
- final List<File> expectedDirectories = new ArrayList<File>();
+ final List<File> expectedDirectories = new ArrayList<>();
for ( int i = 0; i < artifactsDirectory.length; i++ )
{
if ( artifactsDirectory[i] )
@@ -407,7 +407,7 @@ public abstract class AbstractEarPluginIT
private static List<File> buildArchiveContentFiles( final File baseDir,
final List<File> expectedDirectories )
{
- final List<File> result = new ArrayList<File>();
+ final List<File> result = new ArrayList<>();
addFiles( baseDir, result, expectedDirectories );
return result;
diff --git
a/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java
b/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java
index bca17c8..96830c9 100644
--- a/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/plugins/ear/util/EarMavenArchiverTest.java
@@ -36,7 +36,7 @@ public class EarMavenArchiverTest
extends AbstractEarTestBase
{
- private List<EarModule> modules = new ArrayList<EarModule>();
+ private List<EarModule> modules = new ArrayList<>();
@Test
public void testSimpleEjbModule()
