Fallback to old guava API if needed and avoid core bump #1
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,10 +21,13 @@ | |
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.concurrent.CancellationException; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.RejectedExecutionException; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.logging.Level; | ||
|
|
@@ -181,11 +184,9 @@ public void onLoaded() { | |
| Futures.addCallback(e.getCurrentExecutions(false), new FutureCallback<List<StepExecution>>() { | ||
| @Override | ||
| public void onSuccess(List<StepExecution> result) { | ||
| LOGGER.log(FINE, "Will resume {0}", result); | ||
| for (StepExecution se : result) { | ||
| se.onResume(); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -197,7 +198,7 @@ public void onFailure(Throwable t) { | |
| LOGGER.log(WARNING, "Failed to load " + e, t); | ||
| } | ||
| } | ||
| }, newExecutorService()); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -220,13 +221,11 @@ public ListenableFuture<?> apply(final Function<StepExecution, Void> f) { | |
| Futures.addCallback(execs,new FutureCallback<List<StepExecution>>() { | ||
| @Override | ||
| public void onSuccess(List<StepExecution> result) { | ||
| for (StepExecution e : result) { | ||
| try { | ||
| f.apply(e); | ||
| } catch (RuntimeException x) { | ||
| LOGGER.log(Level.WARNING, null, x); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -235,7 +234,7 @@ public void onSuccess(List<StepExecution> result) { | |
| public void onFailure(Throwable t) { | ||
| LOGGER.log(Level.WARNING, null, t); | ||
| } | ||
| }, newExecutorService()); | ||
| } | ||
|
|
||
| return Futures.allAsList(all); | ||
|
|
@@ -259,4 +258,24 @@ public void onFailure(Throwable t) { | |
| executor.awaitTermination(1, TimeUnit.MINUTES); | ||
| } | ||
|
|
||
| /** | ||
| * Returns an {@link ExecutorService} to be used as a parameter in other methods. | ||
| * It calls {@code MoreExecutors#newDirectExecutorService} or falls back to {@code MoreExecutors#sameThreadExecutor} | ||
| * for compatibility with older (< 18.0) versions of guava. | ||
| */ | ||
| private static ExecutorService newExecutorService() { | ||
| try { | ||
| try { | ||
| Method method = MoreExecutors.class.getMethod("newDirectExecutorService"); | ||
|
Owner
There was a problem hiding this comment. can you invert this please as in |
||
| return (ExecutorService) method.invoke(null); | ||
| } catch (NoSuchMethodException e) { | ||
| // guava older than 18, fallback to `sameThreadExecutor` | ||
| Method method = MoreExecutors.class.getMethod("sameThreadExecutor"); | ||
| return (ExecutorService) method.invoke(null); | ||
| } | ||
| } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e ) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| } | ||
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
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.
can we use a supported one at least, most of the others were recently bumped to 2.222.4