From 3a041d379fa97ee7beaf971f976ef20e7b126ab7 Mon Sep 17 00:00:00 2001 From: Kaveh Shamsi Date: Fri, 18 Oct 2024 15:24:46 +0200 Subject: [PATCH] Fixes checkstyle issues (#2596) Signed-off-by: kvmw --- .../cloud/config/server/proxy/ProxyHostProperties.java | 6 ++++-- .../cloud/config/server/resource/ResourceController.java | 3 ++- .../support/GitSkipSslValidationCredentialsProvider.java | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/proxy/ProxyHostProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/proxy/ProxyHostProperties.java index ed0afaae..9352499d 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/proxy/ProxyHostProperties.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/proxy/ProxyHostProperties.java @@ -16,6 +16,8 @@ package org.springframework.cloud.config.server.proxy; +import java.util.Locale; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonValue; @@ -93,12 +95,12 @@ public class ProxyHostProperties { @JsonCreator public static ProxyForScheme forLowerCaseName(String lowerCaseName) { - return ProxyForScheme.valueOf(lowerCaseName.toUpperCase()); + return ProxyForScheme.valueOf(lowerCaseName.toUpperCase(Locale.ROOT)); } @JsonValue public String lowercaseName() { - return this.name().toLowerCase(); + return this.name().toLowerCase(Locale.ROOT); } } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java index ca835a4d..172e3a31 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import org.apache.commons.logging.Log; @@ -143,7 +144,7 @@ public class ResourceController { String text = StreamUtils.copyToString(is, Charset.forName("UTF-8")); String ext = StringUtils.getFilenameExtension(resource.getFilename()); if (ext != null) { - ext = ext.toLowerCase(); + ext = ext.toLowerCase(Locale.ROOT); } Environment environment = this.environmentRepository.findOne(name, profile, label, false); if (resolvePlaceholders) { diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitSkipSslValidationCredentialsProvider.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitSkipSslValidationCredentialsProvider.java index a774cc22..1920de3a 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitSkipSslValidationCredentialsProvider.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GitSkipSslValidationCredentialsProvider.java @@ -18,6 +18,7 @@ package org.springframework.cloud.config.server.support; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.regex.Pattern; import org.eclipse.jgit.errors.UnsupportedCredentialItem; @@ -53,7 +54,7 @@ public class GitSkipSslValidationCredentialsProvider extends CredentialsProvider * @return {@code true} if it can be handled */ public static boolean canHandle(String uri) { - return uri != null && uri.toLowerCase().startsWith("https://"); + return uri != null && uri.toLowerCase(Locale.ROOT).startsWith("https://"); } private static String stripFormattingPlaceholders(String string) {