From 1aa8302dc2c3cfee9d987d52bb1ba8efab2c561e Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 28 Jul 2008 03:51:51 +0000 Subject: [PATCH] structured form functionality is moved to stapler. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@11043 71c3de6d-444a-0410-be80-ed276b4c234a --- core/pom.xml | 8 +----- core/src/main/java/hudson/StructuredForm.java | 27 +++++-------------- .../java/hudson/matrix/MatrixProject.java | 3 +-- .../main/java/hudson/maven/MavenModule.java | 3 +-- .../java/hudson/maven/MavenModuleSet.java | 2 +- .../java/hudson/model/AbstractProject.java | 3 +-- core/src/main/java/hudson/model/Hudson.java | 4 +-- core/src/main/java/hudson/model/Job.java | 5 ++-- .../model/ParametersDefinitionProperty.java | 4 +-- core/src/main/java/hudson/model/Project.java | 3 +-- core/src/main/java/hudson/model/User.java | 3 +-- core/src/main/java/hudson/scm/SCMS.java | 3 +-- core/src/main/java/hudson/tasks/Ant.java | 3 +-- core/src/main/java/hudson/tasks/Maven.java | 3 +-- 14 files changed, 22 insertions(+), 52 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 9ce3f6ab02..6ce5c0adc4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -291,7 +291,7 @@ org.kohsuke.stapler stapler - 1.79 + 1.80 @@ -480,12 +480,6 @@ txw2 20070624 - - org.kohsuke.stapler - json-lib - 2.1 - jdk15 - commons-collections commons-collections diff --git a/core/src/main/java/hudson/StructuredForm.java b/core/src/main/java/hudson/StructuredForm.java index a21fd8ca38..ecb5861b4e 100644 --- a/core/src/main/java/hudson/StructuredForm.java +++ b/core/src/main/java/hudson/StructuredForm.java @@ -18,27 +18,14 @@ import java.util.Collections; * @author Kohsuke Kawaguchi */ public class StructuredForm { - public static JSONObject get(StaplerRequest req) { - JSONObject o = (JSONObject)req.getAttribute(StructuredForm.class.getName()); - if(o==null) { - String p = req.getParameter("json"); - if(p==null) { - // no data submitted - try { - StaplerResponse rsp = Stapler.getCurrentResponse(); - rsp.sendError(SC_BAD_REQUEST,"This page expects a form submission"); - rsp.getWriter().close(); - throw new Error("This page expects a form submission"); - } catch (IOException e) { - throw new Error(e); - } - } - o = JSONObject.fromObject(p); - req.setAttribute(StructuredForm.class.getName(),o); - } - return o; - } + /** + * @deprecated + * Use {@link StaplerRequest#getSubmittedForm()}. Since 1.238. + */ + public static JSONObject get(StaplerRequest req) { + return req.getSubmittedForm(); + } /** * Retrieves the property of the given object and returns it as a list of {@link JSONObject}. * diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index 25b3a1e92b..ce0fdd2a8e 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -2,7 +2,6 @@ package hudson.matrix; import hudson.CopyOnWrite; import hudson.FilePath; -import hudson.StructuredForm; import hudson.XmlFile; import hudson.model.AbstractProject; import hudson.model.Action; @@ -446,7 +445,7 @@ public class MatrixProject extends AbstractProject im newAxes.add(Axis.parsePrefixed(req,"label")); this.axes = newAxes; - JSONObject json = StructuredForm.get(req); + JSONObject json = req.getSubmittedForm(); buildWrappers.rebuild(req, json, BuildWrappers.getFor(this), "wrapper"); builders.rebuildHetero(req, json, BuildStep.BUILDERS, "builder"); diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/core/src/main/java/hudson/maven/MavenModule.java index 32f7a0b4fc..e2860d9edd 100644 --- a/core/src/main/java/hudson/maven/MavenModule.java +++ b/core/src/main/java/hudson/maven/MavenModule.java @@ -2,7 +2,6 @@ package hudson.maven; import hudson.CopyOnWrite; import hudson.FilePath; -import hudson.StructuredForm; import hudson.Util; import hudson.Functions; import hudson.maven.reporters.MavenMailer; @@ -391,7 +390,7 @@ public final class MavenModule extends AbstractMavenProject,R extends A protected final > List buildDescribable(StaplerRequest req, List> descriptors, String prefix) throws FormException { - JSONObject data = StructuredForm.get(req); + JSONObject data = req.getSubmittedForm(); List r = new Vector(); for( int i=0; i< descriptors.size(); i++ ) { String name = prefix + i; diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 7141524fe1..49484ff397 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -1478,7 +1478,7 @@ public final class Hudson extends View implements ItemGroup, Node, req.setCharacterEncoding("UTF-8"); - JSONObject json = StructuredForm.get(req); + JSONObject json = req.getSubmittedForm(); // keep using 'useSecurity' field as the main configuration setting // until we get the new security implementation working @@ -1580,7 +1580,7 @@ public final class Hudson extends View implements ItemGroup, Node, public synchronized void doConfigExecutorsSubmit( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { checkPermission(ADMINISTER); - JSONObject json = StructuredForm.get(req); + JSONObject json = req.getSubmittedForm(); numExecutors = Integer.parseInt(req.getParameter("numExecutors")); if(req.hasParameter("master.mode")) diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index fdafcc5b6d..c9288718f4 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -2,7 +2,6 @@ package hudson.model; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import hudson.ExtensionPoint; -import hudson.StructuredForm; import hudson.Util; import hudson.XmlFile; import hudson.model.Descriptor.FormException; @@ -813,7 +812,7 @@ public abstract class Job, RunT extends Run, RunT extends Run,B extends Build> super.submit(req,rsp); req.setCharacterEncoding("UTF-8"); - JSONObject json = StructuredForm.get(req); + JSONObject json = req.getSubmittedForm(); buildWrappers.rebuild(req,json, BuildWrappers.getFor(this), "wrapper"); builders.rebuildHetero(req,json, BuildStep.BUILDERS, "builder"); diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index d005c86674..bdce607e17 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -3,7 +3,6 @@ package hudson.model; import com.thoughtworks.xstream.XStream; import hudson.CopyOnWrite; import hudson.FeedAdapter; -import hudson.StructuredForm; import hudson.Util; import hudson.XmlFile; import hudson.model.Descriptor.FormException; @@ -386,7 +385,7 @@ public class User extends AbstractModelObject implements AccessControlled { fullName = req.getParameter("fullName"); description = req.getParameter("description"); - JSONObject json = StructuredForm.get(req); + JSONObject json = req.getSubmittedForm(); List props = new ArrayList(); int i=0; diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java index 26dcad219a..1d58c4f031 100644 --- a/core/src/main/java/hudson/scm/SCMS.java +++ b/core/src/main/java/hudson/scm/SCMS.java @@ -2,7 +2,6 @@ package hudson.scm; import hudson.model.Descriptor; import hudson.model.Descriptor.FormException; -import hudson.StructuredForm; import java.util.List; @@ -34,6 +33,6 @@ public class SCMS { int scmidx = Integer.parseInt(scm); SCMDescriptor d = SCMS.get(scmidx); d.generation++; - return d.newInstance(req,StructuredForm.get(req).getJSONObject("scm")); + return d.newInstance(req, req.getSubmittedForm().getJSONObject("scm")); } } diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index f792255d7e..4047e49828 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -2,7 +2,6 @@ package hudson.tasks; import hudson.CopyOnWrite; import hudson.Launcher; -import hudson.StructuredForm; import hudson.Util; import hudson.FilePath; import hudson.EnvVars; @@ -263,7 +262,7 @@ public class Ant extends Builder { public boolean configure(StaplerRequest req) { installations = req.bindJSONToList( - AntInstallation.class,StructuredForm.get(req).get("ant")).toArray(new AntInstallation[0]); + AntInstallation.class, req.getSubmittedForm().get("ant")).toArray(new AntInstallation[0]); save(); return true; } diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index b4bd568bd4..88f448ae68 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -7,7 +7,6 @@ import hudson.Launcher; import hudson.Launcher.LocalLauncher; import hudson.Util; import hudson.EnvVars; -import hudson.StructuredForm; import hudson.maven.MavenEmbedder; import hudson.maven.MavenUtil; import hudson.maven.RedeployPublisher; @@ -227,7 +226,7 @@ public class Maven extends Builder { } public boolean configure(StaplerRequest req) { - this.installations = req.bindJSONToList(MavenInstallation.class,StructuredForm.get(req).get("maven")) + this.installations = req.bindJSONToList(MavenInstallation.class, req.getSubmittedForm().get("maven")) .toArray(new MavenInstallation[0]); save(); return true;