Removed usage of Guava #603
Merged
Conversation
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
To secure a future upgrade in core.
MRamonLeon
approved these changes
Apr 28, 2021
| @@ -129,7 +131,7 @@ public void sendInput(byte[] input) { | |||
|
|
|||
| public boolean slurpOutput(FastPipedOutputStream stdout, FastPipedOutputStream stderr) throws IOException { | |||
| LOGGER.log(Level.FINE, () -> "--> SlurpOutput"); | |||
| ImmutableMap<String, FastPipedOutputStream> streams = ImmutableMap.of("stdout", stdout, "stderr", stderr); | |||
| Map<String, FastPipedOutputStream> streams = new HashMap<>(); streams.put("stdout", stdout); streams.put("stderr", stderr); | |||
There was a problem hiding this comment.
It's not an immutable but I think it's fine. We only use it internally. Maybe you can initialize to 2 elements, as they're the only elements we will use
| @@ -21,7 +20,7 @@ public OpenShellRequest(URL url) { | |||
|
|
|||
| protected void construct() { | |||
| try { | |||
| defaultHeader().action(new URI("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create")).resourceURI(new URI("http://schemas.microsoft.com/wbem/wsman/1/windows/shell/cmd")).options(ImmutableList.of(new Option("WINRS_NOPROFILE", "FALSE"), new Option("WINRS_CODEPAGE", "437"))); | |||
| defaultHeader().action(new URI("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create")).resourceURI(new URI("http://schemas.microsoft.com/wbem/wsman/1/windows/shell/cmd")).options(Arrays.asList(new Option("WINRS_NOPROFILE", "FALSE"), new Option("WINRS_CODEPAGE", "437"))); | |||
There was a problem hiding this comment.
It's not immutable as before but we don't use the list afterwards anyway.
|
|
||
| Header(String to, String replyTo, String maxEnvelopeSize, String timeout, String locale, String id, String action, String shellId, String resourceURI, ImmutableList<Option> optionSet) { | ||
| Header(String to, String replyTo, String maxEnvelopeSize, String timeout, String locale, String id, String action, String shellId, String resourceURI, List<Option> optionSet) { |
| @@ -27,7 +29,7 @@ | |||
| this.action = action; | |||
| this.shellId = shellId; | |||
| this.resourceURI = resourceURI; | |||
| this.optionSet = optionSet; | |||
| this.optionSet = optionSet != null ? Collections.unmodifiableList(new ArrayList<>(optionSet)) : Collections.emptyList(); | |||
alecharp
approved these changes
Apr 28, 2021
res0nance
approved these changes
Apr 29, 2021
|
@res0nance Thanks for merging! |
Hey @rsandell, I'm good to release whenever but #602 seems to have received a comment, might be worth checking it out. I don't think there is too much urgency around Guava removal but yes we definitely want users to start adopting this version before core(hopefully) manages to remove it. |
|
@res0nance the comment on #602 is ok, you can go ahead and release the plugin. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
To secure a future upgrade in core.