Skip to content

Reduce EE 8 compatibility layer: delete old CpsFlowDefinition.DescriptorImpl.newInstance overload #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Reduce EE 8 compatibility layer: delete old CpsFlowDefinition.DescriptorImpl.newInstance overload #1000

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03d198c
Reduce EE 8 compatibility layer
basil Mar 21, 2025
9377b58
Merge branch 'master' into jakarta-slim
jglick Sep 23, 2025
98188e4
Backwards resolution
jglick Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
Loading