From f4b445bdaf7168ec14a6e4ada8096cb455dddc22 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 10 Oct 2024 12:00:08 +0000 Subject: [PATCH 1/3] Bumping versions --- .../cloud/netflix/eureka/RestTemplateEurekaClientTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/RestTemplateEurekaClientTests.java b/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/RestTemplateEurekaClientTests.java index a9686848e..8ea1d803b 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/RestTemplateEurekaClientTests.java +++ b/spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/RestTemplateEurekaClientTests.java @@ -91,6 +91,7 @@ public class RestTemplateEurekaClientTests extends BaseCertTests { RestTemplateDiscoveryClientOptionalArgs discoveryClientOptionalArgs) { return configuration.restTemplateTransportClientFactories(discoveryClientOptionalArgs); } + } @SpringBootConfiguration From da9cb76fcce46c20b9725886c523f7b94828dbd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:41:34 +0200 Subject: [PATCH 2/3] Bump @antora/collector-extension in /docs (#4351) --- updated-dependencies: - dependency-name: "@antora/collector-extension" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 78c6f3c48..1c8155de0 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-beta.2", + "@antora/collector-extension": "1.0.0-beta.3", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From b1a0375ce4b0592351b9e611eb7d562cb5956507 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 17 Oct 2024 15:47:26 +0200 Subject: [PATCH 3/3] Adjust to blocking lower/uper-casing without locale. --- .../cloud/netflix/eureka/EurekaDiscoveryClient.java | 6 ++++-- .../cloud/netflix/eureka/server/EurekaServerConfigBean.java | 4 +++- src/checkstyle/checkstyle-suppressions.xml | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java index 527d7ba9a..3752daab2 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java +++ b/spring-cloud-netflix-eureka-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 @@ package org.springframework.cloud.netflix.eureka; 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 @@ import org.springframework.core.Ordered; * * @author Spencer Gibb * @author Tim Ysewyn + * @author Olga Maciaszek-Sharma */ public class EurekaDiscoveryClient implements DiscoveryClient { @@ -79,7 +81,7 @@ public class EurekaDiscoveryClient implements DiscoveryClient { if (app.getInstances().isEmpty()) { continue; } - names.add(app.getName().toLowerCase()); + names.add(app.getName().toLowerCase(Locale.ROOT)); } return names; diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java index fc91787f0..b03f57cee 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfigBean.java @@ -19,6 +19,7 @@ package org.springframework.cloud.netflix.eureka.server; 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 class EurekaServerConfigBean implements EurekaServerConfig { @Override public Set 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 index 74ff896d6..22dcb9879 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -14,4 +14,8 @@ + + \ No newline at end of file