From 0639714704d049a89ea337076ea8f72b2d73eaf9 Mon Sep 17 00:00:00 2001 From: pupssman Date: Thu, 23 Oct 2014 14:34:39 +0400 Subject: [PATCH 1/2] Dont override stored parameters with defaults --- .../jenkins/AllureReportPublisherDescriptor.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java b/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java index a2df8d2f..a3d0f43a 100644 --- a/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java +++ b/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java @@ -1,13 +1,17 @@ package ru.yandex.qatools.allure.jenkins; +import com.google.common.base.Objects; import com.google.common.base.Strings; + import hudson.Extension; import hudson.model.AbstractProject; import hudson.tasks.BuildStepDescriptor; import hudson.tasks.Publisher; import hudson.util.FormValidation; + import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; + import ru.yandex.qatools.allure.jenkins.config.ReportBuildPolicy; /** @@ -17,9 +21,9 @@ @Extension public class AllureReportPublisherDescriptor extends BuildStepDescriptor { - private String reportVersionDefault = AllureReportPlugin.DEFAULT_REPORT_VERSION; + private String reportVersionDefault; - private String resultsPatternDefault = AllureReportPlugin.DEFAULT_RESULTS_PATTERN; + private String resultsPatternDefault; public AllureReportPublisherDescriptor() { super(AllureReportPublisher.class); @@ -44,7 +48,7 @@ public ReportBuildPolicy[] getReportBuildPolicies() { @SuppressWarnings("unused") public String getResultsPatternDefault() { - return resultsPatternDefault; + return Objects.firstNonNull(resultsPatternDefault, AllureReportPlugin.DEFAULT_RESULTS_PATTERN); } public void setResultsPatternDefault(String reportGlobDefault) { @@ -53,7 +57,7 @@ public void setResultsPatternDefault(String reportGlobDefault) { @SuppressWarnings("unused") public String getReportVersionDefault() { - return reportVersionDefault; + return Objects.firstNonNull(reportVersionDefault, AllureReportPlugin.DEFAULT_REPORT_VERSION); } public void setReportVersionDefault(String reportVersionDefault) { From 0e73a7b76db675a467a206739af27b5e4859daa7 Mon Sep 17 00:00:00 2001 From: pupssman Date: Thu, 23 Oct 2014 14:47:11 +0400 Subject: [PATCH 2/2] call load() to actuall get those data back --- .../qatools/allure/jenkins/AllureReportPublisherDescriptor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java b/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java index a3d0f43a..273a5496 100644 --- a/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java +++ b/src/main/java/ru/yandex/qatools/allure/jenkins/AllureReportPublisherDescriptor.java @@ -27,6 +27,7 @@ public class AllureReportPublisherDescriptor extends BuildStepDescriptor