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 2011/01/16 22:48:34 UTC
svn commit: r1059687 - in
/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira:
AbstractJiraDownloader.java JiraHelper.java
Author: dennisl
Date: Sun Jan 16 21:48:33 2011
New Revision: 1059687
URL: http://svn.apache.org/viewvc?rev=1059687&view=rev
Log:
o Refactoring: Move helper method to helper class.
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
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=1059687&r1=1059686&r2=1059687&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 16 21:48:33 2011
@@ -344,9 +344,10 @@ public abstract class AbstractJiraDownlo
client.setState( state );
- Map urlMap = getJiraUrlAndIssueId();
+ Map urlMap = JiraHelper.getJiraUrlAndIssueId( project.getIssueManagement().getUrl() );
String jiraUrl = (String) urlMap.get( "url" );
+ getLog().debug( "JIRA lives at: " + jiraUrl );
String jiraId = (String) urlMap.get( "id" );
@@ -421,51 +422,6 @@ public abstract class AbstractJiraDownlo
}
/**
- * Parse out the base URL for JIRA and the JIRA project id from the issue
- * management section of the POM.
- *
- * @return A <code>Map</code> containing the URL and project id
- */
- private Map getJiraUrlAndIssueId()
- {
- HashMap urlMap = new HashMap();
-
- String url = project.getIssueManagement().getUrl();
-
- if ( url.endsWith( "/" ) )
- {
- // MCHANGES-218
- url = url.substring( 0, url.lastIndexOf( '/' ) );
- }
-
- // chop off the parameter part
- int pos = url.indexOf( "?" );
-
- // and get the id while we're at it
- String id = "";
-
- if ( pos >= 0 )
- {
- // project id
- id = url.substring( url.lastIndexOf( "=" ) + 1 );
- }
-
- String jiraUrl = url.substring( 0, url.lastIndexOf( "/" ) );
-
- if ( jiraUrl.endsWith( "secure" ) || jiraUrl.endsWith( "browse" ) )
- {
- jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( "/" ) );
- }
- getLog().debug( "JIRA lives at: " + jiraUrl );
-
- urlMap.put( "url", jiraUrl );
-
- urlMap.put( "id", id );
-
- return urlMap;
- }
-
- /**
* Check and prepare for basic authentication.
*
* @param client The client to prepare
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=1059687&r1=1059686&r2=1059687&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 16 21:48:33 2011
@@ -22,7 +22,9 @@ 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;
@@ -90,6 +92,51 @@ public class JiraHelper
}
/**
+ * Parse out the base URL for JIRA and the JIRA project id from the issue
+ * management URL.
+ *
+ * @param issueManagementUrl The URL to the issue management system
+ * @return A <code>Map</code> containing the URL and project id
+ */
+ static Map getJiraUrlAndIssueId( String issueManagementUrl )
+ {
+ HashMap urlMap = new HashMap();
+
+ String url = issueManagementUrl;
+
+ if ( url.endsWith( "/" ) )
+ {
+ // MCHANGES-218
+ url = url.substring( 0, url.lastIndexOf( '/' ) );
+ }
+
+ // chop off the parameter part
+ int pos = url.indexOf( "?" );
+
+ // and get the id while we're at it
+ String id = "";
+
+ if ( pos >= 0 )
+ {
+ // project id
+ id = url.substring( url.lastIndexOf( "=" ) + 1 );
+ }
+
+ String jiraUrl = url.substring( 0, url.lastIndexOf( "/" ) );
+
+ if ( jiraUrl.endsWith( "secure" ) || jiraUrl.endsWith( "browse" ) )
+ {
+ jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( "/" ) );
+ }
+
+ urlMap.put( "url", jiraUrl );
+
+ urlMap.put( "id", id );
+
+ return urlMap;
+ }
+
+ /**
* Try to get a JIRA pid from the issue management URL.
*
* @param log Used to tell the user what happened