change post url

jenkinsci · Aug 5, 2017 · 93ff32e · 93ff32e
1 parent 0a93497
commit 93ff32e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/kagilum/plugins/icescrum/IceScrumBuildNotifier.java b/src/main/java/com/kagilum/plugins/icescrum/IceScrumBuildNotifier.java
@@ -56,7 +56,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         }
 
         IceScrumSession session = new IceScrumSession(p.getSettings());
-        JSONObject jsonRoot = createIceScrumBuildObject(build, listener, IceScrumSession.TASK_PATTERN);
+        JSONObject jsonRoot = createIceScrumBuildObject(build, listener, IceScrumSession.TASK_PATTERN, !p.getSettings().isTokenAuth());
 
         if (session.sendBuildStatut(jsonRoot)) {
             listener.getLogger().println(Messages.IceScrumBuildNotifier_icescrum_build_success()+p.getSettings().getProjectUrl()+")");
@@ -66,7 +66,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         return true;
     }
 
-    public JSONObject createIceScrumBuildObject(AbstractBuild<?, ?> build, BuildListener listener, String pattern){
+    public JSONObject createIceScrumBuildObject(AbstractBuild<?, ?> build, BuildListener listener, String pattern, boolean includeBuiltOn){
         Hudson instance =  Hudson.getInstance();
         String url = instance != null ? instance.getRootUrl() : "";
         String jobUrl = url != null ? url+"job/"+build.getProject().getName()+"/" : "";
@@ -75,7 +75,9 @@ public JSONObject createIceScrumBuildObject(AbstractBuild<?, ?> build, BuildList
         JSONObject jsonBuild = new JSONObject();
 
         jsonBuild.element("jobName",build.getProject().getDisplayName());
-        jsonBuild.element("builtOn", "Jenkins: "+build.getHudsonVersion());
+        if(includeBuiltOn){
+            jsonBuild.element("builtOn", "Jenkins: "+build.getHudsonVersion());
+        }
         jsonBuild.element("name",build.getDisplayName());
         jsonBuild.element("number",build.getNumber());
         jsonBuild.element("date", build.getTimeInMillis());

diff --git a/src/main/java/com/kagilum/plugins/icescrum/IceScrumSession.java b/src/main/java/com/kagilum/plugins/icescrum/IceScrumSession.java
@@ -92,7 +92,7 @@ public boolean isConnect() {
     }
 
     public boolean sendBuildStatut(JSONObject build) throws UnsupportedEncodingException {
-        PostMethod method = new PostMethod(settings.getUrl() + settings.getPath() + settings.getPkey() + "/build");
+        PostMethod method = new PostMethod(settings.getUrl() + settings.getPath() + settings.getPkey() + "/" + (settings.isTokenAuth() ? "jenkins" : "build"));
         StringRequestEntity requestEntity = new StringRequestEntity(build.toString(),"application/json","UTF-8");
         method.setRequestEntity(requestEntity);
         return executeMethod(method, HttpStatus.SC_CREATED);