diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java index 016c1573c..4322779ae 100644 --- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java +++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java @@ -28,7 +28,6 @@ import edu.umd.cs.findbugs.annotations.NonNull; import hudson.AbortException; import hudson.Extension; -import hudson.Util; import hudson.model.Action; import hudson.model.Descriptor; import hudson.model.Failure; @@ -68,7 +67,6 @@ import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerRequest2; import org.kohsuke.stapler.interceptor.RequirePOST; @@ -149,25 +147,7 @@ public static class DescriptorImpl extends FlowDefinitionDescriptor { */ @Override public FlowDefinition newInstance(@NonNull StaplerRequest2 req, @NonNull JSONObject formData) throws FormException { - if (Util.isOverridden(FlowDefinitionDescriptor.class, getClass(), "newInstance", StaplerRequest.class, JSONObject.class)) { - return newInstance(StaplerRequest.fromStaplerRequest2(req), formData); - } else { - CpsFlowDefinition cpsFlowDefinition = (CpsFlowDefinition) super.newInstance(req, formData); - return newInstanceImpl(cpsFlowDefinition, req, formData); - } - } - - /** - * @deprecated use {@link #newInstance(StaplerRequest2, JSONObject)} - */ - @Deprecated - @Override - public FlowDefinition newInstance(@NonNull StaplerRequest req, @NonNull JSONObject formData) throws FormException { CpsFlowDefinition cpsFlowDefinition = (CpsFlowDefinition) super.newInstance(req, formData); - return newInstanceImpl(cpsFlowDefinition, StaplerRequest.toStaplerRequest2(req), formData); - } - - private FlowDefinition newInstanceImpl(CpsFlowDefinition cpsFlowDefinition, @NonNull StaplerRequest2 req, @NonNull JSONObject formData) { if (!cpsFlowDefinition.sandbox && formData.get("oldScript") != null) { String oldScript = formData.getString("oldScript"); boolean approveIfAdmin = !Objects.equals(oldScript, cpsFlowDefinition.script);