Skip to content

Clarify NPE when resolveScm omits targets #577

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

Merged
jglick merged 2 commits into from
Jul 24, 2026
+23 −0
Merged

Clarify NPE when resolveScm omits targets #577

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4bd9fe
Clarify NPE when resolveScm omits targets
Chikzz2001 Jul 24, 2026
6e35cff
Test omitted resolveScm targets via Pipeline FAILURE
Chikzz2001 Jul 24, 2026
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
5 changes: 5 additions & 0 deletions src/main/java/org/jenkinsci/plugins/workflow/multibranch/ResolveScmStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import jenkins.scm.api.SCMHead;
import jenkins.scm.api.SCMHeadObserver;
Expand Down Expand Up @@ -90,6 +91,10 @@ public class ResolveScmStep extends Step {
@DataBoundConstructor
public ResolveScmStep(@NonNull SCMSource source, @NonNull List<String> targets) {
this.source = source;
// JENKINS-67005: Pipeline passes null when targets is omitted from the step call.
Objects.requireNonNull(
targets,
"targets is required; provide candidate branch names, e.g. targets: [env.BRANCH_NAME, 'main']");
this.targets = new ArrayList<>(targets);
}

Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/jenkinsci/plugins/workflow/multibranch/ResolveScmStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
package org.jenkinsci.plugins.workflow.multibranch;

import hudson.model.TopLevelItem;
import java.util.Collections;
import jenkins.scm.impl.mock.MockSCMController;
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
Expand All @@ -34,6 +35,10 @@
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.fail;

public class ResolveScmStepTest {

@ClassRule
Expand Down Expand Up @@ -121,4 +126,16 @@ public void given_nonExistingHeadName_when_invokedWithDefault_then_defaultReturn
j.buildAndAssertSuccess(job);
}
}

@Test
Comment thread
Chikzz2001 marked this conversation as resolved.
public void constructorRejectsNullTargetsWithClearMessage() {
try {
new ResolveScmStep(null, null);
fail("expected NullPointerException");
} catch (NullPointerException e) {
assertThat(e.getMessage(), containsString("targets is required"));
}
new ResolveScmStep(null, Collections.emptyList());
}

}
Loading