Skip to content

Commit cb00b3a

Browse files
committed
JENKINS-72139: Jenkins 2.426 compatibility
1 parent 804b7ca commit cb00b3a

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/main/java/de/westemeyer/plugins/multiselect/MultiselectParameterDefinition.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.io.IOException;
2222
import java.util.ArrayDeque;
2323
import java.util.ArrayList;
24-
import java.util.Collections;
24+
import java.util.Arrays;
2525
import java.util.HashMap;
2626
import java.util.List;
2727
import java.util.Map;
@@ -110,7 +110,7 @@ public static Queue<Integer> createCoordinates(Integer... coordinates) {
110110
Queue<Integer> itemPath = new ArrayDeque<>();
111111

112112
// add all items to queue
113-
Collections.addAll(itemPath, coordinates);
113+
Arrays.stream(coordinates).filter(Objects::nonNull).forEach(itemPath::add);
114114

115115
// return queue object
116116
return itemPath;

src/main/resources/de/westemeyer/plugins/multiselect/MultiselectParameterDefinition/index.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
function ${variable.uuid}Changed(select)
5858
{
5959
<j:if test="${i ne (variableDescriptions.size() - 1)}">
60-
var coordinatesBuffer = new Array(${variableDescriptions.size()});
60+
var coordinatesBuffer = new Array();
6161
var e = null;
6262
<j:forEach var="listItem" items="${variableDescriptions}" indexVar="j">
6363
<j:if test="${j lt (i + 1)}">

src/test/java/de/westemeyer/plugins/multiselect/MultiselectParameterDefinitionTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import java.io.IOException;
1212
import java.util.Collections;
13+
import java.util.Queue;
1314

1415
import static de.westemeyer.plugins.multiselect.MultiselectConfigurationFormat.CSV;
1516
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -202,4 +203,11 @@ void testHashCode() {
202203
value.setUuid("FDcYsiejIswOtJc");
203204
assertEquals(-234521635, value.hashCode());
204205
}
206+
207+
@Test
208+
void createCoordinates() {
209+
Queue<Integer> coordinates = MultiselectParameterDefinition.createCoordinates(null, 100, null);
210+
assertEquals(1, coordinates.size());
211+
assertEquals(100, coordinates.poll());
212+
}
205213
}

0 commit comments

Comments
 (0)