This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new 6492cd73 use Locale.ROOT for lowercase/uppercase (#851)
6492cd73 is described below
commit 6492cd73b9cb7c8f1f24f9a30ae2490a21ccc019
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Jun 23 19:11:18 2026 +0100
use Locale.ROOT for lowercase/uppercase (#851)
* use Locale.ROOT for lowercase/uppercase
* Update NativeKubernetesApiImpl.scala
* scalafmt
---
.../coordination/lease/kubernetes/AbstractKubernetesLease.scala | 6 +++++-
.../coordination/lease/kubernetes/internal/KubernetesApiImpl.scala | 3 ++-
.../lease/kubernetes/internal/NativeKubernetesApiImpl.scala | 4 +++-
.../management/cluster/scaladsl/ClusterHttpManagementRoutes.scala | 3 ++-
.../apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala | 4 +++-
.../apache/pekko/management/loglevels/logback/LogLevelRoutes.scala | 5 +++--
.../org/apache/pekko/rollingupdate/kubernetes/KubernetesApi.scala | 6 +++++-
.../apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala | 3 ++-
8 files changed, 25 insertions(+), 9 deletions(-)
diff --git
a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/AbstractKubernetesLease.scala
b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/AbstractKubernetesLease.scala
index e6f6956a..419aaae1 100644
---
a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/AbstractKubernetesLease.scala
+++
b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/AbstractKubernetesLease.scala
@@ -16,6 +16,7 @@ package org.apache.pekko.coordination.lease.kubernetes
import java.nio.charset.StandardCharsets
import java.security.MessageDigest
import java.text.Normalizer
+import java.util.Locale
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.{ ExecutionContext, Future }
@@ -97,7 +98,10 @@ object AbstractKubernetesLease {
*/
private[kubernetes] def makeDNS1039Compatible(name: String, maxLength: Int =
63, hashLength: Int = 0): String = {
val normalized =
- Normalizer.normalize(name,
Normalizer.Form.NFKD).toLowerCase.replaceAll("[_.]",
"-").replaceAll("[^-a-z0-9]", "")
+ Normalizer.normalize(name, Normalizer.Form.NFKD)
+ .toLowerCase(Locale.ROOT)
+ .replaceAll("[_.]", "-")
+ .replaceAll("[^-a-z0-9]", "")
if (normalized.length <= maxLength || hashLength <= 0) {
trim(truncateToLength(normalized, maxLength), List('-'))
} else {
diff --git
a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
index 110591c3..6ded7b8e 100644
---
a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
+++
b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/KubernetesApiImpl.scala
@@ -13,6 +13,7 @@
package org.apache.pekko.coordination.lease.kubernetes.internal
+import java.util.Locale
import scala.concurrent.{ ExecutionContext, Future }
import org.apache.pekko
@@ -135,7 +136,7 @@ PUTs must contain resourceVersions. Response:
Uri.Path.Empty / "apis" / "pekko.apache.org" / "v1" / "namespaces" / ns
/ "leases" /
name
.replaceAll("[^\\d\\w\\-\\.]", "")
- .toLowerCase
+ .toLowerCase(Locale.ROOT)
}(ExecutionContext.parasitic)
}
diff --git
a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/NativeKubernetesApiImpl.scala
b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/NativeKubernetesApiImpl.scala
index e8c3d49e..40a47bf7 100644
---
a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/NativeKubernetesApiImpl.scala
+++
b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/internal/NativeKubernetesApiImpl.scala
@@ -26,9 +26,11 @@ import pekko.coordination.lease.LeaseException
import pekko.http.scaladsl.marshalling.Marshal
import pekko.http.scaladsl.model._
import pekko.http.scaladsl.unmarshalling.Unmarshal
+
import java.time.{ Instant, LocalDateTime, ZoneId }
import java.time.format.{ DateTimeFormatter, DateTimeFormatterBuilder }
import java.time.temporal.ChronoField
+import java.util.Locale
import scala.concurrent.{ ExecutionContext, Future }
object NativeKubernetesApiImpl {
@@ -143,7 +145,7 @@ object NativeKubernetesApiImpl {
Uri.Path.Empty / "apis" / "coordination.k8s.io" / "v1" / "namespaces" /
ns / "leases" /
name
.replaceAll("[^\\d\\w\\-\\.]", "")
- .toLowerCase
+ .toLowerCase(Locale.ROOT)
}(ExecutionContext.parasitic)
}
diff --git
a/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
index 8b21eb7d..29fbeeee 100644
---
a/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
+++
b/management-cluster-http/src/main/scala/org/apache/pekko/management/cluster/scaladsl/ClusterHttpManagementRoutes.scala
@@ -38,6 +38,7 @@ import pekko.pattern.ask
import pekko.pattern.AskTimeoutException
import pekko.util.Timeout
+import java.util.Locale
import scala.annotation.tailrec
import scala.concurrent.duration._
@@ -298,7 +299,7 @@ object ClusterHttpManagementRoutes extends
ClusterHttpManagementJsonProtocol {
private def routePutCluster(cluster: Cluster): Route = {
put {
formField("operation") { operation =>
- if (operation.toLowerCase == "prepare-for-full-shutdown") {
+ if (operation.toLowerCase(Locale.ROOT) == "prepare-for-full-shutdown")
{
cluster.prepareForFullClusterShutdown()
complete(ClusterHttpManagementMessage(s"Preparing for full cluster
shutdown"))
} else {
diff --git
a/management-loglevels-log4j2/src/main/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala
b/management-loglevels-log4j2/src/main/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala
index e7820a4a..8a679903 100644
---
a/management-loglevels-log4j2/src/main/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala
+++
b/management-loglevels-log4j2/src/main/scala/org/apache/pekko/management/loglevels/log4j2/LogLevelRoutes.scala
@@ -13,6 +13,8 @@
package org.apache.pekko.management.loglevels.log4j2
+import java.util.Locale
+
import org.apache.logging.log4j.core.LoggerContext
import org.apache.logging.log4j.{ Level, LogManager }
import org.apache.pekko
@@ -116,7 +118,7 @@ private[pekko] object LoggingUnmarshallers {
implicit val levelFromStringUnmarshaller: Unmarshaller[String, Level] =
Unmarshaller.strict { string =>
- if (!validLevels(string.toUpperCase))
+ if (!validLevels(string.toUpperCase(Locale.ROOT)))
throw new IllegalArgumentException(s"Unknown logger level $string,
allowed are [${validLevels.mkString(",")}]")
Level.valueOf(string)
}
diff --git
a/management-loglevels-logback/src/main/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutes.scala
b/management-loglevels-logback/src/main/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutes.scala
index 35d43897..a559a781 100644
---
a/management-loglevels-logback/src/main/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutes.scala
+++
b/management-loglevels-logback/src/main/scala/org/apache/pekko/management/loglevels/logback/LogLevelRoutes.scala
@@ -13,6 +13,7 @@
package org.apache.pekko.management.loglevels.logback
+import java.util.Locale
import scala.annotation.nowarn
import ch.qos.logback.classic.{ Level, LoggerContext }
@@ -122,9 +123,9 @@ private[pekko] object LoggingUnmarshallers {
implicit val levelFromStringUnmarshaller: Unmarshaller[String, Level] =
Unmarshaller.strict { string =>
- if (!validLevels(string.toUpperCase))
+ if (!validLevels(string.toUpperCase(Locale.ROOT)))
throw new IllegalArgumentException(s"Unknown logger level $string,
allowed are [${validLevels.mkString(",")}]")
- Level.valueOf(string)
+ Level.valueOf(string.toUpperCase(Locale.ROOT))
}
implicit val classicLevelFromStringUnmarshaller: Unmarshaller[String,
ClassicLogging.LogLevel] =
diff --git
a/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApi.scala
b/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApi.scala
index e353b8e4..932dcd6c 100644
---
a/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApi.scala
+++
b/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApi.scala
@@ -14,6 +14,7 @@
package org.apache.pekko.rollingupdate.kubernetes
import java.text.Normalizer
+import java.util.Locale
import scala.collection.immutable
import scala.concurrent.Future
@@ -92,7 +93,10 @@ private[pekko] final case class PodCost(podName: String,
cost: Int, address: Str
*/
def makeDNS1039Compatible(name: String): String = {
val normalized =
- Normalizer.normalize(name,
Normalizer.Form.NFKD).toLowerCase.replaceAll("[_.]",
"-").replaceAll("[^-a-z0-9]", "")
+ Normalizer.normalize(name, Normalizer.Form.NFKD)
+ .toLowerCase(Locale.ROOT)
+ .replaceAll("[_.]", "-")
+ .replaceAll("[^-a-z0-9]", "")
if (normalized.length > 63)
throw new IllegalArgumentException(
s"Resource name [$normalized] is too long. At most 63 characters are
accepted. " +
diff --git
a/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
b/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
index fde99697..1b2639b4 100644
---
a/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
+++
b/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
@@ -13,6 +13,7 @@
package org.apache.pekko.rollingupdate.kubernetes
+import java.util.Locale
import scala.collection.immutable
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
@@ -260,7 +261,7 @@ PUTs must contain resourceVersions. Response:
Uri.Path.Empty / "apis" / "pekko.apache.org" / "v1" / "namespaces" /
namespace / "podcosts" /
crName
.replaceAll("[^\\d\\w\\-\\.]", "")
- .toLowerCase
+ .toLowerCase(Locale.ROOT)
private def requestForPath(
path: Uri.Path,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
