[JENKINS-26481] [JENKINS-27421] Use GroovyCategorySupport to invoke CpsDefaultGroovyMethods (w/o DGMPatcher) & IteratorHack #124
There are no files selected for viewing
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -24,91 +24,86 @@ | |
|
|
||
| package org.jenkinsci.plugins.workflow.cps.persistence; | ||
|
|
||
| import com.cloudbees.groovy.cps.impl.Caller; | ||
| import java.io.Serializable; | ||
| import java.util.AbstractList; | ||
| import java.util.AbstractMap; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.ConcurrentModificationException; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.NoSuchElementException; | ||
|
|
||
| /** | ||
| * Makes Java iterators effectively serializable. | ||
| */ | ||
| public class IteratorHack { | ||
|
|
||
|
There was a problem hiding this comment. Supersedes jenkinsci/pipeline-plugin#372. |
||
| /** | ||
| * Similar to the inner class of {@link AbstractList} except it is serializable. | ||
| * Since {@link AbstractList#modCount} is {@code transient} we cannot rely on it and thus cannot throw {@link ConcurrentModificationException}. | ||
| */ | ||
| private static final class Itr<E> implements Iterator<E>, Serializable { | ||
| private static final long serialVersionUID = 1; | ||
| private final List<E> list; | ||
| private int cursor = 0; | ||
| private int lastRet = -1; | ||
| Itr(List<E> list) { | ||
| this.list = list; | ||
| } | ||
| @Override public boolean hasNext() { | ||
| return cursor != list.size(); | ||
| } | ||
| @Override public E next() { | ||
| try { | ||
| int i = cursor; | ||
| E next = list.get(i); | ||
| lastRet = i; | ||
| cursor = i + 1; | ||
| return next; | ||
| } catch (IndexOutOfBoundsException e) { | ||
| throw new NoSuchElementException(); | ||
| } | ||
| } | ||
| @Override public void remove() { | ||
| if (lastRet < 0) { | ||
| throw new IllegalStateException(); | ||
| } | ||
| try { | ||
| list.remove(lastRet); | ||
| if (lastRet < cursor) { | ||
| cursor--; | ||
| } | ||
| lastRet = -1; | ||
| } catch (IndexOutOfBoundsException e) { | ||
| throw new ConcurrentModificationException(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** Serializable replacement for {@link List#iterator}. */ | ||
| public static <E> Iterator<E> iterator(List<E> list) { | ||
| // TODO !Caller.isAsynchronous(list, "iterator") && !Caller.isAsynchronous(IteratorHack.class, "iterator", list) when used from a Java 5-style for-loop, so not sure how to sidestep this when running in @NonCPS | ||
| return new Itr<>(list); | ||
| } | ||
|
|
||
| /** Serializable replacement for {@link Map#entrySet}. */ | ||
| public static <K, V> Collection<Map.Entry<K, V>> entrySet(Map<K, V> map) { | ||
| if (!Caller.isAsynchronous(map, "entrySet") && !Caller.isAsynchronous(IteratorHack.class, "entrySet", map)) { | ||
| // In @NonCPS so no need to bother processing this. | ||
| return map.entrySet(); | ||
| } | ||
| // TODO return an actual Set | ||
| List<Map.Entry<K, V>> entries = new ArrayList<>(); | ||
| for (Map.Entry<K, V> entry : map.entrySet()) { | ||
| // TODO return an object holding references to the map and the key and delegating all calls accordingly | ||
|
There was a problem hiding this comment. These impls are not intended to be perfect or complete, just good enough to let typical script usages pass, where previously they would not. There was a problem hiding this comment. I forget - does this all enable There was a problem hiding this comment. Yes, see |
||
| entries.add(new AbstractMap.SimpleImmutableEntry<>(entry)); | ||
| } | ||
| return entries; | ||
| } | ||
|
|
||
| private IteratorHack() {} | ||
|
|
||
| } | ||
This file contains 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 |
|---|---|---|
|
|
@@ -219,12 +219,8 @@ public void stop(Throwable cause) throws Exception { | |
| SemaphoreStep.success("new-one/1", null); | ||
| SemaphoreStep.success("new-two/1", null); | ||
| story.j.waitForCompletion(b); | ||
|
There was a problem hiding this comment. Now we can have the “desired behavior” from #77. |
||
| story.j.assertBuildStatusSuccess(b); | ||
| story.j.assertLogContains("running new-style loop on two -> 2", b); | ||
| } | ||
| }); | ||
| } | ||
|
|
@@ -247,7 +243,6 @@ public void stop(Throwable cause) throws Exception { | |
| }); | ||
| } | ||
|
|
||
| @Issue("JENKINS-26481") | ||
| @Test public void eachClosure() { | ||
| story.addStep(new Statement() { | ||
|
|
||
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.
Such as is added in cloudbees/groovy-cps#52, but that mixes in other stuff which we do not need.