Author: ltheussl
Date: Sun Jan 23 19:59:40 2011
New Revision: 1062508
URL: http://svn.apache.org/viewvc?rev=1062508&view=rev
Log:
code polishing
Modified:
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/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/JiraXML.java
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=1062508&r1=1062507&r2=1062508&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
Sun Jan 23 19:59:40 2011
@@ -99,13 +99,13 @@ public abstract class AbstractJiraDownlo
/** The maven settings. */
private Settings settings;
/** Mapping containing all allowed JIRA status values. */
- protected Map statusMap = new HashMap();
+ protected final Map statusMap = new HashMap( 8 );
/** Mapping containing all allowed JIRA resolution values. */
- protected Map resolutionMap = new HashMap();
+ protected final Map resolutionMap = new HashMap( 8 );
/** Mapping containing all allowed JIRA priority values. */
- protected Map priorityMap = new HashMap();
+ protected final Map priorityMap = new HashMap( 8 );
/** Mapping containing all allowed JIRA type values. */
- protected Map typeMap = new HashMap();
+ protected final Map typeMap = new HashMap( 8 );
/** The pattern used to parse dates from the JIRA xml file. */
private String jiraDatePattern;
@@ -122,7 +122,7 @@ public abstract class AbstractJiraDownlo
return this.filter;
}
- StringBuffer localFilter = new StringBuffer();
+ StringBuffer localFilter = new StringBuffer( 16 );
// add fix versions
if ( fixVersionIds != null )
@@ -133,7 +133,7 @@ public abstract class AbstractJiraDownlo
{
if ( fixVersions[i].length() > 0 )
{
- localFilter.append( "&fixfor=" + fixVersions[i].trim() );
+ localFilter.append( "&fixfor=" ).append(
fixVersions[i].trim());
}
}
}
@@ -149,7 +149,7 @@ public abstract class AbstractJiraDownlo
if ( statusParam != null )
{
- localFilter.append( "&statusIds=" + statusParam );
+ localFilter.append( "&statusIds=" ).append( statusParam);
}
}
}
@@ -165,7 +165,7 @@ public abstract class AbstractJiraDownlo
if ( priorityParam != null )
{
- localFilter.append( "&priorityIds=" + priorityParam );
+ localFilter.append( "&priorityIds=" ).append(
priorityParam);
}
}
}
@@ -181,7 +181,7 @@ public abstract class AbstractJiraDownlo
if ( resoParam != null )
{
- localFilter.append( "&resolutionIds=" + resoParam );
+ localFilter.append( "&resolutionIds=" ).append( resoParam);
}
}
}
@@ -195,7 +195,7 @@ public abstract class AbstractJiraDownlo
{
if ( components[i].length() > 0 )
{
- localFilter.append( "&component=" + components[i] );
+ localFilter.append( "&component=" ).append( components[i]);
}
}
}
@@ -211,7 +211,7 @@ public abstract class AbstractJiraDownlo
if ( typeParam != null )
{
- localFilter.append( "&type=" + typeParam );
+ localFilter.append( "&type=" ).append( typeParam);
}
}
}
@@ -704,7 +704,8 @@ public abstract class AbstractJiraDownlo
public List getIssueList() {
if ( output.isFile() )
{
- JiraXML jira = new JiraXML( output, log, jiraDatePattern );
+ JiraXML jira = new JiraXML( log, jiraDatePattern );
+ jira.parseXML( output );
getLog().info( "The JIRA version is '" + jira.getJiraVersion() +
"'" );
return jira.getIssueList();
}
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=1062508&r1=1062507&r2=1062508&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
Sun Jan 23 19:59:40 2011
@@ -21,16 +21,12 @@ package org.apache.maven.plugin.jira;
import java.text.NumberFormat;
import java.text.ParsePosition;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.issues.Issue;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.wagon.proxy.ProxyInfo;
@@ -53,8 +49,6 @@ public class JiraHelper
*/
static Map getJiraUrlAndProjectId( String issueManagementUrl )
{
- HashMap urlMap = new HashMap();
-
String url = issueManagementUrl;
if ( url.endsWith( "/" ) )
@@ -64,7 +58,7 @@ public class JiraHelper
}
// chop off the parameter part
- int pos = url.indexOf( "?" );
+ int pos = url.indexOf( '?');
// and get the id while we're at it
String id = "";
@@ -72,14 +66,14 @@ public class JiraHelper
if ( pos >= 0 )
{
// project id
- id = url.substring( url.lastIndexOf( "=" ) + 1 );
+ id = url.substring( url.lastIndexOf( '=') + 1 );
}
- String jiraUrl = url.substring( 0, url.lastIndexOf( "/" ) );
+ String jiraUrl = url.substring( 0, url.lastIndexOf( '/') );
if ( jiraUrl.endsWith( "secure" ) )
{
- jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( "/" ) );
+ jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( '/') );
}
else
{
@@ -93,6 +87,8 @@ public class JiraHelper
}
}
+ HashMap urlMap = new HashMap( 4 );
+
urlMap.put( "url", jiraUrl );
urlMap.put( "id", id );
@@ -161,9 +157,10 @@ public class JiraHelper
*/
public static boolean validateNonProxyHosts( ProxyInfo proxy, String
targetHost )
{
- if ( targetHost == null )
+ String tHost = targetHost;
+ if ( tHost == null )
{
- targetHost = new String();
+ tHost = new String();
}
if ( proxy == null )
{
@@ -181,11 +178,16 @@ public class JiraHelper
{
String pattern = tokenizer.nextToken();
pattern = pattern.replaceAll( "\\.", "\\\\." ).replaceAll( "\\*",
".*" );
- if ( targetHost.matches( pattern ) )
+ if ( tHost.matches( pattern ) )
{
return true;
}
}
return false;
}
+
+ private JiraHelper()
+ {
+ // utility class
+ }
}
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=1062508&r1=1062507&r2=1062508&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
Sun Jan 23 19:59:40 2011
@@ -48,7 +48,7 @@ public class JiraMojo
/**
* Valid JIRA columns.
*/
- private static Map JIRA_COLUMNS = new HashMap();
+ private static final Map JIRA_COLUMNS = new HashMap( 16 );
static
{
@@ -301,7 +301,7 @@ public class JiraMojo
{
// Validate parameters
List columnIds = IssuesReportHelper.getColumnIds( columnNames,
JIRA_COLUMNS );
- if ( columnIds.size() == 0 )
+ if ( columnIds.isEmpty() )
{
// This can happen if the user has configured column names and
they are all invalid
throw new MavenReportException(
@@ -346,7 +346,7 @@ public class JiraMojo
}
catch ( Exception e )
{
- e.printStackTrace();
+ getLog().warn( e );
}
}
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java?rev=1062508&r1=1062507&r2=1062508&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
Sun Jan 23 19:59:40 2011
@@ -23,6 +23,7 @@ import java.io.File;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Locale;
@@ -45,23 +46,45 @@ import org.xml.sax.helpers.DefaultHandle
public class JiraXML
extends DefaultHandler
{
- private List issueList;
+ private final List issueList;
- private StringBuffer currentElement = new StringBuffer( 1024 );
+ private final StringBuffer currentElement = new StringBuffer( 1024 );
private String currentParent = "";
- private String datePattern = null;
+ private final String datePattern;
private Issue issue;
private String jiraVersion = null;
- private Log log = null;
+ private final Log log;
private SimpleDateFormat sdf = null;
+ /**
+ *
+ * @param xmlPath
+ * @param log not null
+ * @param datePattern
+ *
+ * @deprecated use {@link #JiraXML(org.apache.maven.plugin.logging.Log,
java.lang.String)} instead.
+ */
public JiraXML( File xmlPath, Log log, String datePattern )
+
+ {
+ this( log, datePattern );
+
+ parse( xmlPath );
+ }
+
+ /**
+ *
+ * @param log not null.
+ * @param datePattern may be null.
+ * @since 2.4
+ */
+ public JiraXML( Log log, String datePattern )
{
this.log = log;
this.datePattern = datePattern;
@@ -76,19 +99,33 @@ public class JiraXML
sdf = new SimpleDateFormat( datePattern, Locale.ENGLISH );
}
- SAXParserFactory factory = SAXParserFactory.newInstance();
+ this.issueList = new ArrayList( 16 );
+ }
- issueList = new ArrayList();
+ /**
+ * Parse the given xml file. The list of issues can then be retrieved with
{@link #getIssueList()}.
+ *
+ * @param xmlPath the file to pares.
+ *
+ * @since 2.4
+ */
+ public void parseXML( File xmlPath )
+ {
+ parse( xmlPath );
+ }
+ private void parse( File xmlPath )
+ {
try
{
+ SAXParserFactory factory = SAXParserFactory.newInstance();
SAXParser saxParser = factory.newSAXParser();
saxParser.parse( xmlPath, this );
}
catch ( Throwable t )
{
- t.printStackTrace();
+ log.warn( t );
}
}
@@ -218,7 +255,7 @@ public class JiraXML
public List getIssueList()
{
- return this.issueList;
+ return Collections.unmodifiableList( this.issueList );
}
public String getJiraVersion()
