Merge pull request #4 from pupssman/proper-default-version

Read saved global config parameters properly
jenkinsci · Oct 23, 2014 · e036d66 · e036d66
2 parents acf9855 + 0e73a7b
commit e036d66
Showing 1 changed file with 9 additions and 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
@@ -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,12 +21,13 @@
 @Extension
 public class AllureReportPublisherDescriptor extends BuildStepDescriptor<Publisher> {
 
-    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);
+        load();
     }
 
     @Override
@@ -44,7 +49,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 +58,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) {