fix JENKINS-40964 update to latest config-file-provider

jenkinsci · Jan 21, 2017 · e266800 · imod · Feb 10, 2017 · davidvanlaatum
1 parent 60629e8
commit e266800
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -124,7 +124,9 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>config-file-provider</artifactId>
-            <version>2.7.1</version>
+            <version>2.15.4</version>
+            <!--<version>2.13</version>-->
+            <!--<version>2.7.1</version>-->
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -218,7 +220,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
-            <version>2.0.7</version>
+            <version>2.1.4</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/main/java/hudson/plugins/emailext/EmailExtTemplateAction.java b/src/main/java/hudson/plugins/emailext/EmailExtTemplateAction.java
@@ -81,7 +81,7 @@ private FormValidation checkForManagedFile(final String value) {
             Collection<ConfigProvider> providers = getTemplateConfigProviders();
             for(ConfigProvider provider : providers) {
                 for(Config c : provider.getAllConfigs()) {
-                    if(c.name.equalsIgnoreCase(value) && provider.isResponsibleFor(c.id)) {
+                    if(c.name.equalsIgnoreCase(value)) {
                         return FormValidation.ok();
                     }                    
                 }            

diff --git a/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java b/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java
@@ -1,14 +1,22 @@
 package hudson.plugins.emailext;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import jenkins.model.Jenkins;
 import org.jenkinsci.lib.configprovider.AbstractConfigProviderImpl;
+import org.jenkinsci.lib.configprovider.ConfigProvider;
 import org.jenkinsci.lib.configprovider.model.Config;
 import org.jenkinsci.lib.configprovider.model.ContentType;
 import org.kohsuke.stapler.DataBoundConstructor;
 
+import javax.annotation.Nonnull;
 
 public class GroovyTemplateConfig extends Config {
-
+    @Override
+    public ConfigProvider getDescriptor() {
+        return Jenkins.getActiveInstance().getDescriptorByType(GroovyTemplateConfigProvider.class);
+    }
+
     @DataBoundConstructor
     public GroovyTemplateConfig(String id, String name, String comment, String content) {
         super(id, name, comment, content);
@@ -17,10 +25,6 @@ public GroovyTemplateConfig(String id, String name, String comment, String conte
     @Extension(optional=true)
     public static final class GroovyTemplateConfigProvider extends AbstractConfigProviderImpl {
 
-        public GroovyTemplateConfigProvider() {
-            load();
-        }
-
         @Override
         public ContentType getContentType() {
             return ContentType.DefinedType.GROOVY;
@@ -31,15 +35,10 @@ public String getDisplayName() {
             return Messages.GroovyTemplateConfigProvider_DisplayName();
         }
 
+        @NonNull
         @Override
-        public Config newConfig() {
-            String id = getProviderId() + System.currentTimeMillis();
+        public Config newConfig(@Nonnull String id) {
             return new GroovyTemplateConfig(id, "Groovy Email Template", "", "");
         }
-
-        @Override
-        protected String getXmlFileName() {
-            return "email-ext-groovy-config-files.xml";
-        }
-    }    
+    }
 }
diff --git a/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java b/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java
@@ -1,13 +1,21 @@
 package hudson.plugins.emailext;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import jenkins.model.Jenkins;
 import org.jenkinsci.lib.configprovider.AbstractConfigProviderImpl;
+import org.jenkinsci.lib.configprovider.ConfigProvider;
 import org.jenkinsci.lib.configprovider.model.Config;
 import org.jenkinsci.lib.configprovider.model.ContentType;
 import org.kohsuke.stapler.DataBoundConstructor;
 
+import javax.annotation.Nonnull;
+
 public class JellyTemplateConfig extends Config {
-
+    @Override
+    public ConfigProvider getDescriptor() {
+        return Jenkins.getActiveInstance().getDescriptorByType(JellyTemplateConfigProvider.class);
+    }
     @DataBoundConstructor
     public JellyTemplateConfig(String id, String name, String comment, String content) {
         super(id, name, comment, content);
@@ -16,10 +24,6 @@ public JellyTemplateConfig(String id, String name, String comment, String conten
     @Extension(optional=true)
     public static final class JellyTemplateConfigProvider extends AbstractConfigProviderImpl {
 
-        public JellyTemplateConfigProvider() {
-            load();
-        }
-
         @Override
         public ContentType getContentType() {
             return ContentType.DefinedType.XML;
@@ -30,15 +34,10 @@ public String getDisplayName() {
             return Messages.JellyTemplateConfigProvider_DisplayName();
         }
 
+        @NonNull
         @Override
-        public Config newConfig() {
-            String id = getProviderId() + System.currentTimeMillis();
+        public Config newConfig(@Nonnull String id) {
             return new JellyTemplateConfig(id, "Jelly Email Template", "", "");
         }
-
-        @Override
-        protected String getXmlFileName() {
-            return "email-ext-jelly-config-files.xml";
-        }
     }    
 }
diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/AbstractEvalContent.java b/src/main/java/hudson/plugins/emailext/plugins/content/AbstractEvalContent.java
@@ -144,7 +144,7 @@ private InputStream getManagedFile(String fileName) throws UnsupportedEncodingEx
             ExtensionList<ConfigProvider> providers = ConfigProvider.all();
             ConfigProvider provider = providers.get(getProviderClass ());
             for (Config c : provider.getAllConfigs()) {
-                if (c.name.equalsIgnoreCase(fileName) && provider.isResponsibleFor(c.id)) {
+                if (c.name.equalsIgnoreCase(fileName)) {
                     config = c;
                     break;
                 }

diff --git a/src/test/java/hudson/plugins/emailext/EmailExtStepTest.java b/src/test/java/hudson/plugins/emailext/EmailExtStepTest.java
@@ -49,7 +49,6 @@ public void after() throws Exception {
     };
 
     @Test
-    @WithPlugin("config-file-provider.hpi")
     public void configRoundTrip() throws Exception {
         EmailExtStep step1 = new EmailExtStep("subject", "body");
         step1.setTo("mickeymouse@disney.com");

diff --git a/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java b/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java
@@ -1066,7 +1066,6 @@ public void testProjectDisable() throws Exception {
 
     @Test
     @Issue("JENKINS-15442")
-    @WithPlugin("config-file-provider.hpi")
     public void testConfiguredStateNoTriggers()
             throws Exception {
         FreeStyleProject prj = j.createFreeStyleProject("JENKINS-15442");