You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/11/21 17:35:30 UTC
svn commit: r1204578 - in
/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src:
main/java/org/apache/maven/plugins/patchtracker/tracking/jira/
test/java/org/apache/maven/plugins/patchtracker/tracking/jira/
Author: olamy
Date: Mon Nov 21 16:35:29 2011
New Revision: 1204578
URL: http://svn.apache.org/viewvc?rev=1204578&view=rev
Log:
take care of jira url with component id
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraSession.java
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/test/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTrackerTest.java
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java?rev=1204578&r1=1204577&r2=1204578&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTracker.java Mon Nov 21 16:35:29 2011
@@ -163,11 +163,15 @@ public class JiraPatchTracker
*/
protected String extractProjectKey( String url )
{
+ // case component id in url: https://jira.codehaus.org/browse/MSHARED/component/15255
+ if ( StringUtils.contains( url, "/component/" ) )
+ {
+ url = StringUtils.substringBeforeLast( url, "/component" );
+ }
+
return ( StringUtils.endsWith( url, "/" ) )
? StringUtils.substringAfterLast( StringUtils.removeEnd( url, "/" ), "/" )
: StringUtils.substringAfterLast( url, "/" );
-
-
}
/**
@@ -186,4 +190,15 @@ public class JiraPatchTracker
return new URL( extractBaseUrl( url ) );
}
+
+ protected String getComponentId( String url, String projectKey )
+ {
+ //https://jira.codehaus.org/browse/MSHARED/component/15255
+ // return 15255
+ if ( StringUtils.contains( url, "/" + projectKey + "/component/" ) )
+ {
+ return StringUtils.substringAfterLast( url, "/" + projectKey + "/component/" );
+ }
+ return null;
+ }
}
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraSession.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraSession.java?rev=1204578&r1=1204577&r2=1204578&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraSession.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraSession.java Mon Nov 21 16:35:29 2011
@@ -78,5 +78,7 @@ public class JiraSession
RemoteComment remoteComment = new RemoteComment();
remoteComment.setBody( comment );
service.addComment( token, issueKey, remoteComment );
+
+
}
}
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/test/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTrackerTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/test/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTrackerTest.java?rev=1204578&r1=1204577&r2=1204578&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/test/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTrackerTest.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/test/java/org/apache/maven/plugins/patchtracker/tracking/jira/JiraPatchTrackerTest.java Mon Nov 21 16:35:29 2011
@@ -31,6 +31,15 @@ public class JiraPatchTrackerTest
{
assertEquals( "MNG", new JiraPatchTracker().extractProjectKey( "http://jira.codehaus.org/browse/MNG" ) );
assertEquals( "MNG", new JiraPatchTracker().extractProjectKey( "http://jira.codehaus.org/browse/MNG/" ) );
+ assertEquals( "MSHARED", new JiraPatchTracker().extractProjectKey(
+ "https://jira.codehaus.org/browse/MSHARED/component/15255" ) );
+ }
+
+ public void testExtractComponentId()
+ {
+ assertEquals( "15255",
+ new JiraPatchTracker().getComponentId( "https://jira.codehaus.org/browse/MSHARED/component/15255",
+ "MSHARED" ) );
}
public void testBaseUrl()
@@ -39,5 +48,7 @@ public class JiraPatchTrackerTest
new JiraPatchTracker().extractBaseUrl( "http://jira.codehaus.org/browse/MNG" ) );
assertEquals( "http://jira.codehaus.org",
new JiraPatchTracker().extractBaseUrl( "http://jira.codehaus.org/browse/MNG/" ) );
+ assertEquals( "https://jira.codehaus.org", new JiraPatchTracker().extractBaseUrl(
+ "https://jira.codehaus.org/browse/MSHARED/component/15255" ) );
}
}