JENKINS-31843 - Merge build parameter values when "Build is parameterized" #34
+174
−6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package com.sonyericsson.rebuild.matchers; | ||
|
|
||
| import hudson.model.ParameterValue; | ||
| import org.hamcrest.Description; | ||
| import org.junit.internal.matchers.TypeSafeMatcher; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public final class IsCollectionContainingStringParameterValues extends TypeSafeMatcher<Collection<ParameterValue>> { | ||
|
|
||
|
||
| private final List<StringParameterValueMatcher> matchers; | ||
|
|
||
| public static IsCollectionContainingStringParameterValues hasStringParamValues(StringParameterValueMatcher... items) { | ||
| return new IsCollectionContainingStringParameterValues(items); | ||
| } | ||
|
|
||
| IsCollectionContainingStringParameterValues(StringParameterValueMatcher... items) { | ||
| this.matchers = new ArrayList<StringParameterValueMatcher>(items.length); | ||
| for (StringParameterValueMatcher matcher : items) { | ||
| matchers.add(matcher); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean matchesSafely(Collection<ParameterValue> items) { | ||
|
||
| Map<StringParameterValueMatcher, Boolean> resultMap = new HashMap<StringParameterValueMatcher, Boolean>(); | ||
| for (StringParameterValueMatcher stringParameterValueMatcher : matchers) { | ||
| resultMap.put(stringParameterValueMatcher, false); | ||
| for (ParameterValue item : items) { | ||
| if (stringParameterValueMatcher.matches(item)) { | ||
| resultMap.replace(stringParameterValueMatcher, true); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| return !resultMap.values().contains(false); | ||
| } | ||
|
|
||
| @Override | ||
| public void describeTo(Description description) { | ||
| description.appendList("<[", ", ", "]>", matchers); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package com.sonyericsson.rebuild.matchers; | ||
|
|
||
| import hudson.model.ParameterValue; | ||
| import org.hamcrest.Description; | ||
| import org.junit.internal.matchers.TypeSafeMatcher; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| public final class IsNotCollectionContainingStringParameterValues extends TypeSafeMatcher<Collection<ParameterValue>> { | ||
|
||
|
|
||
| private final IsCollectionContainingStringParameterValues delegate; | ||
|
|
||
| public static IsNotCollectionContainingStringParameterValues hasNoStringParamValues(StringParameterValueMatcher... items) { | ||
| return new IsNotCollectionContainingStringParameterValues(items); | ||
| } | ||
|
|
||
| private IsNotCollectionContainingStringParameterValues(StringParameterValueMatcher... items) { | ||
| delegate = new IsCollectionContainingStringParameterValues(items); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean matchesSafely(Collection<ParameterValue> items) { | ||
| return !delegate.matchesSafely(items); | ||
| } | ||
|
|
||
| @Override | ||
| public void describeTo(Description description) { | ||
| delegate.describeTo(description); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package com.sonyericsson.rebuild.matchers; | ||
|
|
||
| import hudson.model.StringParameterValue; | ||
| import org.hamcrest.BaseMatcher; | ||
| import org.hamcrest.Description; | ||
|
|
||
| public final class StringParameterValueMatcher extends BaseMatcher<StringParameterValue> { | ||
|
|
||
| private final StringParameterValue thisParameterValue; | ||
|
|
||
| StringParameterValueMatcher(StringParameterValue thisParameterValue) { | ||
| this.thisParameterValue = thisParameterValue; | ||
| } | ||
|
|
||
| public static StringParameterValueMatcher equalToStringParamValue(String name, String value) { | ||
| return new StringParameterValueMatcher(new StringParameterValue(name, value)); | ||
|
||
| } | ||
|
|
||
| @Override | ||
| public boolean matches(Object parameterValue) { | ||
|
||
| return parameterValue instanceof StringParameterValue | ||
| && thisParameterValue.getName().equals(((StringParameterValue)parameterValue).getName()) | ||
| && thisParameterValue.value.equals(((StringParameterValue)parameterValue).value); | ||
| } | ||
|
|
||
| @Override | ||
| public void describeTo(Description description) { | ||
| description.appendText(thisParameterValue.toString()); | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should check for null before accessing
paramActionThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@amuniz Added the null check to be safe but struggling to see how 'paramAction' would be null at this stage based on - https://github.com/jenkinsci/rebuild-plugin/blob/master/src/main/java/com/sonyericsson/rebuild/RebuildAction.java#L206
The lack of null checks in the existing code seems to echo this - https://github.com/jenkinsci/rebuild-plugin/blob/master/src/main/java/com/sonyericsson/rebuild/RebuildAction.java#L417
Either that or its just really fragile :)
cheers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably you are right, the action will be always set and it's never null, but, in general, I think it's a good practice to check for null the return value of
getAction, since it depends on someone adding that action before (and in some cases even in a separate plugin, which is clearly butterfly effect prone 😄 IMO)