From 93ff32e4c8cfed279d49b98765b839272b04ef1d Mon Sep 17 00:00:00 2001 From: Vincent Barrier Date: Sat, 5 Aug 2017 22:26:42 +0200 Subject: [PATCH] change post url --- .../kagilum/plugins/icescrum/IceScrumBuildNotifier.java | 8 +++++--- .../com/kagilum/plugins/icescrum/IceScrumSession.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kagilum/plugins/icescrum/IceScrumBuildNotifier.java b/src/main/java/com/kagilum/plugins/icescrum/IceScrumBuildNotifier.java index f359463..c342760 100644 --- 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 index 540c6ff..ca4630c 100644 --- 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);