This repository was archived by the owner on Apr 1, 2025. It is now read-only.
Update to spring-shell 2.1.x #1026
Merged
Conversation
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
onobc
commented
Jan 31, 2022
...rg/springframework/cloud/skipper/shell/command/support/InteractiveModeApplicationRunner.java
Outdated
Show resolved
Hide resolved
onobc
force-pushed
the
gh-1021-springshell-proper
branch
2 times, most recently
from
56cba98 to
de378e9
Compare
onobc
commented
Feb 1, 2022
| @@ -37,6 +37,6 @@ public static String basicAuthorizationHeader(String username, String password) | |||
| Assert.notNull(username, "The username must not be null."); | |||
| Assert.notNull(password, "The password must not be null."); | |||
|
|
|||
| return "Basic " + new String(Base64.encode((username + ":" + password).getBytes(StandardCharsets.ISO_8859_1))); | |||
| return "Basic " + new String(Base64.getEncoder().encode((username + ":" + password).getBytes(StandardCharsets.ISO_8859_1))); | |||
There was a problem hiding this comment.
[UNRELATED_DEPRECATION_FIX]
onobc
commented
Feb 1, 2022
| @@ -63,7 +63,7 @@ public Target(String targetUriAsString, String targetUsername, String targetPass | |||
| this.targetUri = URI.create(targetUriAsString); | |||
| this.skipSslValidation = skipSslValidation; | |||
|
|
|||
| if (StringUtils.isEmpty(targetUsername)) { | |||
| if (!StringUtils.hasText(targetUsername)) { | |||
There was a problem hiding this comment.
[UNRELATED_DEPRECATION_FIX]
onobc
commented
Feb 1, 2022
| SkipperClientProperties skipperClientProperties) { | ||
| return new InitializeConnectionApplicationRunner(targetHolder, resultHandler, skipperClientProperties); | ||
| } | ||
|
|
||
| @Bean | ||
| public ApplicationRunner applicationRunner(Shell shell, ConfigurableEnvironment environment) { | ||
| return new InteractiveModeApplicationRunner(shell, environment); | ||
| public NonInteractiveShellRunnerCustomizer skipperClientArgsFilteringCustomizer() { |
There was a problem hiding this comment.
This customizer is what allows us to delete the custom interactive app runner.
onobc
force-pushed
the
gh-1021-springshell-proper
branch
from
de378e9 to
f9b778e
Compare
|
This looks good. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This upgrades to the latest spring-shell.
Fixes #1021