You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/02/09 22:00:24 UTC
[maven-changes-plugin] branch MCHANGES-401 created (now 6019860)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MCHANGES-401
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git.
at 6019860 [MCHANGES-401] Update code to Java 7
This branch includes the following new commits:
new 6019860 [MCHANGES-401] Update code to Java 7
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-changes-plugin] 01/01: [MCHANGES-401] Update code to Java 7
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHANGES-401
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
commit 60198609e66f0e1259b31e430639c37e68ff301e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Feb 9 22:50:59 2020 +0100
[MCHANGES-401] Update code to Java 7
---
pom.xml | 1 +
.../plugins/announcement/AnnouncementMojo.java | 2 +-
.../plugins/changes/AbstractChangesReport.java | 14 +--
.../maven/plugins/changes/ChangesCheckMojo.java | 6 +-
.../apache/maven/plugins/changes/ChangesMojo.java | 8 +-
.../plugins/changes/ChangesReportGenerator.java | 6 +-
.../maven/plugins/changes/FeedGenerator.java | 6 +-
.../apache/maven/plugins/changes/IssueAdapter.java | 9 +-
.../apache/maven/plugins/changes/ReleaseUtils.java | 6 +-
.../schema/DefaultChangesSchemaValidator.java | 4 +-
.../changes/schema/XmlValidationHandler.java | 6 +-
.../maven/plugins/github/GitHubDownloader.java | 4 +-
.../apache/maven/plugins/github/GitHubMojo.java | 2 +-
.../issues/AbstractIssueManagementSystem.java | 2 +-
.../org/apache/maven/plugins/issues/Issue.java | 6 +-
.../apache/maven/plugins/issues/IssueUtils.java | 6 +-
.../maven/plugins/issues/IssuesReportHelper.java | 2 +-
.../org/apache/maven/plugins/jira/JiraHelper.java | 4 +-
.../org/apache/maven/plugins/jira/JiraMojo.java | 2 +-
.../org/apache/maven/plugins/jira/JiraXML.java | 36 ++++----
.../maven/plugins/jira/ParameterQueryBuilder.java | 100 ++++++++++-----------
.../maven/plugins/jira/RestJiraDownloader.java | 14 +--
.../resource/loader/ProjectResourceLoader.java | 4 +-
.../apache/maven/plugins/trac/TracDownloader.java | 4 +-
.../org/apache/maven/plugins/trac/TracMojo.java | 4 +-
.../apache/maven/plugins/changes/ActionTest.java | 6 +-
.../plugins/changes/ChangesCheckMojoTestCase.java | 2 -
.../maven/plugins/changes/ChangesXMLTest.java | 1 -
.../maven/plugins/changes/FeedGeneratorTest.java | 2 +-
.../apache/maven/plugins/changes/ReleaseTest.java | 4 +-
.../plugins/changes/ReleaseUtilsTestCase.java | 5 +-
.../plugins/github/GitHubDownloaderTestCase.java | 6 +-
.../plugins/issues/IssueManagementSystemTest.java | 9 +-
.../apache/maven/plugins/issues/IssueTestCase.java | 2 -
.../maven/plugins/issues/IssueUtilsTestCase.java | 2 +-
.../maven/plugins/jira/JiraUnicodeTestCase.java | 5 +-
36 files changed, 132 insertions(+), 170 deletions(-)
diff --git a/pom.xml b/pom.xml
index 86bfbc0..a37360c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@ under the License.
</distributionManagement>
<properties>
+ <javaVersion>7</javaVersion>
<doxiaVersion>1.4</doxiaVersion>
<doxiaSitetoolsVersion>1.4</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
diff --git a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
index ef7b4c5..fbe9ac4 100644
--- a/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
+++ b/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
@@ -490,7 +490,7 @@ public class AnnouncementMojo
{
if ( issueManagementSystems == null )
{
- issueManagementSystems = new ArrayList<String>();
+ issueManagementSystems = new ArrayList<>();
}
if ( issueManagementSystems.isEmpty() )
diff --git a/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java b/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
index 37dc15f..ae5bfb5 100644
--- a/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
+++ b/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
@@ -161,7 +161,7 @@ public abstract class AbstractChangesReport
{
DecorationModel model = new DecorationModel();
model.setBody( new Body() );
- Map<String, String> attributes = new HashMap<String, String>();
+ Map<String, String> attributes = new HashMap<>();
attributes.put( "outputEncoding", getOutputEncoding() );
Locale locale = Locale.getDefault();
SiteRenderingContext siteContext = siteRenderer.createContextForSkin( getSkinArtifactFile(), attributes,
@@ -186,17 +186,7 @@ public abstract class AbstractChangesReport
siteRenderer.copyResources( siteContext, new File( project.getBasedir(), "src/site/resources" ),
outputDirectory );
}
- catch ( RendererException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
- + " report generation.", e );
- }
- catch ( MavenReportException e )
+ catch ( RendererException | IOException | MavenReportException e )
{
throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+ " report generation.", e );
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java b/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
index 2b9c0e4..1c60d0e 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
@@ -163,11 +163,11 @@ public class ChangesCheckMojo
{
// Try to find the specified locale on this system
Locale[] locales = Locale.getAvailableLocales();
- for ( int i = 0; i < locales.length; i++ )
+ for ( Locale value : locales )
{
- if ( locales[i].toString().equals( locale ) )
+ if ( value.toString().equals( locale ) )
{
- usedLocale = locales[i];
+ usedLocale = value;
break;
}
}
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java b/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
index 3f0cfa1..16576f5 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
@@ -424,11 +424,7 @@ public class ChangesMojo
xmlStreamReader.close();
xmlStreamReader = null;
}
- catch ( IOException e )
- {
- throw new MavenReportException( "Exception during filtering changes file : " + e.getMessage(), e );
- }
- catch ( MavenFilteringException e )
+ catch ( IOException | MavenFilteringException e )
{
throw new MavenReportException( "Exception during filtering changes file : " + e.getMessage(), e );
}
@@ -465,7 +461,7 @@ public class ChangesMojo
throws MavenReportException
{
final String pluginResourcesBase = "org/apache/maven/plugins/changes";
- String resourceNames[] = { "images/add.gif", "images/fix.gif", "images/icon_help_sml.gif", "images/remove.gif",
+ String[] resourceNames = { "images/add.gif", "images/fix.gif", "images/icon_help_sml.gif", "images/remove.gif",
"images/rss.png", "images/update.gif" };
try
{
diff --git a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
index 233679c..8fe0e62 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
@@ -91,7 +91,7 @@ public class ChangesReportGenerator
public ChangesReportGenerator()
{
- issueLinksPerSystem = new HashMap<String, String>();
+ issueLinksPerSystem = new HashMap<>();
}
public ChangesReportGenerator( List<Release> releaseList )
@@ -316,7 +316,7 @@ public class ChangesReportGenerator
{
// Create a Map with key : dueTo name, value : dueTo email
- Map<String, String> namesEmailMap = new LinkedHashMap<String, String>();
+ Map<String, String> namesEmailMap = new LinkedHashMap<>();
// Only add the dueTo specified as attributes, if it has either a dueTo or a dueToEmail
if ( StringUtils.isNotEmpty( action.getDueTo() ) || StringUtils.isNotEmpty( action.getDueToEmail() ) )
@@ -634,7 +634,7 @@ public class ChangesReportGenerator
private String parseIssueLink( String issue, String system )
{
String parseLink;
- String issueLink = (String) this.issueLinksPerSystem.get( system );
+ String issueLink = this.issueLinksPerSystem.get( system );
parseLink = issueLink.replaceFirst( ISSUE_TOKEN, issue );
if ( parseLink.contains( URL_TOKEN ) )
{
diff --git a/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java b/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
index b6fcf0b..af0030e 100644
--- a/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
@@ -206,15 +206,13 @@ public class FeedGenerator
}
catch ( FeedException ex )
{
- IOException ioex = new IOException( ex.getMessage() );
- ioex.initCause( ex );
- throw ioex;
+ throw new IOException( ex.getMessage(), ex );
}
}
private List<SyndEntry> getEntries( final List<Release> releases )
{
- final List<SyndEntry> entries = new ArrayList<SyndEntry>( 1 );
+ final List<SyndEntry> entries = new ArrayList<>( 1 );
if ( releases.size() > 0 )
{
diff --git a/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java b/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
index baf8f55..ef090a3 100644
--- a/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
+++ b/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
@@ -67,7 +67,7 @@ public class IssueAdapter
public List<Release> getReleases( List<Issue> issues )
{
// A Map of releases keyed by fixVersion
- Map<String, Release> releasesMap = new HashMap<String, Release>();
+ Map<String, Release> releasesMap = new HashMap<>();
// Loop through all issues looking for fixVersions
for ( Issue issue : issues )
@@ -95,12 +95,7 @@ public class IssueAdapter
}
// Extract the releases from the Map to a List
- List<Release> releasesList = new ArrayList<Release>();
- for ( Release release : releasesMap.values() )
- {
- releasesList.add( release );
- }
- return releasesList;
+ return new ArrayList<>( releasesMap.values() );
}
/**
diff --git a/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java b/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
index 03113d4..fbf29f2 100644
--- a/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
+++ b/src/main/java/org/apache/maven/plugins/changes/ReleaseUtils.java
@@ -146,7 +146,7 @@ public class ReleaseUtils
return firstReleases;
}
- List<Release> mergedReleases = new ArrayList<Release>();
+ List<Release> mergedReleases = new ArrayList<>();
// Loop through the releases from the first issue tracker, merging in
// actions from releases with the same version from the second issue
@@ -198,7 +198,7 @@ public class ReleaseUtils
return releases;
}
- final List<Release> mergedReleases = new ArrayList<Release>();
+ final List<Release> mergedReleases = new ArrayList<>();
if ( releases != null )
{
@@ -240,7 +240,7 @@ public class ReleaseUtils
public static String toString( List<Release> releases )
{
- List<String> releaseStrings = new ArrayList<String>( releases.size() );
+ List<String> releaseStrings = new ArrayList<>( releases.size() );
for ( Release release : releases )
{
releaseStrings.add( toString( release ) );
diff --git a/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java b/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
index 1eb93b5..a86135b 100644
--- a/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
+++ b/src/main/java/org/apache/maven/plugins/changes/schema/DefaultChangesSchemaValidator.java
@@ -51,7 +51,7 @@ public class DefaultChangesSchemaValidator
public static final String CHANGES_SCHEMA_PATH = "META-INF/changes/xsd/";
- private Map<String, Schema> compiledSchemas = new HashMap<String, Schema>();
+ private Map<String, Schema> compiledSchemas = new HashMap<>();
public XmlValidationHandler validateXmlWithSchema( File file, String schemaVersion, boolean failOnValidationError )
throws SchemaValidatorException
@@ -101,7 +101,7 @@ public class DefaultChangesSchemaValidator
{
if ( this.compiledSchemas.containsKey( schemaPath ) )
{
- return (Schema) this.compiledSchemas.get( schemaPath );
+ return this.compiledSchemas.get( schemaPath );
}
Schema schema = this.compileJAXPSchema( schemaPath );
diff --git a/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java b/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
index bfcfa6c..4dc883d 100644
--- a/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
+++ b/src/main/java/org/apache/maven/plugins/changes/schema/XmlValidationHandler.java
@@ -38,11 +38,11 @@ public class XmlValidationHandler
private boolean parsingError = false;
- private List<SAXParseException> errors = new ArrayList<SAXParseException>();
+ private List<SAXParseException> errors = new ArrayList<>();
- private List<SAXParseException> fatalErrors = new ArrayList<SAXParseException>();
+ private List<SAXParseException> fatalErrors = new ArrayList<>();
- private List<SAXParseException> warnings = new ArrayList<SAXParseException>();
+ private List<SAXParseException> warnings = new ArrayList<>();
private boolean failOnValidationError;
diff --git a/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java b/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
index 9f7c57b..cdd3a78 100644
--- a/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
+++ b/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
@@ -182,10 +182,10 @@ public class GitHubDownloader
public List<Issue> getIssueList()
throws IOException
{
- List<Issue> issueList = new ArrayList<Issue>();
+ List<Issue> issueList = new ArrayList<>();
IssueService service = new IssueService( client );
- Map<String, String> issueFilter = new HashMap<String, String>();
+ Map<String, String> issueFilter = new HashMap<>();
if ( includeOpenIssues )
{
diff --git a/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java b/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
index caa5cbf..cdd11fe 100644
--- a/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
+++ b/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java
@@ -53,7 +53,7 @@ public class GitHubMojo
/**
* Valid Github columns.
*/
- private static Map<String, Integer> githubColumns = new HashMap<String, Integer>();
+ private static Map<String, Integer> githubColumns = new HashMap<>();
static
{
diff --git a/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java b/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
index 05dbb58..5e63c7c 100644
--- a/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
+++ b/src/main/java/org/apache/maven/plugins/issues/AbstractIssueManagementSystem.java
@@ -43,7 +43,7 @@ public abstract class AbstractIssueManagementSystem
protected AbstractIssueManagementSystem()
{
- issueTypeMap = new HashMap<String, IssueType>();
+ issueTypeMap = new HashMap<>();
}
/*
diff --git a/src/main/java/org/apache/maven/plugins/issues/Issue.java b/src/main/java/org/apache/maven/plugins/issues/Issue.java
index 4e42175..09c24d6 100644
--- a/src/main/java/org/apache/maven/plugins/issues/Issue.java
+++ b/src/main/java/org/apache/maven/plugins/issues/Issue.java
@@ -89,7 +89,7 @@ public class Issue
{
if ( comments == null )
{
- comments = new ArrayList<String>();
+ comments = new ArrayList<>();
}
comments.add( comment );
}
@@ -103,7 +103,7 @@ public class Issue
{
if ( components == null )
{
- components = new ArrayList<String>();
+ components = new ArrayList<>();
}
components.add( component );
}
@@ -127,7 +127,7 @@ public class Issue
{
if ( fixVersions == null )
{
- fixVersions = new ArrayList<String>();
+ fixVersions = new ArrayList<>();
}
fixVersions.add( fixVersion );
}
diff --git a/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java b/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
index 01d22b2..23a7a5b 100644
--- a/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
+++ b/src/main/java/org/apache/maven/plugins/issues/IssueUtils.java
@@ -46,7 +46,7 @@ public class IssueUtils
public static List<Issue> filterIssuesWithVersionPrefix( List<Issue> issues, String prefix )
throws MojoExecutionException
{
- List<Issue> filteredIssues = new ArrayList<Issue>();
+ List<Issue> filteredIssues = new ArrayList<>();
boolean isFound = false;
Issue issue;
@@ -89,7 +89,7 @@ public class IssueUtils
public static List<Issue> getIssuesForVersion( List<Issue> issues, String version )
throws MojoExecutionException
{
- List<Issue> issuesForVersion = new ArrayList<Issue>();
+ List<Issue> issuesForVersion = new ArrayList<>();
boolean isFound = false;
Issue issue;
String releaseVersion = version;
@@ -121,7 +121,7 @@ public class IssueUtils
public static String toString( List<Issue> issues )
{
- List<String> issueStrings = new ArrayList<String>( issues.size() );
+ List<String> issueStrings = new ArrayList<>( issues.size() );
for ( Issue issue : issues )
{
issueStrings.add( issue.toString() );
diff --git a/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java b/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
index 11c171c..9ca1d2a 100644
--- a/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
+++ b/src/main/java/org/apache/maven/plugins/issues/IssuesReportHelper.java
@@ -91,7 +91,7 @@ public class IssuesReportHelper
Map<String, Integer> deprecatedColumns, Log log )
{
DualHashBidiMap bidiColumns = null;
- List<Integer> columnIds = new ArrayList<Integer>();
+ List<Integer> columnIds = new ArrayList<>();
String[] columnNamesArray = columnNames.split( "," );
if ( deprecatedColumns != null )
diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java b/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
index 9f97eae..d50bc85 100644
--- a/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
+++ b/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
@@ -84,7 +84,7 @@ public class JiraHelper
}
}
- HashMap<String, String> urlMap = new HashMap<String, String>( 4 );
+ HashMap<String, String> urlMap = new HashMap<>( 4 );
urlMap.put( "url", jiraUrl );
@@ -186,7 +186,7 @@ public class JiraHelper
throw new IllegalArgumentException( "Invalid browse URL" );
}
- HashMap<String, String> urlMap = new HashMap<String, String>( 4 );
+ HashMap<String, String> urlMap = new HashMap<>( 4 );
urlMap.put( "url", jiraUrl );
urlMap.put( "project", project );
diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java b/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
index 4777ee2..7560430 100644
--- a/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
@@ -51,7 +51,7 @@ public class JiraMojo
/**
* Valid JIRA columns.
*/
- private static final Map<String, Integer> JIRA_COLUMNS = new HashMap<String, Integer>( 16 );
+ private static final Map<String, Integer> JIRA_COLUMNS = new HashMap<>( 16 );
static
{
diff --git a/src/main/java/org/apache/maven/plugins/jira/JiraXML.java b/src/main/java/org/apache/maven/plugins/jira/JiraXML.java
index 1bb2e22..1161e30 100644
--- a/src/main/java/org/apache/maven/plugins/jira/JiraXML.java
+++ b/src/main/java/org/apache/maven/plugins/jira/JiraXML.java
@@ -65,7 +65,7 @@ public class JiraXML
private final Log log;
- private SimpleDateFormat sdf = null;
+ private SimpleDateFormat sdf;
/**
* @param log not null.
@@ -87,7 +87,7 @@ public class JiraXML
sdf = new SimpleDateFormat( datePattern, Locale.ENGLISH );
}
- this.issueList = new ArrayList<Issue>( 16 );
+ this.issueList = new ArrayList<>( 16 );
}
/**
@@ -136,23 +136,25 @@ public class JiraXML
public void startElement( String namespaceURI, String sName, String qName, Attributes attrs )
throws SAXException
{
- if ( qName.equals( "item" ) )
+ switch ( qName )
{
- issue = new Issue();
+ case "item":
+ issue = new Issue();
- currentParent = "item";
- }
- else if ( qName.equals( "key" ) )
- {
- String id = attrs.getValue( "id" );
- if ( id != null )
- {
- issue.setId( id.trim() );
- }
- }
- else if ( qName.equals( "build-info" ) )
- {
- currentParent = "build-info";
+ currentParent = "item";
+ break;
+ case "key":
+ String id = attrs.getValue( "id" );
+ if ( id != null )
+ {
+ issue.setId( id.trim() );
+ }
+ break;
+ case "build-info":
+ currentParent = "build-info";
+ break;
+ default:
+ // skip
}
}
diff --git a/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java b/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java
index 074d449..22f3a5a 100644
--- a/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java
+++ b/src/main/java/org/apache/maven/plugins/jira/ParameterQueryBuilder.java
@@ -44,16 +44,16 @@ public class ParameterQueryBuilder
private StringBuilder query = new StringBuilder();
/** Mapping containing all allowed JIRA priority values. */
- private final Map<String, String> priorityMap = new HashMap<String, String>( 8 );
+ private final Map<String, String> priorityMap = new HashMap<>( 8 );
/** Mapping containing all allowed JIRA resolution values. */
- private final Map<String, String> resolutionMap = new HashMap<String, String>( 8 );
+ private final Map<String, String> resolutionMap = new HashMap<>( 8 );
/** Mapping containing all allowed JIRA status values. */
- private final Map<String, String> statusMap = new HashMap<String, String>( 8 );
+ private final Map<String, String> statusMap = new HashMap<>( 8 );
/** Mapping containing all allowed JIRA type values. */
- private final Map<String, String> typeMap = new HashMap<String, String>( 8 );
+ private final Map<String, String> typeMap = new HashMap<>( 8 );
public ParameterQueryBuilder( Log log )
{
@@ -262,57 +262,49 @@ public class ParameterQueryBuilder
lowerColumnName = lowerColumnName.substring( 0, lowerColumnName.length() - 3 ).trim();
}
- if ( "key".equals( lowerColumnName ) )
+ switch ( lowerColumnName )
{
- fieldName = "issuekey";
- }
- else if ( "summary".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
- }
- else if ( "status".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
- }
- else if ( "resolution".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
- }
- else if ( "assignee".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
- }
- else if ( "reporter".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
- }
- else if ( "type".equals( lowerColumnName ) )
- {
- fieldName = "issuetype";
- }
- else if ( "priority".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
- }
- else if ( "version".equals( lowerColumnName ) )
- {
- fieldName = "versions";
- }
- else if ( "fix version".equals( lowerColumnName ) )
- {
- fieldName = "fixVersions";
- }
- else if ( "component".equals( lowerColumnName ) )
- {
- fieldName = "components";
- }
- else if ( "created".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
- }
- else if ( "updated".equals( lowerColumnName ) )
- {
- fieldName = lowerColumnName;
+ case "key":
+ fieldName = "issuekey";
+ break;
+ case "summary":
+ fieldName = lowerColumnName;
+ break;
+ case "status":
+ fieldName = lowerColumnName;
+ break;
+ case "resolution":
+ fieldName = lowerColumnName;
+ break;
+ case "assignee":
+ fieldName = lowerColumnName;
+ break;
+ case "reporter":
+ fieldName = lowerColumnName;
+ break;
+ case "type":
+ fieldName = "issuetype";
+ break;
+ case "priority":
+ fieldName = lowerColumnName;
+ break;
+ case "version":
+ fieldName = "versions";
+ break;
+ case "fix version":
+ fieldName = "fixVersions";
+ break;
+ case "component":
+ fieldName = "components";
+ break;
+ case "created":
+ fieldName = lowerColumnName;
+ break;
+ case "updated":
+ fieldName = lowerColumnName;
+ break;
+ default:
+ // skip
}
if ( fieldName != null )
{
diff --git a/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java b/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java
index bfe3dd3..0a4eaea 100644
--- a/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java
+++ b/src/main/java/org/apache/maven/plugins/jira/RestJiraDownloader.java
@@ -102,12 +102,12 @@ public class RestJiraDownloader
jsonFactory = new MappingJsonFactory();
// 2012-07-17T06:26:47.723-0500
dateFormat = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss.SSSZ" );
- resolvedFixVersionIds = new ArrayList<String>();
- resolvedStatusIds = new ArrayList<String>();
- resolvedComponentIds = new ArrayList<String>();
- resolvedTypeIds = new ArrayList<String>();
- resolvedResolutionIds = new ArrayList<String>();
- resolvedPriorityIds = new ArrayList<String>();
+ resolvedFixVersionIds = new ArrayList<>();
+ resolvedStatusIds = new ArrayList<>();
+ resolvedComponentIds = new ArrayList<>();
+ resolvedTypeIds = new ArrayList<>();
+ resolvedResolutionIds = new ArrayList<>();
+ resolvedPriorityIds = new ArrayList<>();
}
public void doExecute()
@@ -275,7 +275,7 @@ public class RestJiraDownloader
private void buildIssues( JsonNode issuesNode, String jiraUrl, String jiraProject )
{
- issueList = new ArrayList<Issue>();
+ issueList = new ArrayList<>();
for ( int ix = 0; ix < issuesNode.size(); ix++ )
{
JsonNode issueNode = issuesNode.get( ix );
diff --git a/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java b/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java
index 1f4bc60..c4e9153 100644
--- a/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java
+++ b/src/main/java/org/apache/maven/plugins/resource/loader/ProjectResourceLoader.java
@@ -51,7 +51,7 @@ public class ProjectResourceLoader
* Used to map the path that a template was found on so that we can properly check the modification times of the
* files.
*/
- private Hashtable<String, String> templatePaths = new Hashtable<String, String>();
+ private Hashtable<String, String> templatePaths = new Hashtable<>();
public void init( ExtendedProperties configuration )
{
@@ -64,7 +64,7 @@ public class ProjectResourceLoader
rsvc.getLog().info( "path :" + path );
- paths = new ArrayList<String>();
+ paths = new ArrayList<>();
paths.add( path );
diff --git a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java
index c32ebae..9483454 100644
--- a/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java
+++ b/src/main/java/org/apache/maven/plugins/trac/TracDownloader.java
@@ -67,7 +67,7 @@ public class TracDownloader
issue.setKey( String.valueOf( ticketObj[0] ) );
- issue.setLink( getUrl() + "/ticket/" + String.valueOf( ticketObj[0] ) );
+ issue.setLink( getUrl() + "/ticket/" + ticketObj[0] );
issue.setCreated( parseDate( String.valueOf( ticketObj[1] ) ) );
@@ -130,7 +130,7 @@ public class TracDownloader
Object[] params = new Object[] { qstr };
Object[] queryResult;
- ArrayList<Issue> issueList = new ArrayList<Issue>();
+ ArrayList<Issue> issueList = new ArrayList<>();
try
{
queryResult = (Object[]) client.execute( "ticket.query", params );
diff --git a/src/main/java/org/apache/maven/plugins/trac/TracMojo.java b/src/main/java/org/apache/maven/plugins/trac/TracMojo.java
index 48dac11..7e37373 100644
--- a/src/main/java/org/apache/maven/plugins/trac/TracMojo.java
+++ b/src/main/java/org/apache/maven/plugins/trac/TracMojo.java
@@ -50,12 +50,12 @@ public class TracMojo
/**
* Deprecated Trac columns.
*/
- private static final Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String, Integer>();
+ private static final Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<>();
/**
* Valid Trac columns.
*/
- private static final Map<String, Integer> TRAC_COLUMNS = new HashMap<String, Integer>();
+ private static final Map<String, Integer> TRAC_COLUMNS = new HashMap<>();
static
{
diff --git a/src/test/java/org/apache/maven/plugins/changes/ActionTest.java b/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
index e622cde..ced4cb5 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ActionTest.java
@@ -36,20 +36,16 @@ public class ActionTest
}
protected void setUp()
- throws Exception
{
}
protected void tearDown()
- throws Exception
{
}
public static Test suite()
{
- TestSuite suite = new TestSuite( ActionTest.class );
-
- return suite;
+ return new TestSuite( ActionTest.class );
}
public void testGetSetAction()
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
index 3d83784..cd5ddc9 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
@@ -37,7 +37,6 @@ public class ChangesCheckMojoTestCase
{
@Test
public void testIsValidDate()
- throws Exception
{
String pattern;
@@ -66,7 +65,6 @@ public class ChangesCheckMojoTestCase
@Test
public void testIsValidateWithLocale()
- throws Exception
{
String pattern, locale = null;
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java b/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
index 2807023..af733a8 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesXMLTest.java
@@ -133,7 +133,6 @@ public class ChangesXMLTest
}
public void testParseChangesFile()
- throws Exception
{
File changesFile = new File( getBasedir() + "/src/test/unit/changes.xml" );
ChangesXML changesXML = new ChangesXML( changesFile, new MockLog() );
diff --git a/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java b/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
index a700a4f..9bbd005 100644
--- a/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/FeedGeneratorTest.java
@@ -77,7 +77,7 @@ public class FeedGeneratorTest
Release release = new Release();
release.setVersion( "1.0" );
- List<Release> releases = new ArrayList<Release>( 1 );
+ List<Release> releases = new ArrayList<>( 1 );
try
{
diff --git a/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java b/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
index ec07095..74fc4e6 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ReleaseTest.java
@@ -40,12 +40,10 @@ public class ReleaseTest
}
protected void setUp()
- throws Exception
{
}
protected void tearDown()
- throws Exception
{
}
@@ -72,7 +70,7 @@ public class ReleaseTest
public void testGetSetAction()
{
- List<Action> actionList = new ArrayList<Action>();
+ List<Action> actionList = new ArrayList<>();
release.setActions( actionList );
diff --git a/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java b/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java
index 39b470d..0629405 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ReleaseUtilsTestCase.java
@@ -37,13 +37,12 @@ public class ReleaseUtilsTestCase
extends TestCase
{
public void testMergeReleases()
- throws Exception
{
Log log = new SilentLog();
ReleaseUtils releaseUtils = new ReleaseUtils( log );
- List<Release> firstReleases = new ArrayList<Release>();
- List<Release> secondReleases = new ArrayList<Release>();
+ List<Release> firstReleases = new ArrayList<>();
+ List<Release> secondReleases = new ArrayList<>();
List<Release> mergedReleases;
mergedReleases = releaseUtils.mergeReleases( firstReleases, secondReleases );
diff --git a/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java b/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java
index 38858b5..8f0a95d 100644
--- a/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java
@@ -85,8 +85,8 @@ public class GitHubDownloaderTestCase
SettingsDecrypter decrypter = mock( SettingsDecrypter.class );
SettingsDecryptionResult result = mock( SettingsDecryptionResult.class );
Log log = mock( Log.class );
- when( result.getProblems() ).thenReturn( Arrays.<SettingsProblem>asList( new DefaultSettingsProblem( "Ups "
- + server.getId(), Severity.ERROR, null, -1, -1, null ) ) );
+ when( result.getProblems() ).thenReturn( Collections.<SettingsProblem>singletonList(
+ new DefaultSettingsProblem( "Ups " + server.getId(), Severity.ERROR, null, -1, -1, null ) ) );
when( result.getServer() ).thenReturn( server );
when( decrypter.decrypt( any( SettingsDecryptionRequest.class ) ) ).thenReturn( result );
@@ -95,7 +95,7 @@ public class GitHubDownloaderTestCase
verify( log ).error( "Ups github-server", null );
ArgumentCaptor<SettingsDecryptionRequest> argument = ArgumentCaptor.forClass( SettingsDecryptionRequest.class );
verify( decrypter ).decrypt( argument.capture() );
- List<Server> servers = ( (DefaultSettingsDecryptionRequest) argument.getValue() ).getServers();
+ List<Server> servers = argument.getValue().getServers();
assertEquals( 1, servers.size() );
assertSame( server, servers.get( 0 ) );
}
diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java b/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java
index b714a28..22b526b 100644
--- a/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java
+++ b/src/test/java/org/apache/maven/plugins/issues/IssueManagementSystemTest.java
@@ -38,7 +38,7 @@ public class IssueManagementSystemTest
private MockIssueManagementSystem ims;
- private class MockIssueManagementSystem
+ private static class MockIssueManagementSystem
extends AbstractIssueManagementSystem
{
@@ -52,14 +52,13 @@ public class IssueManagementSystemTest
@Override
protected void setUp()
- throws Exception
{
ims = new MockIssueManagementSystem();
}
public void testApplyingValidCustomIssueTypes()
{
- Map<String, String> issueTypes = new HashMap<String, String>();
+ Map<String, String> issueTypes = new HashMap<>();
issueTypes.put( "add", "Story,Epic" );
issueTypes.put( "fix", "Defect" );
issueTypes.put( "update", "Improvement" );
@@ -76,7 +75,7 @@ public class IssueManagementSystemTest
public void testApplyingInvalidCustomIssueTypes()
{
- Map<String, String> issueTypes = new HashMap<String, String>();
+ Map<String, String> issueTypes = new HashMap<>();
issueTypes.put( "new", "Story,Epic" );
try
@@ -84,7 +83,7 @@ public class IssueManagementSystemTest
ims.applyConfiguration( issueTypes );
fail( "Exception not thrown for invalid group name" );
}
- catch ( MojoExecutionException e )
+ catch ( MojoExecutionException ignored )
{
}
diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java b/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java
index 4870e8f..ac4a29c 100644
--- a/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/issues/IssueTestCase.java
@@ -35,13 +35,11 @@ public class IssueTestCase
Issue issue;
protected void setUp()
- throws Exception
{
issue = new Issue();
}
protected void tearDown()
- throws Exception
{
}
diff --git a/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java b/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java
index 9fae6bb..b792660 100644
--- a/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/issues/IssueUtilsTestCase.java
@@ -49,7 +49,7 @@ public class IssueUtilsTestCase
issue_2.setId( "2" );
issue_2.addFixVersion( "1.0" );
- List<Issue> issueList = new ArrayList<Issue>();
+ List<Issue> issueList = new ArrayList<>();
issueList.add( issue_1 );
issueList.add( issue_2 );
diff --git a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java b/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
index 9d799da..3ef5072 100644
--- a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugins.jira;
import java.io.File;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -59,9 +60,9 @@ public class JiraUnicodeTestCase
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "mavenSession", session );
InputStream testJiraXmlStream = JiraUnicodeTestCase.class.getResourceAsStream( "unicode-jira-results.xml" );
- String jiraXml = null;
+ String jiraXml;
try {
- jiraXml = IOUtils.toString(testJiraXmlStream, "utf-8");
+ jiraXml = IOUtils.toString(testJiraXmlStream, StandardCharsets.UTF_8 );
} finally {
testJiraXmlStream.close();
}