From dfefaf0fa7d8df1b0d08b6d56a4077fd32bfaff4 Mon Sep 17 00:00:00 2001 From: losiki Date: Fri, 19 Feb 2016 21:34:49 +0300 Subject: [PATCH 1/3] Compatiblity with pipeline [JENKINS-14553] - implement SimpleBuildStep --- pom.xml | 2 +- .../summary_report/ACIPluginBuildAction.java | 10 +++---- .../summary_report/ACIPluginPublisher.java | 28 +++++++++---------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 596b415..ebf1649 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 1.532.3 + 1.580.1 org.jenkins-ci.plugins diff --git a/src/main/java/hudson/plugins/summary_report/ACIPluginBuildAction.java b/src/main/java/hudson/plugins/summary_report/ACIPluginBuildAction.java index 1ca9d54..8a31dd6 100644 --- a/src/main/java/hudson/plugins/summary_report/ACIPluginBuildAction.java +++ b/src/main/java/hudson/plugins/summary_report/ACIPluginBuildAction.java @@ -24,7 +24,7 @@ package hudson.plugins.summary_report; import hudson.model.Action; -import hudson.model.AbstractBuild; +import hudson.model.Run; import hudson.plugins.summary_report.report.Report; import java.io.File; import java.io.IOException; @@ -51,7 +51,7 @@ public class ACIPluginBuildAction implements Action, * URL to access data. */ public static final String URL_NAME = "aciResult"; - private AbstractBuild build; + private Run build; private String result; private Report report; private ArrayList> fileError; @@ -74,7 +74,7 @@ public class ACIPluginBuildAction implements Action, * @throws IOException * Exception with I/Os */ - public ACIPluginBuildAction(final AbstractBuild build, + public ACIPluginBuildAction(final Run build, final ArrayList files) throws InterruptedException, ParserConfigurationException, SAXException, URISyntaxException, IOException { @@ -159,7 +159,7 @@ public String getResult() { /** * Get current build. */ - AbstractBuild getBuild() { + Run getBuild() { return this.build; } @@ -186,7 +186,7 @@ String getPreviousResult() { * Get Previous action. */ ACIPluginBuildAction getPreviousAction() { - AbstractBuild previousBuild = this.build.getPreviousBuild(); + Run previousBuild = this.build.getPreviousBuild(); if (previousBuild != null) { return previousBuild.getAction(ACIPluginBuildAction.class); } diff --git a/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java b/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java index 2894a65..724be0f 100644 --- a/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java +++ b/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java @@ -23,14 +23,17 @@ */ package hudson.plugins.summary_report; +import hudson.AbortException; +import hudson.FilePath; import hudson.Launcher; -import hudson.model.AbstractBuild; import hudson.model.AbstractProject; import hudson.model.Action; -import hudson.model.BuildListener; - +import hudson.model.Run; +import hudson.model.TaskListener; import hudson.tasks.BuildStepMonitor; import hudson.tasks.Recorder; +import jenkins.tasks.SimpleBuildStep; + import java.io.File; import java.io.IOException; @@ -48,7 +51,7 @@ * publishing data over build & project page. */ @SuppressWarnings("unchecked") -public class ACIPluginPublisher extends Recorder { +public class ACIPluginPublisher extends Recorder implements SimpleBuildStep { /* The list name of the files to parse */ private String name; @@ -119,12 +122,8 @@ public Action getProjectAction(final AbstractProject project) { * @throws InterruptedException * In case of interuption */ - @Override - public boolean perform( - final AbstractBuild build, - final Launcher launcher, - final BuildListener listener) - throws IOException, InterruptedException { + public void perform(Run build, FilePath workspacePath, Launcher launcher, TaskListener listener) + throws InterruptedException, IOException { /** * Define if we must parse multiple file by searching for ',' @@ -146,7 +145,7 @@ public boolean perform( .getIncludedFiles(); } catch (Exception ex) { listener.getLogger().println(ex.toString()); - return false; + throw new AbortException(ex.getMessage()); } for (int j = 0; j < tmpFiles.length; j++) { filesToParse.add(tmpFiles[j]); @@ -160,15 +159,14 @@ public boolean perform( build.addAction(buildAction); } catch (ParserConfigurationException ex) { listener.getLogger().println(ex.toString()); - return false; + throw new AbortException(ex.getMessage()); } catch (SAXException ex) { listener.getLogger().println(ex.toString()); - return false; + throw new AbortException(ex.getMessage()); } catch (URISyntaxException ex) { listener.getLogger().println(ex.toString()); - return false; + throw new AbortException(ex.getMessage()); } - return true; } /** From c21fec2ddbb31f6b520ff63a5bb8e59dad0b01d3 Mon Sep 17 00:00:00 2001 From: losiki Date: Fri, 19 Feb 2016 21:50:30 +0300 Subject: [PATCH 2/3] [JENKINS-33044] Comply to style rules - add/remove relevant javadoc --- .../hudson/plugins/summary_report/ACIPluginPublisher.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java b/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java index 724be0f..32f0b83 100644 --- a/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java +++ b/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java @@ -110,19 +110,19 @@ public Action getProjectAction(final AbstractProject project) { * Perform the publication. * @param build * Build on which to apply publication + * @param workspacePath + * Unused * @param launcher * Unused * @param listener * Unused - * @return boolean - * true if the publishing successfully complete - * true if the publishing could not complete * @throws IOException * In case of file IO mismatch * @throws InterruptedException * In case of interuption */ - public void perform(Run build, FilePath workspacePath, Launcher launcher, TaskListener listener) + public void perform(final Run build, final FilePath workspacePath, + final Launcher launcher, final TaskListener listener) throws InterruptedException, IOException { /** From b9c51add6ac0fe19a063cb4ae74caf0052dd30d7 Mon Sep 17 00:00:00 2001 From: losiki Date: Fri, 19 Feb 2016 22:04:35 +0300 Subject: [PATCH 3/3] [JENKINS-33044] Style compliance - removed trailing spaces --- .../hudson/plugins/summary_report/ACIPluginPublisher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java b/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java index 32f0b83..b818ecc 100644 --- a/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java +++ b/src/main/java/hudson/plugins/summary_report/ACIPluginPublisher.java @@ -110,7 +110,7 @@ public Action getProjectAction(final AbstractProject project) { * Perform the publication. * @param build * Build on which to apply publication - * @param workspacePath + * @param workspacePath * Unused * @param launcher * Unused @@ -121,7 +121,7 @@ public Action getProjectAction(final AbstractProject project) { * @throws InterruptedException * In case of interuption */ - public void perform(final Run build, final FilePath workspacePath, + public void perform(final Run build, final FilePath workspacePath, final Launcher launcher, final TaskListener listener) throws InterruptedException, IOException {