This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/pekko-management.git
commit 0776b7baa57918e84bf9c0941bd20798938586a4 Author: Scala Steward <[email protected]> AuthorDate: Sat Jan 17 16:27:17 2026 +0000 Reformat with scalafmt 3.10.4 Executed command: scalafmt --non-interactive --- build.sbt | 6 ++++-- .../discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala | 7 +------ .../apache/pekko/discovery/kubernetes/JsonFormat.scala | 8 +------- .../pekko/coordination/lease/kubernetes/LeaseActor.scala | 4 +++- .../lease/kubernetes/internal/KubernetesApiImpl.scala | 3 ++- .../kubernetes/internal/NativeKubernetesApiImpl.scala | 3 ++- .../lease/kubernetes/KubernetesSettingsSpec.scala | 3 ++- .../cluster/bootstrap/SelfAwareJoinDecider.scala | 3 ++- .../contactpoint/HttpClusterBootstrapRoutes.scala | 9 ++++----- .../cluster/bootstrap/internal/BootstrapCoordinator.scala | 11 ++--------- .../bootstrap/internal/HttpContactPointBootstrap.scala | 5 ++++- .../cluster/scaladsl/ClusterHttpManagementRoutes.scala | 14 +++----------- .../pekko/management/scaladsl/PekkoManagement.scala | 7 +------ .../org/apache/pekko/management/HealthChecksSpec.scala | 15 ++++++++++----- 14 files changed, 41 insertions(+), 57 deletions(-) diff --git a/build.sbt b/build.sbt index d4628aac..abbe476e 100644 --- a/build.sbt +++ b/build.sbt @@ -295,8 +295,10 @@ lazy val docs = project "pekko.version" -> PekkoCoreDependency.version, "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/${Dependencies.pekkoBinaryVersion}/%s";, "scaladoc.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/${Dependencies.pekkoBinaryVersion}/";, - "extref.pekko-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/${Dependencies.pekkoHttpBinaryVersion}/%s";, - "scaladoc.pekko.http.base_url" -> s"https://pekko.apache.org/api/pekko-http/${Dependencies.pekkoHttpBinaryVersion}/";, + "extref.pekko-http.base_url" -> + s"https://pekko.apache.org/docs/pekko-http/${Dependencies.pekkoHttpBinaryVersion}/%s";, + "scaladoc.pekko.http.base_url" -> + s"https://pekko.apache.org/api/pekko-http/${Dependencies.pekkoHttpBinaryVersion}/";, "extref.pekko-grpc.base_url" -> s"https://pekko.apache.org/docs/pekko-grpc/1.0/%s";), Global / pekkoParadoxIncubatorNotice := None, Compile / paradoxMarkdownToHtml / sourceGenerators += Def.taskDyn { diff --git a/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala index 61fbcba2..b2ddbeb2 100644 --- a/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala +++ b/discovery-aws-api-async/src/main/scala/org/apache/pekko/discovery/awsapi/ecs/AsyncEcsTaskSetDiscovery.scala @@ -39,12 +39,7 @@ import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration import software.amazon.awssdk.retries.DefaultRetryStrategy import software.amazon.awssdk.services.ecs._ import software.amazon.awssdk.services.ecs.model.{ - DescribeTasksRequest, - DesiredStatus, - ListTasksRequest, - Tag => _, - Task, - TaskField + DescribeTasksRequest, DesiredStatus, ListTasksRequest, Tag => _, Task, TaskField } import spray.json.DefaultJsonProtocol._ import spray.json.RootJsonFormat diff --git a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/JsonFormat.scala b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/JsonFormat.scala index 6aec1a2a..208ec7c8 100644 --- a/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/JsonFormat.scala +++ b/discovery-kubernetes-api/src/main/scala/org/apache/pekko/discovery/kubernetes/JsonFormat.scala @@ -16,13 +16,7 @@ package org.apache.pekko.discovery.kubernetes import org.apache.pekko import pekko.annotation.InternalApi import pekko.discovery.kubernetes.PodList.{ - Container, - ContainerPort, - ContainerStatus, - Metadata, - Pod, - PodSpec, - PodStatus + Container, ContainerPort, ContainerStatus, Metadata, Pod, PodSpec, PodStatus } import pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import spray.json._ diff --git a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActor.scala b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActor.scala index 0cc1c922..d50a32b7 100644 --- a/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActor.scala +++ b/lease-kubernetes/src/main/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActor.scala @@ -285,7 +285,9 @@ private[pekko] class LeaseActor(k8sApi: KubernetesApi, settings: LeaseSettings, private def hasLeaseTimedOut(leaseTime: Long): Boolean = { System - .currentTimeMillis() > (leaseTime + settings.timeoutSettings.heartbeatTimeout + .currentTimeMillis() > + (leaseTime + + settings.timeoutSettings.heartbeatTimeout .toMillis - (2 * settings.timeoutSettings.heartbeatInterval.toMillis)) } } 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 f557b4b9..110591c3 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 @@ -132,7 +132,8 @@ PUTs must contain resourceVersions. Response: override def pathForLease(name: String): Future[Uri.Path] = { namespace.map { ns => - Uri.Path.Empty / "apis" / "pekko.apache.org" / "v1" / "namespaces" / ns / "leases" / name + Uri.Path.Empty / "apis" / "pekko.apache.org" / "v1" / "namespaces" / ns / "leases" / + name .replaceAll("[^\\d\\w\\-\\.]", "") .toLowerCase }(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 f6c6a815..e8c3d49e 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 @@ -140,7 +140,8 @@ object NativeKubernetesApiImpl { override def pathForLease(name: String): Future[Uri.Path] = { namespace.map { ns => - Uri.Path.Empty / "apis" / "coordination.k8s.io" / "v1" / "namespaces" / ns / "leases" / name + Uri.Path.Empty / "apis" / "coordination.k8s.io" / "v1" / "namespaces" / ns / "leases" / + name .replaceAll("[^\\d\\w\\-\\.]", "") .toLowerCase }(ExecutionContext.parasitic) diff --git a/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettingsSpec.scala b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettingsSpec.scala index 9a8d853c..6bf4dd6a 100644 --- a/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettingsSpec.scala +++ b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesSettingsSpec.scala @@ -53,7 +53,8 @@ class KubernetesSettingsSpec extends AnyWordSpec with Matchers { lease-operation-timeout=5s api-server-request-timeout=6s """.stripMargin).apiServerRequestTimeout - }.getMessage shouldEqual "requirement failed: 'api-server-request-timeout can not be less than 'lease-operation-timeout'" + }.getMessage shouldEqual + "requirement failed: 'api-server-request-timeout can not be less than 'lease-operation-timeout'" } } diff --git a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/SelfAwareJoinDecider.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/SelfAwareJoinDecider.scala index 0ee11915..13e1a34b 100644 --- a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/SelfAwareJoinDecider.scala +++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/SelfAwareJoinDecider.scala @@ -85,7 +85,8 @@ import scala.concurrent.duration._ */ protected def hostMatches(host: String, target: ResolvedTarget): Boolean = { val hostWithoutBracket = host.replaceAll("[\\[\\]]", "") - host == target.host || hostWithoutBracket == target.host || target.address + host == target.host || hostWithoutBracket == target.host || + target.address .map(_.getHostAddress) .contains(hostWithoutBracket) } diff --git a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala index c1a8b521..afd7e3ce 100644 --- a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala +++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/contactpoint/HttpClusterBootstrapRoutes.scala @@ -58,12 +58,11 @@ final class HttpClusterBootstrapRoutes(settings: ClusterBootstrapSettings) exten } /** Scala API */ - val routes: Route = - (path("bootstrap" / "seed-nodes") & get) { - toStrictEntity(1.second) { // always drain everything - routeGetSeedNodes - } + val routes: Route = (path("bootstrap" / "seed-nodes") & get) { + toStrictEntity(1.second) { // always drain everything + routeGetSeedNodes } + } /** Java API */ def getRoutes: pekko.http.javadsl.server.Route = RouteAdapter(routes) diff --git a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinator.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinator.scala index dba79025..fc0b91b5 100644 --- a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinator.scala +++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/BootstrapCoordinator.scala @@ -36,15 +36,8 @@ import scala.concurrent.duration._ import scala.util.Try import pekko.event.Logging import pekko.management.cluster.bootstrap.{ - BootstrapLogMarker, - ClusterBootstrapSettings, - JoinDecider, - JoinDecision, - JoinOtherSeedNodes, - JoinSelf, - KeepProbing, - SeedNodesInformation, - SeedNodesObservation + BootstrapLogMarker, ClusterBootstrapSettings, JoinDecider, JoinDecision, JoinOtherSeedNodes, JoinSelf, KeepProbing, + SeedNodesInformation, SeedNodesObservation } /** INTERNAL API */ diff --git a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala index f9a2c62a..4a54ca68 100644 --- a/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala +++ b/management-cluster-bootstrap/src/main/scala/org/apache/pekko/management/cluster/bootstrap/internal/HttpContactPointBootstrap.scala @@ -54,7 +54,10 @@ private[bootstrap] object HttpContactPointBootstrap { def name(host: Host, port: Int): String = { val ValidSymbols = """-_.*$+:@&=,!~';""" val cleanHost = host.address.filter(c => - (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || (ValidSymbols.indexOf(c) != -1)) + (c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') || + (c >= '0' && c <= '9') || + (ValidSymbols.indexOf(c) != -1)) s"contactPointProbe-$cleanHost-$port" } def props(settings: ClusterBootstrapSettings, contactPoint: ResolvedTarget, baseUri: Uri): Props = 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 1d0731bf..9201d403 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 @@ -21,17 +21,9 @@ import pekko.http.scaladsl.model.{ HttpMethod, HttpMethods, StatusCodes, Uri } import Uri.Path import pekko.http.scaladsl.server.Route import pekko.management.cluster.{ - ClusterDomainEventServerSentEventEncoder, - ClusterHttpManagementJsonProtocol, - ClusterHttpManagementMemberOperation, - ClusterHttpManagementMessage, - ClusterMembers, - ClusterUnreachableMember, - Down, - Leave, - ShardDetails, - ShardEntityTypeKeys, - ShardRegionInfo + ClusterDomainEventServerSentEventEncoder, ClusterHttpManagementJsonProtocol, ClusterHttpManagementMemberOperation, + ClusterHttpManagementMessage, ClusterMembers, ClusterUnreachableMember, Down, Leave, ShardDetails, + ShardEntityTypeKeys, ShardRegionInfo } import pekko.management.cluster.cluster.ClusterReadViewAccess import pekko.pattern.ask diff --git a/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala b/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala index 4d616caa..2ca8c2a1 100644 --- a/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala +++ b/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala @@ -16,12 +16,7 @@ package org.apache.pekko.management.scaladsl import org.apache.pekko import pekko.Done import pekko.actor.{ - ActorSystem, - ClassicActorSystemProvider, - ExtendedActorSystem, - Extension, - ExtensionId, - ExtensionIdProvider + ActorSystem, ClassicActorSystemProvider, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } import pekko.event.{ LogSource, Logging } import pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials diff --git a/management/src/test/scala/org/apache/pekko/management/HealthChecksSpec.scala b/management/src/test/scala/org/apache/pekko/management/HealthChecksSpec.scala index 40e0d410..04d6a84a 100644 --- a/management/src/test/scala/org/apache/pekko/management/HealthChecksSpec.scala +++ b/management/src/test/scala/org/apache/pekko/management/HealthChecksSpec.scala @@ -213,9 +213,12 @@ class HealthChecksSpec val checks = im.Seq( NaughtyCheck) val hc = HealthChecks(eas, settings(checks, checks, checks)) - hc.startupResult().failed.futureValue.getMessage shouldEqual "Check [org.apache.pekko.management.Naughty] failed: bad" - hc.readyResult().failed.futureValue.getMessage shouldEqual "Check [org.apache.pekko.management.Naughty] failed: bad" - hc.aliveResult().failed.futureValue.getMessage shouldEqual "Check [org.apache.pekko.management.Naughty] failed: bad" + hc.startupResult().failed.futureValue.getMessage shouldEqual + "Check [org.apache.pekko.management.Naughty] failed: bad" + hc.readyResult().failed.futureValue.getMessage shouldEqual + "Check [org.apache.pekko.management.Naughty] failed: bad" + hc.aliveResult().failed.futureValue.getMessage shouldEqual + "Check [org.apache.pekko.management.Naughty] failed: bad" hc.startup().failed.futureValue.getMessage shouldEqual "Check [org.apache.pekko.management.Naughty] failed: bad" hc.ready().failed.futureValue.getMessage shouldEqual "Check [org.apache.pekko.management.Naughty] failed: bad" hc.alive().failed.futureValue.getMessage shouldEqual "Check [org.apache.pekko.management.Naughty] failed: bad" @@ -242,13 +245,15 @@ class HealthChecksSpec intercept[InvalidHealthCheckException] { val checks = im.Seq(InvalidCtrCheck) HealthChecks(eas, settings(checks, checks, checks)) - }.getMessage shouldEqual "Health checks: [NamedHealthCheck(InvalidCtr,org.apache.pekko.management.InvalidCtr)] must have a no args constructor or a single argument constructor that takes an ActorSystem" + }.getMessage shouldEqual + "Health checks: [NamedHealthCheck(InvalidCtr,org.apache.pekko.management.InvalidCtr)] must have a no args constructor or a single argument constructor that takes an ActorSystem" } "provide useful error if invalid type" in { intercept[InvalidHealthCheckException] { val checks = im.Seq(WrongTypeCheck) HealthChecks(eas, settings(checks, checks, checks)) - }.getMessage shouldEqual "Health checks: [NamedHealthCheck(WrongType,org.apache.pekko.management.WrongType)] must have type: () => Future[Boolean]" + }.getMessage shouldEqual + "Health checks: [NamedHealthCheck(WrongType,org.apache.pekko.management.WrongType)] must have type: () => Future[Boolean]" } "provide useful error if class not found" in { intercept[InvalidHealthCheckException] { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
