svn commit: r1206631 - in /maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker: PatchToIssueMojo.java patching/github/GitHubPatchRepository.java

[ol...@apache.org]

Author: olamy
Date: Sat Nov 26 22:52:17 2011
New Revision: 1206631

URL: http://svn.apache.org/viewvc?rev=1206631&view=rev
Log:
cleanup expressions and fields names

Modified:
    maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
    maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/patching/github/GitHubPatchRepository.java

Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java?rev=1206631&r1=1206630&r2=1206631&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/PatchToIssueMojo.java Sat Nov 26 22:52:17 2011
@@ -44,31 +44,31 @@ public class PatchToIssueMojo
     /**
      * for github user/organization  : github.com/apache use apache
      *
-     * @parameter expression="${patch.pullrequest.user}" default-value=""
+     * @parameter expression="${patch.request.organisation}" default-value=""
      */
-    protected String user;
+    protected String organisation;
 
     /**
      * github repo  : github.com/apache/maven-3 use maven-3
      *
-     * @parameter expression="${patch.pullrequest.repo}" default-value=""
+     * @parameter expression="${patch.request.repository}" default-value=""
      */
-    protected String repo;
+    protected String repository;
 
     /**
-     * pull request id
+     * for github: pull request id
      *
-     * @parameter expression="${patch.pullrequest.id}" default-value=""
+     * @parameter expression="${patch.request.id}" default-value=""
      */
-    protected String pullRequestId;
+    protected String id;
 
 
     /**
-     * github api url
+     * for github api url https://api.github.com
      *
-     * @parameter expression="${patch.pullrequest.githubApiUrl}" default-value="https://api.github.com/repos"
+     * @parameter expression="${patch.patchSystem.url}" default-value="${project.patchManagement.url}"
      */
-    protected String githubApiUrl;
+    protected String patchSystemUrl;
 
 
     DefaultHttpClient defaultHttpClient = new DefaultHttpClient();
@@ -76,12 +76,12 @@ public class PatchToIssueMojo
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        // format curl -v https://api.github.com/repos/apache/directmemory/pulls/1
+
         try
         {
             PatchRepositoryRequest patchRepositoryRequest =
-                new PatchRepositoryRequest().setUrl( githubApiUrl ).setRepository( repo ).setId(
-                    pullRequestId ).setOrganization( user );
+                new PatchRepositoryRequest().setUrl( patchSystemUrl ).setRepository( repository ).setId(
+                    id ).setOrganization( organisation );
 
             PatchRepository patchRepository = getPatchRepository();
 

Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/patching/github/GitHubPatchRepository.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/patching/github/GitHubPatchRepository.java?rev=1206631&r1=1206630&r2=1206631&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/patching/github/GitHubPatchRepository.java (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/patching/github/GitHubPatchRepository.java Sat Nov 26 22:52:17 2011
@@ -19,6 +19,7 @@ package org.apache.maven.plugins.patchtr
  */
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.HttpGet;
@@ -29,10 +30,8 @@ import org.apache.maven.plugins.patchtra
 import org.apache.maven.plugins.patchtracker.patching.PatchRepositoryRequest;
 import org.apache.maven.plugins.patchtracker.patching.PatchRepositoryResult;
 import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.Version;
 import org.codehaus.jackson.map.DeserializationConfig;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.module.SimpleModule;
 
 import java.io.IOException;
 
@@ -50,7 +49,14 @@ public class GitHubPatchRepository
     {
         try
         {
-            String url = patchRepositoryRequest.getUrl() + "/" + patchRepositoryRequest.getOrganization() + "/"
+            //curl -v https://api.github.com/repos/apache/directmemory/pulls/1
+            String baseUrl = patchRepositoryRequest.getUrl();
+            if ( StringUtils.isEmpty( baseUrl ) )
+            {
+                baseUrl = "https://api.github.com";
+                log.info( "github api url is empty use default:" + baseUrl );
+            }
+            String url = patchRepositoryRequest.getUrl() + "/repos/" + patchRepositoryRequest.getOrganization() + "/"
                 + patchRepositoryRequest.getRepository() + "/pulls/" + patchRepositoryRequest.getId();
             log.debug( "url" + url );