[JENKINS-42877] Use class instead of interface for common Jelly files.

jenkinsci · Apr 20, 2017 · 5f2811c · 5f2811c
1 parent 199b408
commit 5f2811c
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 13 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/ConfigFilesManagement.java b/src/main/java/org/jenkinsci/plugins/configfiles/ConfigFilesManagement.java
@@ -99,7 +99,7 @@ public String getIconUrl(String rootUrl) {
      */
     @Restricted(NoExternalUse.class)
     public Class getJellyFilesClass() {
-        return ConfigFilesUIContract.class;
+        return ConfigFilesUI.class;
     }
 
     /**
@@ -156,7 +156,7 @@ public void doShow(StaplerRequest req, StaplerResponse rsp, @QueryParameter("id"
         Config config = store.getById(confgiId);
         req.setAttribute("contentType", config.getProvider().getContentType());
         req.setAttribute("config", config);
-        req.getView(ConfigFilesUIContract.class, "show.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "show.jelly").forward(req, rsp);
 
     }
 
@@ -179,7 +179,7 @@ public void doEditConfig(StaplerRequest req, StaplerResponse rsp, @QueryParamete
         req.setAttribute("contentType", config.getProvider().getContentType());
         req.setAttribute("config", config);
         req.setAttribute("provider", config.getProvider());
-        req.getView(ConfigFilesUIContract.class, "edit.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "edit.jelly").forward(req, rsp);
     }
 
     /**
@@ -209,7 +209,7 @@ public void doAddConfig(StaplerRequest req, StaplerResponse rsp, @QueryParameter
             checkPermission(Hudson.ADMINISTER);
             req.setAttribute("providers", ConfigProvider.all());
             req.setAttribute("configId", configId);
-            req.getView(ConfigFilesUIContract.class, "selectprovider.jelly").forward(req, rsp);
+            req.getView(ConfigFilesUI.class, "selectprovider.jelly").forward(req, rsp);
             return;
         }
 
@@ -229,14 +229,14 @@ public void doAddConfig(StaplerRequest req, StaplerResponse rsp, @QueryParameter
         config.setProviderId(provider.getProviderId());
         req.setAttribute("config", config);
 
-        req.getView(ConfigFilesUIContract.class, "edit.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "edit.jelly").forward(req, rsp);
     }
 
     public void doSelectProvider(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
         checkPermission(Hudson.ADMINISTER);
         req.setAttribute("providers", ConfigProvider.all());
         req.setAttribute("configId", UUID.randomUUID().toString());
-        req.getView(ConfigFilesUIContract.class, "selectprovider.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "selectprovider.jelly").forward(req, rsp);
     }
 
     private void checkPermission(Permission permission) {

diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/ConfigFilesUI.java b/src/main/java/org/jenkinsci/plugins/configfiles/ConfigFilesUI.java
@@ -0,0 +1,8 @@
+package org.jenkinsci.plugins.configfiles;
+
+/**
+ * Blank class just to define a common place where to serve the views for Config Files
+ *
+ */
+public class ConfigFilesUI {
+}
diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileAction.java b/src/main/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileAction.java
@@ -4,7 +4,6 @@
 import hudson.Extension;
 import hudson.Util;
 import hudson.model.Action;
-import hudson.model.Hudson;
 import hudson.model.Job;
 import hudson.security.Permission;
 import hudson.util.FormValidation;
@@ -17,6 +16,7 @@
 import org.jenkinsci.plugins.configfiles.ConfigFilesManagement;
 import org.jenkinsci.plugins.configfiles.ConfigFilesUIContract;
 import org.jenkinsci.plugins.configfiles.Messages;
+import org.jenkinsci.plugins.configfiles.ConfigFilesUI;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.*;
@@ -58,7 +58,7 @@ public String getIconUrl(String rootUrl) {
      */
     @Restricted(NoExternalUse.class)
     public Class getJellyFilesClass() {
-        return ConfigFilesUIContract.class;
+        return ConfigFilesUI.class;
     }
 
     @Override
@@ -136,7 +136,7 @@ public void doShow(StaplerRequest req, StaplerResponse rsp, @QueryParameter("id"
         Config config = getStore().getById(confgiId);
         req.setAttribute("contentType", config.getProvider().getContentType());
         req.setAttribute("config", config);
-        req.getView(ConfigFilesUIContract.class, "show.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "show.jelly").forward(req, rsp);
     }
 
     @Override
@@ -146,7 +146,7 @@ public void doEditConfig(StaplerRequest req, StaplerResponse rsp, @QueryParamete
         req.setAttribute("contentType", config.getProvider().getContentType());
         req.setAttribute("config", config);
         req.setAttribute("provider", config.getProvider());
-        req.getView(ConfigFilesUIContract.class, "edit.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "edit.jelly").forward(req, rsp);
     }
 
 
@@ -166,7 +166,7 @@ public void doAddConfig(StaplerRequest req, StaplerResponse rsp, @QueryParameter
             checkPermission(Job.CONFIGURE);
             req.setAttribute("providers", getProviders());
             req.setAttribute("configId", configId);
-            req.getView(ConfigFilesUIContract.class, "selectprovider.jelly").forward(req, rsp);
+            req.getView(ConfigFilesUI.class, "selectprovider.jelly").forward(req, rsp);
             return;
         }
 
@@ -186,15 +186,15 @@ public void doAddConfig(StaplerRequest req, StaplerResponse rsp, @QueryParameter
         config.setProviderId(provider.getProviderId());
         req.setAttribute("config", config);
 
-        req.getView(ConfigFilesUIContract.class, "edit.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "edit.jelly").forward(req, rsp);
     }
 
     @Override
     public void doSelectProvider(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {;
             checkPermission(Job.CONFIGURE);
         req.setAttribute("providers", getProviders());
         req.setAttribute("configId", UUID.randomUUID().toString());
-        req.getView(ConfigFilesUIContract.class, "selectprovider.jelly").forward(req, rsp);
+        req.getView(ConfigFilesUI.class, "selectprovider.jelly").forward(req, rsp);
     }
 
     @Override

diff --git a/...s/ConfigFilesUIContract/configfiles.jelly → ...nfigfiles/ConfigFilesUI/configfiles.jelly b/...s/ConfigFilesUIContract/configfiles.jelly → ...nfigfiles/ConfigFilesUI/configfiles.jelly
diff --git a/...figFilesUIContract/configfiles.properties → ...iles/ConfigFilesUI/configfiles.properties b/...figFilesUIContract/configfiles.properties → ...iles/ConfigFilesUI/configfiles.properties
diff --git a/...FilesUIContract/configfiles_fr.properties → ...s/ConfigFilesUI/configfiles_fr.properties b/...FilesUIContract/configfiles_fr.properties → ...s/ConfigFilesUI/configfiles_fr.properties
diff --git a/...s/ConfigFilesUIContract/edit-config.jelly → ...nfigfiles/ConfigFilesUI/edit-config.jelly b/...s/ConfigFilesUIContract/edit-config.jelly → ...nfigfiles/ConfigFilesUI/edit-config.jelly
diff --git a/...figfiles/ConfigFilesUIContract/edit.jelly → ...gins/configfiles/ConfigFilesUI/edit.jelly b/...figfiles/ConfigFilesUIContract/edit.jelly → ...gins/configfiles/ConfigFilesUI/edit.jelly
diff --git a/.../ConfigFilesUIContract/edit_fr.properties → ...figfiles/ConfigFilesUI/edit_fr.properties b/.../ConfigFilesUIContract/edit_fr.properties → ...figfiles/ConfigFilesUI/edit_fr.properties
diff --git a/...igfiles/ConfigFilesUIContract/index.jelly → ...ins/configfiles/ConfigFilesUI/index.jelly b/...igfiles/ConfigFilesUIContract/index.jelly → ...ins/configfiles/ConfigFilesUI/index.jelly
diff --git a/...onfigFilesUIContract/selectprovider.jelly → ...gfiles/ConfigFilesUI/selectprovider.jelly b/...onfigFilesUIContract/selectprovider.jelly → ...gfiles/ConfigFilesUI/selectprovider.jelly
diff --git a/...FilesUIContract/selectprovider.properties → ...s/ConfigFilesUI/selectprovider.properties b/...FilesUIContract/selectprovider.properties → ...s/ConfigFilesUI/selectprovider.properties
diff --git a/...s/ConfigFilesUIContract/show-config.jelly → ...nfigfiles/ConfigFilesUI/show-config.jelly b/...s/ConfigFilesUIContract/show-config.jelly → ...nfigfiles/ConfigFilesUI/show-config.jelly
diff --git a/...figfiles/ConfigFilesUIContract/show.jelly → ...gins/configfiles/ConfigFilesUI/show.jelly b/...figfiles/ConfigFilesUIContract/show.jelly → ...gins/configfiles/ConfigFilesUI/show.jelly
diff --git a/...igFilesUIContract/sidepanel_fr.properties → ...les/ConfigFilesUI/sidepanel_fr.properties b/...igFilesUIContract/sidepanel_fr.properties → ...les/ConfigFilesUI/sidepanel_fr.properties