Skip to content

Prevent NPE when createValue returns null #88

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
res0nance merged 1 commit into from
Dec 25, 2020
Merged

Prevent NPE when createValue returns null #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
package org.jenkinsci.plugins.parameterizedscheduler;

import com.google.common.base.Splitter;
import hudson.model.ParametersDefinitionProperty;
import org.apache.commons.lang.StringUtils;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import org.apache.commons.lang.StringUtils;
import org.jenkinsci.plugins.parameterizedscheduler.Messages;

import com.google.common.base.Splitter;

public class ParameterParser {
/**
* if ever changed, documentation and messages will need to be updated as well
Expand Down
18 changes: 11 additions & 7 deletions src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedTimerTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.jenkinsci.plugins.parameterizedscheduler;

import antlr.ANTLRException;
import hudson.model.AbstractProject;
import hudson.model.Cause;
import hudson.model.CauseAction;
Expand All @@ -10,6 +11,8 @@
import hudson.model.ParametersDefinitionProperty;
import hudson.scheduler.Hash;
import hudson.triggers.Trigger;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.kohsuke.stapler.DataBoundConstructor;

import java.util.ArrayList;
import java.util.Calendar;
Expand All @@ -18,11 +21,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.kohsuke.stapler.DataBoundConstructor;

import antlr.ANTLRException;

/**
* {@link Trigger} that runs a job periodically with support for parameters.
*
Expand Down Expand Up @@ -64,9 +62,15 @@ private List<ParameterValue> configurePropertyValues(Map<String, String> paramet
if (parameterValues.containsKey(paramDefinition.getName())) {
ParameterizedStaplerRequest request = new ParameterizedStaplerRequest(
parameterValues.get(paramDefinition.getName()));
defValues.add(paramDefinition.createValue(request));
} else if (defaultValue != null)
ParameterValue value = paramDefinition.createValue(request);
if (value!= null) {
defValues.add(value);
} else {
LOGGER.warning("Cannot create value for " + paramDefinition.getName());
}
} else if (defaultValue != null) {
defValues.add(defaultValue);
}
}

return defValues;
Expand Down
43 changes: 43 additions & 0 deletions src/test/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedSchedulerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@

import hudson.model.FreeStyleProject;
import hudson.model.Job;
import hudson.model.ParameterDefinition;
import hudson.model.ParameterValue;
import hudson.model.ParametersAction;
import hudson.model.ParametersDefinitionProperty;
import hudson.model.StringParameterDefinition;
import hudson.triggers.Trigger;
import net.sf.json.JSONObject;
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.kohsuke.stapler.StaplerRequest;

import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
Expand Down Expand Up @@ -97,4 +105,39 @@ public void declarative() throws Exception {
assertThat(p.getLastCompletedBuild(), is(not(wfr)));
assertThat((String) p.getLastCompletedBuild().getAction(ParametersAction.class).getParameter("foo").getValue(), is("bar"));
}

@Test
@Issue("JENKINS-49372")
public void nullValueCreated() throws Exception {
FreeStyleProject p = r.createFreeStyleProject();
p.addProperty(new ParametersDefinitionProperty(new NullParameterDefinition("foo")));
assertThat(p.getLastCompletedBuild(), is(nullValue()));
Trigger<Job> t = new ParameterizedTimerTrigger("* * * * *%foo=test");
t.start(p, true);
p.addTrigger(t);
new Cron().doRun();
assertThat(p.isInQueue(), is(true));
r.waitUntilNoActivity();
// Build should complete successfully but will not have any value
assertThat(p.getLastCompletedBuild(), is(notNullValue()));
}

private static class NullParameterDefinition extends ParameterDefinition {

public NullParameterDefinition(@Nonnull String name) {
super(name, null);
}

@CheckForNull
@Override
public ParameterValue createValue(StaplerRequest staplerRequest, JSONObject jsonObject) {
return null;
}

@CheckForNull
@Override
public ParameterValue createValue(StaplerRequest staplerRequest) {
return null;
}
}
}