Adjust to blocking lower/uper-casing without locale.

spring-cloud · Oct 17, 2024 · b1a0375 · b1a0375
1 parent da9cb76
commit b1a0375
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java b/...-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
@@ -35,6 +36,7 @@
  *
  * @author Spencer Gibb
  * @author Tim Ysewyn
+ * @author Olga Maciaszek-Sharma
  */
 public class EurekaDiscoveryClient implements DiscoveryClient {
 
@@ -79,7 +81,7 @@ public List<String> getServices() {
  if (app.getInstances().isEmpty()) {
  continue;
  }
- names.add(app.getName().toLowerCase());
+ names.add(app.getName().toLowerCase(Locale.ROOT));
 
  }
  return names;

diff --git a/...src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java b/...src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java
@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -234,7 +235,8 @@ public boolean shouldGZipContentFromRemoteRegion() {
 
  @Override
  public Set<String> getRemoteRegionAppWhitelist(String regionName) {
- return this.remoteRegionAppWhitelist.get(regionName == null ? "global" : regionName.trim().toLowerCase());
+ return this.remoteRegionAppWhitelist
+ .get(regionName == null ? "global" : regionName.trim().toLowerCase(Locale.ROOT));
  }
 
  @Override

diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
@@ -14,4 +14,8 @@
 <suppress files=".*TestAutoConfiguration\.java" checks="JavadocStyle"/>
 <suppress files=".*Tests\.java" checks="JavadocVariable"/>
 <suppress files=".*EurekaConfigServerBootstrapperIT\.java" checks="JavadocVariable"/>
+ <suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]"
+ checks="RegexpSinglelineJava" id="toLowerCaseWithoutLocale"/>
+ <suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]"
+ checks="RegexpSinglelineJava" id="toUpperCaseWithoutLocale"/>
 </suppressions>