From 50d2f9d334277bd006829edc00c3d74f578fa1e1 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 29 Mar 2021 18:07:17 -0400 Subject: [PATCH] formatting --- .../cloud/config/client/ConfigClientProperties.java | 6 ++---- .../server/support/GitCredentialsProviderFactory.java | 3 +-- .../credentials/GitCredentialsProviderFactoryTests.java | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java index f21510b5..5324e526 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java @@ -346,10 +346,8 @@ public class ConfigClientProperties { result.username = explicitCredentials.username; } - result.password = URLDecoder.decode(result.password, - StandardCharsets.UTF_8.toString()); - result.username = URLDecoder.decode(result.username, - StandardCharsets.UTF_8.toString()); + result.password = URLDecoder.decode(result.password, StandardCharsets.UTF_8.toString()); + result.username = URLDecoder.decode(result.username, StandardCharsets.UTF_8.toString()); return result; } catch (MalformedURLException | UnsupportedEncodingException e) { diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java index 5aa9db0e..dd7ea30b 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitCredentialsProviderFactory.java @@ -96,8 +96,7 @@ public class GitCredentialsProviderFactory { // useful for token based login gh-1602 // see // https://stackoverflow.com/questions/28073266/how-to-use-jgit-to-push-changes-to-remote-with-oauth-access-token - this.logger.debug( - "Constructing UsernamePasswordCredentialsProvider for URI " + uri); + this.logger.debug("Constructing UsernamePasswordCredentialsProvider for URI " + uri); provider = new UsernamePasswordCredentialsProvider(username, (String) null); } else if (hasText(passphrase)) { diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java index ef700e6e..ac33d576 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/credentials/GitCredentialsProviderFactoryTests.java @@ -68,8 +68,7 @@ public class GitCredentialsProviderFactoryTests { @Test public void testCreateForServerWithUsernameAndNoPassword() { - CredentialsProvider provider = this.factory.createFor(HTTPS_GIT_REPO, USER, "", - null, false); + CredentialsProvider provider = this.factory.createFor(HTTPS_GIT_REPO, USER, "", null, false); assertThat(provider).isNotNull(); assertThat(provider instanceof UsernamePasswordCredentialsProvider).isTrue(); }