You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2014/03/18 23:44:42 UTC
svn commit: r1579078 - in
/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin:
announcement/ announcement/mailsender/ changes/ github/ issues/ jira/
resource/loader/ trac/
Author: dennisl
Date: Tue Mar 18 22:44:41 2014
New Revision: 1579078
URL: http://svn.apache.org/r1579078
Log:
Fix whitespace-related errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AdaptiveJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java Tue Mar 18 22:44:41 2014
@@ -217,7 +217,7 @@ public class AnnouncementMailMojo
throws MojoExecutionException
{
// Fail build fast if it is using deprecated parameters
- if( templateOutputDirectory != null )
+ if ( templateOutputDirectory != null )
{
throw new MojoExecutionException( "You are using the old parameter 'templateOutputDirectory'. You must use 'announcementDirectory' instead." );
}
@@ -302,27 +302,30 @@ public class AnnouncementMailMojo
mailMsg.setContentType( this.mailContentType );
mailMsg.setFrom( fromAddress, fromName );
- for (Object o1 : getToAddresses()) {
+ for ( Object o1 : getToAddresses() )
+ {
email = o1.toString();
- getLog().info("Sending mail to " + email + "...");
- mailMsg.addTo(email, "");
+ getLog().info( "Sending mail to " + email + "..." );
+ mailMsg.addTo( email, "" );
}
if ( getCcAddresses() != null )
{
- for (Object o : getCcAddresses()) {
+ for ( Object o : getCcAddresses() )
+ {
email = o.toString();
- getLog().info("Sending cc mail to " + email + "...");
- mailMsg.addCc(email, "");
+ getLog().info( "Sending cc mail to " + email + "..." );
+ mailMsg.addCc( email, "" );
}
}
if ( getBccAddresses() != null )
{
- for (Object o : getBccAddresses()) {
+ for ( Object o : getBccAddresses() )
+ {
email = o.toString();
- getLog().info("Sending bcc mail to " + email + "...");
- mailMsg.addBcc(email, "");
+ getLog().info( "Sending bcc mail to " + email + "..." );
+ mailMsg.addBcc( email, "" );
}
}
@@ -424,11 +427,13 @@ public class AnnouncementMailMojo
}
else
{
- for (Object aFrom : from) {
+ for ( Object aFrom : from )
+ {
Developer developer = (Developer) aFrom;
- if (fromDeveloperId.equals(developer.getId())) {
- return new MailSender(developer.getName(), developer.getEmail());
+ if ( fromDeveloperId.equals( developer.getId() ) )
+ {
+ return new MailSender( developer.getName(), developer.getEmail() );
}
}
throw new MojoExecutionException(
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java Tue Mar 18 22:44:41 2014
@@ -418,7 +418,7 @@ public class AnnouncementMojo
*
* @since 2.9
*/
- @Parameter( defaultValue = "http", property = "changes.githubAPIScheme")
+ @Parameter( defaultValue = "http", property = "changes.githubAPIScheme" )
private String githubAPIScheme;
/**
@@ -426,7 +426,7 @@ public class AnnouncementMojo
*
* @since 2.9
*/
- @Parameter( defaultValue = "80", property = "changes.githubAPIPort")
+ @Parameter( defaultValue = "80", property = "changes.githubAPIPort" )
private int githubAPIPort;
private ReleaseUtils releaseUtils = new ReleaseUtils( getLog() );
@@ -446,7 +446,7 @@ public class AnnouncementMojo
throws MojoExecutionException
{
// Fail build fast if it is using deprecated parameters
- if( outputDirectory != null )
+ if ( outputDirectory != null )
{
throw new MojoExecutionException( "You are using the old parameter 'outputDirectory'. You must use 'announcementDirectory' instead." );
}
@@ -882,13 +882,13 @@ public class AnnouncementMojo
public void setIssueTypes( Map<String, String> issueTypes )
{
- this.issueTypes = issueTypes;
- }
+ this.issueTypes = issueTypes;
+ }
public Map<String, String> getIssueTypes()
{
- return issueTypes;
- }
+ return issueTypes;
+ }
public File getAnnouncementDirectory()
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java Tue Mar 18 22:44:41 2014
@@ -106,17 +106,18 @@ public class ProjectJavamailMailSender
if ( isTlsEnabled() )
{
- props.put("mail.smtp.starttls.enable", "true");
+ props.put( "mail.smtp.starttls.enable", "true" );
}
if ( userProperties != null )
{
- for (Object o : userProperties.keySet()) {
+ for ( Object o : userProperties.keySet() )
+ {
String key = (String) o;
- String value = userProperties.getProperty(key);
+ String value = userProperties.getProperty( key );
- props.put(key, value);
+ props.put( key, value );
}
}
}
@@ -157,9 +158,10 @@ public class ProjectJavamailMailSender
{
InternetAddress[] addressTo = new InternetAddress[mail.getToAddresses().size()];
int count = 0;
- for (Object o : mail.getToAddresses()) {
- String address = ((MailMessage.Address) o).getRfc2822Address();
- addressTo[count++] = new InternetAddress(address);
+ for ( Object o : mail.getToAddresses() )
+ {
+ String address = ( (MailMessage.Address) o ).getRfc2822Address();
+ addressTo[count++] = new InternetAddress( address );
}
msg.setRecipients( Message.RecipientType.TO, addressTo );
}
@@ -168,9 +170,10 @@ public class ProjectJavamailMailSender
{
InternetAddress[] addressCc = new InternetAddress[mail.getCcAddresses().size()];
int count = 0;
- for (Object o : mail.getCcAddresses()) {
- String address = ((MailMessage.Address) o).getRfc2822Address();
- addressCc[count++] = new InternetAddress(address);
+ for ( Object o : mail.getCcAddresses() )
+ {
+ String address = ( (MailMessage.Address) o ).getRfc2822Address();
+ addressCc[count++] = new InternetAddress( address );
}
msg.setRecipients( Message.RecipientType.CC, addressCc );
}
@@ -179,9 +182,10 @@ public class ProjectJavamailMailSender
{
InternetAddress[] addressBcc = new InternetAddress[mail.getBccAddresses().size()];
int count = 0;
- for (Object o : mail.getBccAddresses()) {
- String address = ((MailMessage.Address) o).getRfc2822Address();
- addressBcc[count++] = new InternetAddress(address);
+ for ( Object o : mail.getBccAddresses() )
+ {
+ String address = ( (MailMessage.Address ) o ).getRfc2822Address();
+ addressBcc[count++] = new InternetAddress( address );
}
msg.setRecipients( Message.RecipientType.BCC, addressBcc );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java Tue Mar 18 22:44:41 2014
@@ -69,7 +69,7 @@ public abstract class AbstractChangesMoj
{
getLog().debug( "Root Folder:" + mavenSession.getExecutionRootDirectory() );
getLog().debug( "Current Folder:" + basedir );
- boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase(basedir);
+ boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase( basedir );
if ( result )
{
getLog().debug( "This is the execution root." );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java Tue Mar 18 22:44:41 2014
@@ -232,7 +232,8 @@ public abstract class AbstractChangesRep
throw new MojoExecutionException(
"An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e );
}
- finally {
+ finally
+ {
IOUtils.closeQuietly( fileOutputStream );
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java Tue Mar 18 22:44:41 2014
@@ -252,11 +252,11 @@ public class ChangesMojo
{
Date now = new Date();
SimpleDateFormat simpleDateFormat =
- new SimpleDateFormat(publishDateFormat, new Locale(publishDateLocale));
+ new SimpleDateFormat( publishDateFormat, new Locale( publishDateLocale ) );
Properties additionalProperties = new Properties();
- additionalProperties.put("publishDate", simpleDateFormat.format(now));
+ additionalProperties.put( "publishDate", simpleDateFormat.format( now ) );
- ChangesXML changesXml = getChangesFromFile( xmlPath, project, additionalProperties);
+ ChangesXML changesXml = getChangesFromFile( xmlPath, project, additionalProperties );
if ( changesXml == null ) return;
if ( aggregated )
@@ -271,12 +271,14 @@ public class ChangesMojo
final String relativePath = absolutePath.substring( basePath.length() );
List releaseList = changesXml.getReleaseList();
- for (Object o : project.getCollectedProjects()) {
+ for ( Object o : project.getCollectedProjects() )
+ {
final MavenProject childProject = (MavenProject) o;
- final File changesFile = new File(childProject.getBasedir(), relativePath);
- final ChangesXML childXml = getChangesFromFile(changesFile, childProject, additionalProperties);
- if (childXml != null) {
- releaseList = releaseUtils.mergeReleases(releaseList, childProject.getName(), childXml.getReleaseList());
+ final File changesFile = new File( childProject.getBasedir(), relativePath );
+ final ChangesXML childXml = getChangesFromFile( changesFile, childProject, additionalProperties );
+ if ( childXml != null )
+ {
+ releaseList = releaseUtils.mergeReleases( releaseList, childProject.getName(), childXml.getReleaseList() );
}
}
changesXml.setReleaseList( releaseList );
@@ -465,9 +467,10 @@ public class ChangesMojo
try
{
getLog().debug( "Copying static resources." );
- for (String resourceName : resourceNames) {
- URL url = this.getClass().getClassLoader().getResource(pluginResourcesBase + "/" + resourceName);
- FileUtils.copyURLToFile(url, new File(getReportOutputDirectory(), resourceName));
+ for ( String resourceName : resourceNames )
+ {
+ URL url = this.getClass().getClassLoader().getResource( pluginResourcesBase + "/" + resourceName );
+ FileUtils.copyURLToFile( url, new File( getReportOutputDirectory(), resourceName ) );
}
}
catch ( IOException e )
@@ -496,9 +499,10 @@ public class ChangesMojo
}
else
{
- for (Object o : issueLinkTemplatePerSystem.entrySet()) {
+ for ( Object o : issueLinkTemplatePerSystem.entrySet() )
+ {
Map.Entry entry = (Map.Entry) o;
- getLog().debug("issueLinkTemplatePerSystem[" + entry.getKey() + "] = " + entry.getValue());
+ getLog().debug( "issueLinkTemplatePerSystem[" + entry.getKey() + "] = " + entry.getValue() );
}
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Tue Mar 18 22:44:41 2014
@@ -205,7 +205,7 @@ public class ChangesReportGenerator exte
}
// If the %URL% token is used then the issue management system URL must be set.
- if (issueLink.contains(URL_TOKEN) && StringUtils.isBlank( getUrl() ) )
+ if ( issueLink.contains( URL_TOKEN ) && StringUtils.isBlank( getUrl() ) )
{
return false;
}
@@ -225,9 +225,9 @@ public class ChangesReportGenerator exte
{
sinkBeginReport( sink, bundle );
- constructReleaseHistory(sink, bundle, releaseList);
+ constructReleaseHistory( sink, bundle, releaseList );
- constructReleases(sink, bundle, releaseList);
+ constructReleases( sink, bundle, releaseList );
sinkEndReport( sink );
}
@@ -243,7 +243,7 @@ public class ChangesReportGenerator exte
{
sink.tableRow();
- sinkShowTypeIcon(sink, action.getType());
+ sinkShowTypeIcon( sink, action.getType() );
sink.tableCell();
@@ -320,17 +320,18 @@ public class ChangesReportGenerator exte
{
// Create a Map with key : dueTo name, value : dueTo email
- Map<String,String> namesEmailMap = new LinkedHashMap<String,String>();
+ Map<String, String> namesEmailMap = new LinkedHashMap<String, String>();
// 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() ) )
{
- namesEmailMap.put(action.getDueTo(), action.getDueToEmail());
+ namesEmailMap.put( action.getDueTo(), action.getDueToEmail() );
}
- for (Object dueTo1 : dueTos) {
+ for ( Object dueTo1 : dueTos )
+ {
DueTo dueTo = (DueTo) dueTo1;
- namesEmailMap.put(dueTo.getName(), dueTo.getEmail());
+ namesEmailMap.put( dueTo.getName(), dueTo.getEmail() );
}
if ( namesEmailMap.isEmpty() )
@@ -360,7 +361,7 @@ public class ChangesReportGenerator exte
}
}
- sink.text(".");
+ sink.text( "." );
}
/**
@@ -419,7 +420,7 @@ public class ChangesReportGenerator exte
{
if ( StringUtils.isNotEmpty( issue ) )
{
- sink.text(issue);
+ sink.text( issue );
if ( !fixes.isEmpty() )
{
@@ -434,7 +435,7 @@ public class ChangesReportGenerator exte
String currentIssueId = fixedIssue.getIssue();
if ( StringUtils.isNotEmpty( currentIssueId ) )
{
- sink.text(currentIssueId);
+ sink.text( currentIssueId );
}
if ( iterator.hasNext() )
@@ -463,16 +464,17 @@ public class ChangesReportGenerator exte
sink.tableRow_();
- for (Object aReleaseList : releaseList) {
+ for ( Object aReleaseList : releaseList )
+ {
Release release = (Release) aReleaseList;
sink.tableRow();
- sinkCellLink(sink, release.getVersion(), "#" + HtmlTools.encodeId(release.getVersion()));
+ sinkCellLink( sink, release.getVersion(), "#" + HtmlTools.encodeId( release.getVersion() ) );
- sinkCell(sink, release.getDateRelease());
+ sinkCell( sink, release.getDateRelease() );
- sinkCell(sink, release.getDescription());
+ sinkCell( sink, release.getDescription() );
sink.tableRow_();
}
@@ -503,9 +505,10 @@ public class ChangesReportGenerator exte
*/
private void constructReleases( Sink sink, ResourceBundle bundle, List releaseList )
{
- for (Object aReleaseList : releaseList) {
+ for ( Object aReleaseList : releaseList )
+ {
Release release = (Release) aReleaseList;
- constructRelease(sink, bundle, release);
+ constructRelease( sink, bundle, release );
}
}
@@ -522,13 +525,13 @@ public class ChangesReportGenerator exte
final String date = ( release.getDateRelease() == null ) ? "" : " - " + release.getDateRelease();
- sinkSectionTitle2Anchor(sink, bundle.getString("report.changes.label.release") + " "
- + release.getVersion() + date, release.getVersion());
+ sinkSectionTitle2Anchor( sink, bundle.getString( "report.changes.label.release" ) + " "
+ + release.getVersion() + date, release.getVersion() );
if ( isReleaseEmpty( release ) )
{
sink.paragraph();
- sink.text( bundle.getString("report.changes.text.no.changes") );
+ sink.text( bundle.getString( "report.changes.text.no.changes" ) );
sink.paragraph_();
}
else
@@ -538,20 +541,22 @@ public class ChangesReportGenerator exte
sink.tableRow();
sinkHeader( sink, bundle.getString( "report.issues.label.type" ) );
sinkHeader( sink, bundle.getString( "report.issues.label.summary" ) );
- sinkHeader(sink, bundle.getString("report.issues.label.assignee"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.assignee" ) );
if ( this.isAddActionDate() )
{
sinkHeader( sink, bundle.getString( "report.issues.label.updated" ) );
}
sink.tableRow_();
- for (Action action : release.getActions()) {
- constructAction(sink, bundle, action);
+ for ( Action action : release.getActions() )
+ {
+ constructAction( sink, bundle, action );
}
- for (Object o : release.getComponents()) {
+ for ( Object o : release.getComponents() )
+ {
Component component = (Component) o;
- constructComponent(sink, bundle, component);
+ constructComponent( sink, bundle, component );
}
sink.table_();
@@ -578,7 +583,7 @@ public class ChangesReportGenerator exte
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text(component.getName());
+ sink.text( component.getName() );
sink.tableHeaderCell_();
sink.tableHeaderCell();
@@ -592,8 +597,9 @@ public class ChangesReportGenerator exte
sink.tableRow_();
- for (Action action : component.getActions()) {
- constructAction(sink, bundle, action);
+ for ( Action action : component.getActions() )
+ {
+ constructAction( sink, bundle, action );
}
}
}
@@ -604,15 +610,18 @@ public class ChangesReportGenerator exte
* @param release Release to check
* @return <code>true</code> if release doesn't contain any issues, <code>false</code> otherwise
*/
- private boolean isReleaseEmpty( Release release ) {
+ private boolean isReleaseEmpty( Release release )
+ {
if ( !release.getActions().isEmpty() )
{
return false;
}
- for (Object o : release.getComponents()) {
+ for ( Object o : release.getComponents() )
+ {
Component component = (Component) o;
- if (!component.getActions().isEmpty()) {
+ if ( !component.getActions().isEmpty() )
+ {
return false;
}
}
@@ -632,7 +641,7 @@ public class ChangesReportGenerator exte
String parseLink;
String issueLink = (String) this.issueLinksPerSystem.get( system );
parseLink = issueLink.replaceFirst( ISSUE_TOKEN, issue );
- if (parseLink.contains(URL_TOKEN))
+ if ( parseLink.contains( URL_TOKEN ) )
{
String url = this.url.substring( 0, this.url.lastIndexOf( "/" ) );
parseLink = parseLink.replaceFirst( URL_TOKEN, url );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java Tue Mar 18 22:44:41 2014
@@ -115,12 +115,13 @@ public class ReleaseUtils
protected void logRelease( Release release )
{
Action action;
- for (Action action1 : release.getActions()) {
+ for ( Action action1 : release.getActions() )
+ {
action = action1;
- getLog().debug("o " + action.getType());
- getLog().debug("issue : " + action.getIssue());
- getLog().debug("action : " + action.getAction());
- getLog().debug("dueTo : " + action.getDueTo());
+ getLog().debug( "o " + action.getType() );
+ getLog().debug( "issue : " + action.getIssue() );
+ getLog().debug( "action : " + action.getAction() );
+ getLog().debug( "dueTo : " + action.getDueTo() );
}
}
@@ -186,14 +187,16 @@ public class ReleaseUtils
* @return A type List of Release objects
* @todo When Modello can generate typed collections this method is no longer needed
*/
- public List<Release> convertReleaseList( List changesReleases ) {
+ public List<Release> convertReleaseList( List changesReleases )
+ {
List<Release> releases = new ArrayList<Release>();
// Loop through the List of releases from changes.xml and casting each
// release to a Release
- for (Object changesRelease : changesReleases) {
+ for ( Object changesRelease : changesReleases )
+ {
Release release = (Release) changesRelease;
- releases.add(release);
+ releases.add( release );
}
return releases;
}
@@ -209,7 +212,8 @@ public class ReleaseUtils
* @param componentReleases Releases from the child component
* @return A list containing the merged releases
*/
- public List mergeReleases( final List releases, final String componentName, final List componentReleases ) {
+ public List mergeReleases( final List releases, final String componentName, final List componentReleases )
+ {
if ( releases == null && componentReleases == null )
{
return Collections.EMPTY_LIST;
@@ -223,32 +227,37 @@ public class ReleaseUtils
if ( releases != null )
{
- for (Object release1 : releases) {
+ for ( Object release1 : releases )
+ {
final Release release = (Release) release1;
- final Release componentRelease = getRelease(componentReleases, release.getVersion());
- if (componentRelease != null) {
- release.addComponent(componentName, componentRelease);
+ final Release componentRelease = getRelease( componentReleases, release.getVersion() );
+ if ( componentRelease != null )
+ {
+ release.addComponent( componentName, componentRelease );
}
- mergedReleases.add(release);
+ mergedReleases.add( release );
}
}
- for (Object componentRelease1 : componentReleases) {
+ for ( Object componentRelease1 : componentReleases )
+ {
final Release release = (Release) componentRelease1;
- final Release mergedRelease = getRelease(mergedReleases, release.getVersion());
- if (mergedRelease == null) {
+ final Release mergedRelease = getRelease( mergedReleases, release.getVersion() );
+ if ( mergedRelease == null )
+ {
final Release componentRelease = new Release();
- componentRelease.setVersion(release.getVersion());
- componentRelease.setDateRelease(release.getDateRelease());
- componentRelease.addComponent(componentName, release);
- mergedReleases.add(componentRelease);
+ componentRelease.setVersion( release.getVersion() );
+ componentRelease.setDateRelease( release.getDateRelease() );
+ componentRelease.addComponent( componentName, release );
+ mergedReleases.add( componentRelease );
}
}
return mergedReleases;
}
- private static String toString(Release release) {
+ private static String toString( Release release )
+ {
return release.getClass().getSimpleName()
+ "[version='" + release.getVersion() + "'"
+ ", date='" + release.getDateRelease() + "'"
@@ -257,9 +266,11 @@ public class ReleaseUtils
+ "]";
}
- public static String toString( List<Release> releases ) {
+ public static String toString( List<Release> releases )
+ {
List<String> releaseStrings = new ArrayList<String>( releases.size() );
- for ( Release release : releases ) {
+ for ( Release release : releases )
+ {
releaseStrings.add( toString( release ) );
}
return releaseStrings.toString();
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java Tue Mar 18 22:44:41 2014
@@ -43,7 +43,7 @@ import java.util.ResourceBundle;
* @author Bryan Baugher
* @since 2.8
*/
-@Mojo (name = "github-report", threadSafe = true)
+@Mojo ( name = "github-report", threadSafe = true )
public class GitHubMojo
extends AbstractChangesReport
{
@@ -55,15 +55,15 @@ public class GitHubMojo
static
{
- GITHUB_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
- GITHUB_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
- GITHUB_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
- GITHUB_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
- GITHUB_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
- GITHUB_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
- GITHUB_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
- GITHUB_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
- GITHUB_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
+ GITHUB_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE );
+ GITHUB_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED );
+ GITHUB_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION );
+ GITHUB_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID );
+ GITHUB_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER );
+ GITHUB_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS );
+ GITHUB_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY );
+ GITHUB_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE );
+ GITHUB_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED );
}
/**
@@ -77,31 +77,31 @@ public class GitHubMojo
* <code>Updated</code>.
* </p>
*/
- @Parameter (defaultValue = "Id,Type,Summary,Assignee,Reporter,Status,Created,Updated,Fix Version")
+ @Parameter ( defaultValue = "Id,Type,Summary,Assignee,Reporter,Status,Created,Updated,Fix Version" )
private String columnNames;
/**
* The scheme of your github api domain. Only use if using github enterprise.
*/
- @Parameter (defaultValue = "http")
+ @Parameter ( defaultValue = "http" )
private String githubAPIScheme;
/**
* The port of your github api domain. Only use if using github enterprise.
*/
- @Parameter (defaultValue = "80")
+ @Parameter ( defaultValue = "80" )
private int githubAPIPort;
/**
* Boolean which says if we should include open issues in the report.
*/
- @Parameter (defaultValue = "true")
+ @Parameter ( defaultValue = "true" )
private boolean includeOpenIssues;
/**
* Boolean which says if we should include only issues with milestones.
*/
- @Parameter (defaultValue = "true")
+ @Parameter ( defaultValue = "true" )
private boolean onlyMilestoneIssues;
/**
@@ -109,7 +109,7 @@ public class GitHubMojo
* The current version being used is <code>${project.version}</code> minus
* any "-SNAPSHOT" suffix.
*/
- @Parameter (defaultValue = "false")
+ @Parameter ( defaultValue = "false" )
private boolean onlyCurrentVersion;
public String getOutputName()
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java Tue Mar 18 22:44:41 2014
@@ -51,14 +51,18 @@ public class IssueUtils
boolean isFound = false;
Issue issue;
- for (Issue issue1 : issues) {
+ for ( Issue issue1 : issues )
+ {
issue = issue1;
- if (issue.getFixVersions() != null) {
- for (String fixVersion : issue.getFixVersions()) {
- if (prefix == null || fixVersion.startsWith(prefix)) {
+ if ( issue.getFixVersions() != null )
+ {
+ for ( String fixVersion : issue.getFixVersions() )
+ {
+ if ( prefix == null || fixVersion.startsWith( prefix ) )
+ {
isFound = true;
- filteredIssues.add(issue);
+ filteredIssues.add( issue );
break;
}
}
@@ -99,12 +103,14 @@ public class IssueUtils
releaseVersion = version.substring( 0, version.length() - SNAPSHOT_SUFFIX.length() );
}
- for (Issue issue1 : issues) {
+ for ( Issue issue1 : issues )
+ {
issue = issue1;
- if (issue.getFixVersions() != null && issue.getFixVersions().contains(releaseVersion)) {
+ if ( issue.getFixVersions() != null && issue.getFixVersions().contains( releaseVersion ) )
+ {
isFound = true;
- issuesForVersion.add(issue);
+ issuesForVersion.add( issue );
}
}
@@ -116,9 +122,11 @@ public class IssueUtils
return issuesForVersion;
}
- public static String toString( List<Issue> issues ) {
+ public static String toString( List<Issue> issues )
+ {
List<String> issueStrings = new ArrayList<String>( issues.size() );
- for ( Issue issue : issues ) {
+ for ( Issue issue : issues )
+ {
issueStrings.add( issue.toString() );
}
return issueStrings.toString();
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java Tue Mar 18 22:44:41 2014
@@ -93,62 +93,64 @@ public class IssuesReportGenerator exten
sink.tableRow();
- for (int column : columns) {
- switch (column) {
+ for ( int column : columns )
+ {
+ switch ( column )
+ {
case IssuesReportHelper.COLUMN_ASSIGNEE:
- sinkHeader(sink, bundle.getString("report.issues.label.assignee"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.assignee" ) );
break;
case IssuesReportHelper.COLUMN_COMPONENT:
- sinkHeader(sink, bundle.getString("report.issues.label.component"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.component" ) );
break;
case IssuesReportHelper.COLUMN_CREATED:
- sinkHeader(sink, bundle.getString("report.issues.label.created"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.created" ) );
break;
case IssuesReportHelper.COLUMN_FIX_VERSION:
- sinkHeader(sink, bundle.getString("report.issues.label.fixVersion"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.fixVersion" ) );
break;
case IssuesReportHelper.COLUMN_ID:
- sinkHeader(sink, bundle.getString("report.issues.label.id"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.id" ) );
break;
case IssuesReportHelper.COLUMN_KEY:
- sinkHeader(sink, bundle.getString("report.issues.label.key"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.key" ) );
break;
case IssuesReportHelper.COLUMN_PRIORITY:
- sinkHeader(sink, bundle.getString("report.issues.label.priority"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.priority" ) );
break;
case IssuesReportHelper.COLUMN_REPORTER:
- sinkHeader(sink, bundle.getString("report.issues.label.reporter"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.reporter" ) );
break;
case IssuesReportHelper.COLUMN_RESOLUTION:
- sinkHeader(sink, bundle.getString("report.issues.label.resolution"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.resolution" ) );
break;
case IssuesReportHelper.COLUMN_STATUS:
- sinkHeader(sink, bundle.getString("report.issues.label.status"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.status" ) );
break;
case IssuesReportHelper.COLUMN_SUMMARY:
- sinkHeader(sink, bundle.getString("report.issues.label.summary"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.summary" ) );
break;
case IssuesReportHelper.COLUMN_TYPE:
- sinkHeader(sink, bundle.getString("report.issues.label.type"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.type" ) );
break;
case IssuesReportHelper.COLUMN_UPDATED:
- sinkHeader(sink, bundle.getString("report.issues.label.updated"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.updated" ) );
break;
case IssuesReportHelper.COLUMN_VERSION:
- sinkHeader(sink, bundle.getString("report.issues.label.version"));
+ sinkHeader( sink, bundle.getString( "report.issues.label.version" ) );
break;
default:
@@ -167,86 +169,91 @@ public class IssuesReportGenerator exten
return;
}
- for (Object anIssueList : issueList) {
+ for ( Object anIssueList : issueList )
+ {
// Use a DateFormat based on the Locale
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
+ DateFormat df = DateFormat.getDateInstance( DateFormat.SHORT, locale );
Issue issue = (Issue) anIssueList;
sink.tableRow();
- for (int column : columns) {
- switch (column) {
+ for ( int column : columns )
+ {
+ switch ( column )
+ {
case IssuesReportHelper.COLUMN_ASSIGNEE:
- sinkCell(sink, issue.getAssignee());
+ sinkCell( sink, issue.getAssignee() );
break;
case IssuesReportHelper.COLUMN_COMPONENT:
- sinkCell(sink, IssuesReportHelper.printValues(issue.getComponents()));
+ sinkCell( sink, IssuesReportHelper.printValues( issue.getComponents() ) );
break;
case IssuesReportHelper.COLUMN_CREATED:
String created = NOT_AVAILABLE;
- if (issue.getCreated() != null) {
- created = df.format(issue.getCreated());
+ if ( issue.getCreated() != null )
+ {
+ created = df.format( issue.getCreated() );
}
- sinkCell(sink, created);
+ sinkCell( sink, created );
break;
case IssuesReportHelper.COLUMN_FIX_VERSION:
- sinkCell(sink, IssuesReportHelper.printValues(issue.getFixVersions()));
+ sinkCell( sink, IssuesReportHelper.printValues( issue.getFixVersions() ) );
break;
case IssuesReportHelper.COLUMN_ID:
sink.tableCell();
- sink.link(issue.getLink());
- sink.text(issue.getId());
+ sink.link( issue.getLink() );
+ sink.text( issue.getId() );
sink.link_();
sink.tableCell_();
break;
case IssuesReportHelper.COLUMN_KEY:
sink.tableCell();
- sink.link(issue.getLink());
- sink.text(issue.getKey());
+ sink.link( issue.getLink() );
+ sink.text( issue.getKey() );
sink.link_();
sink.tableCell_();
break;
case IssuesReportHelper.COLUMN_PRIORITY:
- sinkCell(sink, issue.getPriority());
+ sinkCell( sink, issue.getPriority() );
break;
case IssuesReportHelper.COLUMN_REPORTER:
- sinkCell(sink, issue.getReporter());
+ sinkCell( sink, issue.getReporter() );
break;
case IssuesReportHelper.COLUMN_RESOLUTION:
- sinkCell(sink, issue.getResolution());
+ sinkCell( sink, issue.getResolution() );
break;
case IssuesReportHelper.COLUMN_STATUS:
- sinkCell(sink, issue.getStatus());
+ sinkCell( sink, issue.getStatus() );
break;
case IssuesReportHelper.COLUMN_SUMMARY:
- sinkCell(sink, issue.getSummary());
+ sinkCell( sink, issue.getSummary() );
break;
case IssuesReportHelper.COLUMN_TYPE:
- sinkCell(sink, issue.getType());
+ sinkCell( sink, issue.getType() );
break;
case IssuesReportHelper.COLUMN_UPDATED:
String updated = NOT_AVAILABLE;
- if (issue.getUpdated() != null) {
- updated = df.format(issue.getUpdated());
+ if ( issue.getUpdated() != null )
+ {
+ updated = df.format( issue.getUpdated() );
}
- sinkCell(sink, updated);
+ sinkCell( sink, updated );
break;
case IssuesReportHelper.COLUMN_VERSION:
- sinkCell(sink, issue.getVersion());
+ sinkCell( sink, issue.getVersion() );
break;
default:
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java Tue Mar 18 22:44:41 2014
@@ -71,7 +71,7 @@ public class IssuesReportHelper
* @param allColumns A mapping from column name to column id
* @return A List of column id:s
*/
- public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns )
+ public static List<Integer> getColumnIds( String columnNames, Map<String, Integer> allColumns )
{
return getColumnIds( columnNames, allColumns, null, null );
}
@@ -88,8 +88,8 @@ public class IssuesReportHelper
* @param log A log
* @return A List of column id:s
*/
- public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns,
- Map<String,Integer> deprecatedColumns, Log log )
+ public static List<Integer> getColumnIds( String columnNames, Map<String, Integer> allColumns,
+ Map<String, Integer> deprecatedColumns, Log log )
{
DualHashBidiMap bidiColumns = null;
List<Integer> columnIds = new ArrayList<Integer>();
@@ -101,16 +101,21 @@ public class IssuesReportHelper
}
// Loop through the names of the columns, to validate each of them and add their id to the list
- for (String aColumnNamesArray : columnNamesArray) {
+ for ( String aColumnNamesArray : columnNamesArray )
+ {
String columnName = aColumnNamesArray.trim();
- if (allColumns.containsKey(columnName)) {
- columnIds.add(allColumns.get(columnName));
- } else if (deprecatedColumns != null && deprecatedColumns.containsKey(columnName)) {
- Integer columnId = deprecatedColumns.get(columnName);
- columnIds.add(columnId);
- if (log != null) {
- log.warn("The columnName '" + columnName + "' has been deprecated." + " Please use "
- + "the columnName '" + bidiColumns.getKey(columnId) + "' instead.");
+ if ( allColumns.containsKey( columnName ) )
+ {
+ columnIds.add( allColumns.get( columnName ) );
+ }
+ else if ( deprecatedColumns != null && deprecatedColumns.containsKey( columnName ) )
+ {
+ Integer columnId = deprecatedColumns.get( columnName );
+ columnIds.add( columnId );
+ if ( log != null )
+ {
+ log.warn( "The columnName '" + columnName + "' has been deprecated." + " Please use "
+ + "the columnName '" + bidiColumns.getKey( columnId ) + "' instead." );
}
}
}
@@ -153,7 +158,7 @@ public class IssuesReportHelper
int[] intArray = new int[list.size()];
for ( int j = 0; j < intArray.length; j++ )
{
- intArray[j] = list.get(j);
+ intArray[j] = list.get( j );
}
return intArray;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java Tue Mar 18 22:44:41 2014
@@ -142,7 +142,7 @@ public abstract class AbstractJiraDownlo
{
url = new URL( jiraUrl );
}
- catch( MalformedURLException e )
+ catch ( MalformedURLException e )
{
getLog().error( "Invalid JIRA URL: " + jiraUrl + ". " + e.getMessage() );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AdaptiveJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AdaptiveJiraDownloader.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AdaptiveJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AdaptiveJiraDownloader.java Tue Mar 18 22:44:41 2014
@@ -46,7 +46,7 @@ public class AdaptiveJiraDownloader exte
{
effectiveDownloader.doExecute();
}
- catch( RestJiraDownloader.NoRest nre )
+ catch ( RestJiraDownloader.NoRest nre )
{
getLog().info( "Falling back to RSS for issue download: " + nre.getMessage() );
effectiveDownloader = new ClassicJiraDownloader();
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java Tue Mar 18 22:44:41 2014
@@ -318,7 +318,7 @@ public final class ClassicJiraDownloader
{
final String loginFailureResponse = "your username and password are incorrect";
- return !loginGet.getResponseBodyAsString().contains(loginFailureResponse);
+ return !loginGet.getResponseBodyAsString().contains( loginFailureResponse );
}
/**
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java Tue Mar 18 22:44:41 2014
@@ -47,7 +47,7 @@ public class JiraHelper
* @param issueManagementUrl The URL to the issue management system
* @return A <code>Map</code> containing the URL and project id
*/
- static Map<String,String> getJiraUrlAndProjectId( String issueManagementUrl )
+ static Map<String, String> getJiraUrlAndProjectId( String issueManagementUrl )
{
String url = issueManagementUrl;
@@ -87,7 +87,7 @@ public class JiraHelper
}
}
- HashMap<String,String> urlMap = new HashMap<String,String>( 4 );
+ HashMap<String, String> urlMap = new HashMap<String, String>( 4 );
urlMap.put( "url", jiraUrl );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Tue Mar 18 22:44:41 2014
@@ -52,24 +52,24 @@ 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<String, Integer>( 16 );
static
{
- JIRA_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
- JIRA_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT);
- JIRA_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
- JIRA_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
- JIRA_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
- JIRA_COLUMNS.put( "Key", IssuesReportHelper.COLUMN_KEY);
- JIRA_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY);
- JIRA_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
- JIRA_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION);
- JIRA_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
- JIRA_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
- JIRA_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
- JIRA_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
- JIRA_COLUMNS.put( "Version", IssuesReportHelper.COLUMN_VERSION);
+ JIRA_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE );
+ JIRA_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT );
+ JIRA_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED );
+ JIRA_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION );
+ JIRA_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID );
+ JIRA_COLUMNS.put( "Key", IssuesReportHelper.COLUMN_KEY );
+ JIRA_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY );
+ JIRA_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER );
+ JIRA_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION );
+ JIRA_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS );
+ JIRA_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY );
+ JIRA_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE );
+ JIRA_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED );
+ JIRA_COLUMNS.put( "Version", IssuesReportHelper.COLUMN_VERSION );
}
/**
@@ -106,7 +106,7 @@ public class JiraMojo
*
* @since 2.9
*/
- @Parameter( defaultValue = "false")
+ @Parameter( defaultValue = "false" )
private boolean forceRss;
/**
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JqlQueryBuilder.java Tue Mar 18 22:44:41 2014
@@ -245,7 +245,7 @@ public class JqlQueryBuilder
query.append( " AND " );
}
- query.append(key).append(" in (");
+ query.append( key ).append( " in (" );
String[] valuesArr = values.split( "," );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java Tue Mar 18 22:44:41 2014
@@ -42,13 +42,13 @@ 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<String, String>( 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<String, String>( 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<String, String>( 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<String, String>( 8 );
public ParameterQueryBuilder( Log log )
{
@@ -152,9 +152,11 @@ public class ParameterQueryBuilder
{
String[] fixVersions = fixVersionIds.split( "," );
- for (String fixVersion : fixVersions) {
- if (fixVersion.length() > 0) {
- query.append("&fixfor=").append(fixVersion.trim());
+ for ( String fixVersion : fixVersions )
+ {
+ if ( fixVersion.length() > 0 )
+ {
+ query.append( "&fixfor=" ).append( fixVersion.trim() );
}
}
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java Tue Mar 18 22:44:41 2014
@@ -73,7 +73,8 @@ public class RestJiraDownloader extends
private String jiraProject;
- public static class NoRest extends Exception {
+ public static class NoRest extends Exception
+ {
public NoRest( )
{
// blank on purpose.
@@ -84,7 +85,8 @@ public class RestJiraDownloader extends
}
}
- public RestJiraDownloader() {
+ public RestJiraDownloader()
+ {
jsonFactory = new MappingJsonFactory( );
//2012-07-17T06:26:47.723-0500
dateFormat = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss.SSSZ" );
@@ -218,7 +220,7 @@ public class RestJiraDownloader extends
{
return;
}
- if ( listUrlArgs != null && listUrlArgs.length != 0)
+ if ( listUrlArgs != null && listUrlArgs.length != 0 )
{
client.replacePath( "/" );
client.path( listRestUrlPattern, listUrlArgs );
@@ -237,7 +239,8 @@ public class RestJiraDownloader extends
JsonNode items = getResponseTree( resp );
String[] pieces = input.split( "," );
- for (String item : pieces ) {
+ for ( String item : pieces )
+ {
targetList.add( resolveOneItem( items, what, item ) );
}
}
@@ -257,7 +260,7 @@ public class RestJiraDownloader extends
return item.get( "id" ).asText();
}
}
- throw new MojoFailureException( String.format("Could not find %s %s.", what, nameOrId ) );
+ throw new MojoFailureException( String.format( "Could not find %s %s.", what, nameOrId ) );
}
private MediaType getResponseMediaType( Response response )
@@ -286,7 +289,7 @@ public class RestJiraDownloader extends
if ( val != null )
{
issue.setKey( val.asText() );
- issue.setLink( String.format( "%s/browse/%s", jiraUrl, val.asText()) );
+ issue.setLink( String.format( "%s/browse/%s", jiraUrl, val.asText() ) );
}
// much of what we want is in here.
@@ -465,7 +468,7 @@ public class RestJiraDownloader extends
private void processFixVersions( Issue issue, JsonNode val )
{
- if ( val != null)
+ if ( val != null )
{
assert val.isArray();
for ( int vx = 0; vx < val.size(); vx++ )
@@ -555,9 +558,9 @@ public class RestJiraDownloader extends
HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
- httpClientPolicy.setConnectionTimeout(36000);
- httpClientPolicy.setAllowChunking(false);
- httpClientPolicy.setReceiveTimeout(32000);
+ httpClientPolicy.setConnectionTimeout( 36000 );
+ httpClientPolicy.setAllowChunking( false );
+ httpClientPolicy.setReceiveTimeout( 32000 );
if ( proxyHost != null )
{
@@ -584,7 +587,7 @@ public class RestJiraDownloader extends
http.setAuthorization( authPolicy );
}
- http.setClient(httpClientPolicy);
+ http.setClient( httpClientPolicy );
return client;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/UrlBuilder.java Tue Mar 18 22:44:41 2014
@@ -50,7 +50,7 @@ public class UrlBuilder
{
query.append( QUESTION_MARK );
}
- query.append(key).append("=").append(value);
+ query.append( key ).append( "=" ).append( value );
}
return this;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java Tue Mar 18 22:44:41 2014
@@ -52,7 +52,7 @@ public class ProjectResourceLoader
* 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<String, String>();
public void init( ExtendedProperties configuration )
{
@@ -69,8 +69,9 @@ public class ProjectResourceLoader
paths.add( path );
- for (String path1 : paths) {
- rsvc.getLog().info("ProjectResourceLoader : adding path '" + path1 + "'");
+ for ( String path1 : paths )
+ {
+ rsvc.getLog().info( "ProjectResourceLoader : adding path '" + path1 + "'" );
}
rsvc.getLog().info( "ProjectResourceLoader : initialization complete." );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java Tue Mar 18 22:44:41 2014
@@ -130,11 +130,12 @@ public class TracDownloader
{
queryResult = (Object[]) client.execute( "ticket.query", params );
- for (Object aQueryResult : queryResult) {
+ for ( Object aQueryResult : queryResult )
+ {
params = new Object[]{aQueryResult};
Object[] ticketGetResult;
- ticketGetResult = (Object[]) client.execute("ticket.get", params);
- issueList.add(createIssue(ticketGetResult));
+ ticketGetResult = (Object[]) client.execute( "ticket.get", params );
+ issueList.add( createIssue( ticketGetResult ) );
}
}
catch ( XmlRpcException e )
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java?rev=1579078&r1=1579077&r2=1579078&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java Tue Mar 18 22:44:41 2014
@@ -50,40 +50,40 @@ public class TracMojo
/**
* Deprecated Trac columns.
*/
- private static Map<String,Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String,Integer>();
+ private static Map<String, Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String, Integer>();
/**
* Valid Trac columns.
*/
- private static Map<String,Integer> TRAC_COLUMNS = new HashMap<String,Integer>();
+ private static Map<String, Integer> TRAC_COLUMNS = new HashMap<String, Integer>();
static
{
- DEPRECATED_TRAC_COLUMNS.put( "changed", IssuesReportHelper.COLUMN_UPDATED);
- DEPRECATED_TRAC_COLUMNS.put( "component", IssuesReportHelper.COLUMN_COMPONENT);
- DEPRECATED_TRAC_COLUMNS.put( "created", IssuesReportHelper.COLUMN_CREATED);
- DEPRECATED_TRAC_COLUMNS.put( "id", IssuesReportHelper.COLUMN_ID);
- DEPRECATED_TRAC_COLUMNS.put( "milestone", IssuesReportHelper.COLUMN_FIX_VERSION);
- DEPRECATED_TRAC_COLUMNS.put( "owner", IssuesReportHelper.COLUMN_ASSIGNEE);
- DEPRECATED_TRAC_COLUMNS.put( "priority", IssuesReportHelper.COLUMN_PRIORITY);
- DEPRECATED_TRAC_COLUMNS.put( "reporter", IssuesReportHelper.COLUMN_REPORTER);
- DEPRECATED_TRAC_COLUMNS.put( "resolution", IssuesReportHelper.COLUMN_RESOLUTION);
- DEPRECATED_TRAC_COLUMNS.put( "status", IssuesReportHelper.COLUMN_STATUS);
- DEPRECATED_TRAC_COLUMNS.put( "summary", IssuesReportHelper.COLUMN_SUMMARY);
- DEPRECATED_TRAC_COLUMNS.put( "type", IssuesReportHelper.COLUMN_TYPE);
-
- TRAC_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
- TRAC_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT);
- TRAC_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
- TRAC_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
- TRAC_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
- TRAC_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY);
- TRAC_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
- TRAC_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION);
- TRAC_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
- TRAC_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
- TRAC_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
- TRAC_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
+ DEPRECATED_TRAC_COLUMNS.put( "changed", IssuesReportHelper.COLUMN_UPDATED );
+ DEPRECATED_TRAC_COLUMNS.put( "component", IssuesReportHelper.COLUMN_COMPONENT );
+ DEPRECATED_TRAC_COLUMNS.put( "created", IssuesReportHelper.COLUMN_CREATED );
+ DEPRECATED_TRAC_COLUMNS.put( "id", IssuesReportHelper.COLUMN_ID );
+ DEPRECATED_TRAC_COLUMNS.put( "milestone", IssuesReportHelper.COLUMN_FIX_VERSION );
+ DEPRECATED_TRAC_COLUMNS.put( "owner", IssuesReportHelper.COLUMN_ASSIGNEE );
+ DEPRECATED_TRAC_COLUMNS.put( "priority", IssuesReportHelper.COLUMN_PRIORITY );
+ DEPRECATED_TRAC_COLUMNS.put( "reporter", IssuesReportHelper.COLUMN_REPORTER );
+ DEPRECATED_TRAC_COLUMNS.put( "resolution", IssuesReportHelper.COLUMN_RESOLUTION );
+ DEPRECATED_TRAC_COLUMNS.put( "status", IssuesReportHelper.COLUMN_STATUS );
+ DEPRECATED_TRAC_COLUMNS.put( "summary", IssuesReportHelper.COLUMN_SUMMARY );
+ DEPRECATED_TRAC_COLUMNS.put( "type", IssuesReportHelper.COLUMN_TYPE );
+
+ TRAC_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE );
+ TRAC_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT );
+ TRAC_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED );
+ TRAC_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION );
+ TRAC_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID );
+ TRAC_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY );
+ TRAC_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER );
+ TRAC_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION );
+ TRAC_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS );
+ TRAC_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY );
+ TRAC_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE );
+ TRAC_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED );
}
/**