You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by jr...@apache.org on 2022/11/03 11:24:07 UTC

[incubator-pekko-http] 37/47: http-core: Remove the 3.0-migration flag

This is an automated email from the ASF dual-hosted git repository.

jrudolph pushed a commit to branch scala-3
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git

commit 55859f029a0534b37fca7076a223d27c3f238cc9
Author: Jan Chyb <ja...@gmail.com>
AuthorDate: Wed Apr 20 11:54:56 2022 +0200

    http-core: Remove the 3.0-migration flag
---
 .../main/java/akka/http/javadsl/model/Query.java   |  1 +
 .../scala/akka/http/impl/engine/http2/Http2.scala  |  2 +-
 .../src/main/scala/akka/http/javadsl/Http.scala    |  2 +-
 .../src/main/scala/akka/http/scaladsl/Http.scala   |  2 +-
 .../http/scaladsl/settings/ParserSettings.scala    | 52 +++++++++----------
 .../http/scaladsl/settings/ServerSettings.scala    | 58 +++++++++++-----------
 .../http/scaladsl/settings/WebSocketSettings.scala |  4 +-
 .../engine/client/HostConnectionPoolSpec.scala     |  4 +-
 .../impl/engine/parsing/ResponseParserSpec.scala   |  2 +-
 .../akka/http/scaladsl/model/DateTimeSpec.scala    |  4 +-
 .../akka/http/scaladsl/model/HttpEntitySpec.scala  |  2 +-
 build.sbt                                          |  1 -
 12 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java b/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java
index 0a41b6e6b..45202ee67 100644
--- a/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java
+++ b/akka-http-core/src/main/java/akka/http/javadsl/model/Query.java
@@ -7,6 +7,7 @@ package akka.http.javadsl.model;
 import akka.http.impl.model.JavaQuery;
 import akka.http.impl.model.UriJavaAccessor;
 import akka.http.scaladsl.model.*;
+import akka.http.javadsl.model.HttpCharset;
 import akka.japi.Pair;
 import akka.parboiled2.CharPredicate;
 import akka.parboiled2.ParserInput$;
diff --git a/akka-http-core/src/main/scala/akka/http/impl/engine/http2/Http2.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/http2/Http2.scala
index ea7e120d4..08247c89f 100644
--- a/akka-http-core/src/main/scala/akka/http/impl/engine/http2/Http2.scala
+++ b/akka-http-core/src/main/scala/akka/http/impl/engine/http2/Http2.scala
@@ -263,7 +263,7 @@ private[http] object Http2 extends ExtensionId[Http2Ext] with ExtensionIdProvide
   override def get(system: ClassicActorSystemProvider): Http2Ext = super.get(system)
   def apply()(implicit system: ClassicActorSystemProvider): Http2Ext = super.apply(system)
   override def apply(system: ActorSystem): Http2Ext = super.apply(system)
-  def lookup(): ExtensionId[_ <: Extension] = Http2
+  def lookup: ExtensionId[_ <: Extension] = Http2
   def createExtension(system: ExtendedActorSystem): Http2Ext = new Http2Ext()(system)
 
   private[http] type HttpImplementation = Flow[SslTlsInbound, SslTlsOutbound, ServerTerminator]
diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala
index c53d5d2dc..0150f379d 100644
--- a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala
+++ b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala
@@ -33,7 +33,7 @@ import akka.stream.scaladsl.Keep
 object Http extends ExtensionId[Http] with ExtensionIdProvider {
   override def get(system: ActorSystem): Http = super.get(system)
   override def get(system: ClassicActorSystemProvider): Http = super.get(system)
-  def lookup() = Http
+  def lookup = Http
   def createExtension(system: ExtendedActorSystem): Http = new Http(system)
 }
 
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala
index e2fbde723..2349196ad 100644
--- a/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala
+++ b/akka-http-core/src/main/scala/akka/http/scaladsl/Http.scala
@@ -1105,7 +1105,7 @@ object Http extends ExtensionId[HttpExt] with ExtensionIdProvider {
   def apply()(implicit system: ClassicActorSystemProvider): HttpExt = super.apply(system)
   override def apply(system: ActorSystem): HttpExt = super.apply(system)
 
-  def lookup() = Http
+  def lookup = Http
 
   def createExtension(system: ExtendedActorSystem): HttpExt =
     new HttpExt(system.settings.config getConfig "akka.http")(system)
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala
index c71aada34..be970ae0a 100644
--- a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala
@@ -53,40 +53,40 @@ abstract class ParserSettings private[akka] () extends akka.http.javadsl.setting
   def modeledHeaderParsing: Boolean
 
   /* Java APIs */
-  override def getCookieParsingMode: js.ParserSettings.CookieParsingMode = cookieParsingMode
-  override def getHeaderValueCacheLimits: util.Map[String, Int] = headerValueCacheLimits.asJava
-  override def getMaxChunkExtLength = maxChunkExtLength
-  override def getUriParsingMode: akka.http.javadsl.model.Uri.ParsingMode = uriParsingMode
-  override def getMaxHeaderCount = maxHeaderCount
-  override def getMaxContentLength = maxContentLength
-  override def getMaxToStrictBytes = maxToStrictBytes
-  override def getMaxHeaderValueLength = maxHeaderValueLength
-  override def getIncludeTlsSessionInfoHeader = includeTlsSessionInfoHeader
-  override def getIncludeSslSessionAttribute = includeSslSessionAttribute
-  override def getIllegalHeaderWarnings = illegalHeaderWarnings
-  override def getIgnoreIllegalHeaderFor = ignoreIllegalHeaderFor
-  override def getMaxHeaderNameLength = maxHeaderNameLength
-  override def getMaxChunkSize = maxChunkSize
-  override def getMaxResponseReasonLength = maxResponseReasonLength
-  override def getMaxUriLength = maxUriLength
-  override def getMaxMethodLength = maxMethodLength
-  override def getMaxCommentParsingDepth: Int = maxCommentParsingDepth
-  override def getErrorLoggingVerbosity: js.ParserSettings.ErrorLoggingVerbosity = errorLoggingVerbosity
-  override def getIllegalResponseHeaderNameProcessingMode = illegalResponseHeaderNameProcessingMode
-  override def getIllegalResponseHeaderValueProcessingMode = illegalResponseHeaderValueProcessingMode
-  override def getConflictingContentTypeHeaderProcessingMode = conflictingContentTypeHeaderProcessingMode
+  override def getCookieParsingMode: js.ParserSettings.CookieParsingMode = this.cookieParsingMode
+  override def getHeaderValueCacheLimits: util.Map[String, Int] = this.headerValueCacheLimits.asJava
+  override def getMaxChunkExtLength = this.maxChunkExtLength
+  override def getUriParsingMode: akka.http.javadsl.model.Uri.ParsingMode = this.uriParsingMode
+  override def getMaxHeaderCount = this.maxHeaderCount
+  override def getMaxContentLength = this.maxContentLength
+  override def getMaxToStrictBytes = this.maxToStrictBytes
+  override def getMaxHeaderValueLength = this.maxHeaderValueLength
+  override def getIncludeTlsSessionInfoHeader = this.includeTlsSessionInfoHeader
+  override def getIncludeSslSessionAttribute = this.includeSslSessionAttribute
+  override def getIllegalHeaderWarnings = this.illegalHeaderWarnings
+  override def getIgnoreIllegalHeaderFor = this.ignoreIllegalHeaderFor
+  override def getMaxHeaderNameLength = this.maxHeaderNameLength
+  override def getMaxChunkSize = this.maxChunkSize
+  override def getMaxResponseReasonLength = this.maxResponseReasonLength
+  override def getMaxUriLength = this.maxUriLength
+  override def getMaxMethodLength = this.maxMethodLength
+  override def getMaxCommentParsingDepth: Int = this.maxCommentParsingDepth
+  override def getErrorLoggingVerbosity: js.ParserSettings.ErrorLoggingVerbosity = this.errorLoggingVerbosity
+  override def getIllegalResponseHeaderNameProcessingMode = this.illegalResponseHeaderNameProcessingMode
+  override def getIllegalResponseHeaderValueProcessingMode = this.illegalResponseHeaderValueProcessingMode
+  override def getConflictingContentTypeHeaderProcessingMode = this.conflictingContentTypeHeaderProcessingMode
 
   override def getCustomMethods = new Function[String, Optional[akka.http.javadsl.model.HttpMethod]] {
-    override def apply(t: String) = OptionConverters.toJava(customMethods(t))
+    override def apply(t: String) = OptionConverters.toJava(self.customMethods(t))
   }
   override def getCustomStatusCodes = new Function[Int, Optional[akka.http.javadsl.model.StatusCode]] {
-    override def apply(t: Int) = OptionConverters.toJava(customStatusCodes(t))
+    override def apply(t: Int) = OptionConverters.toJava(self.customStatusCodes(t))
   }
   override def getCustomMediaTypes = new akka.japi.function.Function2[String, String, Optional[akka.http.javadsl.model.MediaType]] {
     override def apply(mainType: String, subType: String): Optional[model.MediaType] =
-      OptionConverters.toJava(customMediaTypes(mainType, subType))
+      OptionConverters.toJava(self.customMediaTypes(mainType, subType))
   }
-  def getModeledHeaderParsing: Boolean = modeledHeaderParsing
+  def getModeledHeaderParsing: Boolean = this.modeledHeaderParsing
 
   // override for more specific return type
   override def withMaxUriLength(newValue: Int): ParserSettings = self.copy(maxUriLength = newValue)
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala
index 15fd2ff64..330225e0e 100644
--- a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala
@@ -59,32 +59,32 @@ abstract class ServerSettings private[akka] () extends akka.http.javadsl.setting
 
   /* Java APIs */
 
-  override def getBacklog = backlog
-  override def getPreviewServerSettings: akka.http.javadsl.settings.PreviewServerSettings = previewServerSettings
-  override def getDefaultHostHeader = defaultHostHeader.asJava
-  override def getPipeliningLimit = pipeliningLimit
-  override def getParserSettings: js.ParserSettings = parserSettings
-  override def getMaxConnections = maxConnections
-  override def getTransparentHeadRequests = transparentHeadRequests
-  override def getResponseHeaderSizeHint = responseHeaderSizeHint
-  override def getVerboseErrorMessages = verboseErrorMessages
-  override def getSocketOptions = socketOptions.asJava
-  override def getServerHeader = OptionConverters.toJava(serverHeader.map(_.asJava))
-  override def getTimeouts = timeouts
-  override def getRawRequestUriHeader = rawRequestUriHeader
-  override def getRemoteAddressHeader = remoteAddressHeader
-  override def getRemoteAddressAttribute: Boolean = remoteAddressAttribute
-  override def getLogUnencryptedNetworkBytes = OptionConverters.toJava(logUnencryptedNetworkBytes)
+  override def getBacklog = this.backlog
+  override def getPreviewServerSettings: akka.http.javadsl.settings.PreviewServerSettings = this.previewServerSettings
+  override def getDefaultHostHeader = this.defaultHostHeader.asJava
+  override def getPipeliningLimit = this.pipeliningLimit
+  override def getParserSettings: js.ParserSettings = this.parserSettings
+  override def getMaxConnections = this.maxConnections
+  override def getTransparentHeadRequests = this.transparentHeadRequests
+  override def getResponseHeaderSizeHint = this.responseHeaderSizeHint
+  override def getVerboseErrorMessages = this.verboseErrorMessages
+  override def getSocketOptions = this.socketOptions.asJava
+  override def getServerHeader = OptionConverters.toJava(this.serverHeader.map(_.asJava))
+  override def getTimeouts = this.timeouts
+  override def getRawRequestUriHeader = this.rawRequestUriHeader
+  override def getRemoteAddressHeader = this.remoteAddressHeader
+  override def getRemoteAddressAttribute: Boolean = this.remoteAddressAttribute
+  override def getLogUnencryptedNetworkBytes = OptionConverters.toJava(this.logUnencryptedNetworkBytes)
   @Deprecated @deprecated("Kept for binary compatibility; Use websocketSettings.getRandomFactory instead", since = "10.2.0")
   override def getWebsocketRandomFactory = new Supplier[Random] {
-    override def get(): Random = websocketRandomFactory()
+    override def get(): Random = self.websocketRandomFactory()
   }
-  override def getDefaultHttpPort: Int = defaultHttpPort
-  override def getDefaultHttpsPort: Int = defaultHttpsPort
+  override def getDefaultHttpPort: Int = this.defaultHttpPort
+  override def getDefaultHttpsPort: Int = this.defaultHttpsPort
   override def getTerminationDeadlineExceededResponse: akka.http.javadsl.model.HttpResponse =
-    terminationDeadlineExceededResponse
-  override def getParsingErrorHandler: String = parsingErrorHandler
-  override def getStreamCancellationDelay: FiniteDuration = streamCancellationDelay
+    this.terminationDeadlineExceededResponse
+  override def getParsingErrorHandler: String = this.parsingErrorHandler
+  override def getStreamCancellationDelay: FiniteDuration = this.streamCancellationDelay
   // ---
 
   // override for more specific return type
@@ -100,7 +100,7 @@ abstract class ServerSettings private[akka] () extends akka.http.javadsl.setting
   override def withBacklog(newValue: Int): ServerSettings = self.copy(backlog = newValue)
   override def withSocketOptions(newValue: java.lang.Iterable[SocketOption]): ServerSettings = self.copy(socketOptions = newValue.asScala.toList)
   @Deprecated @deprecated("Kept for binary compatibility; Use websocketSettings.withRandomFactoryFactory instead", since = "10.2.0")
-  override def withWebsocketRandomFactory(newValue: java.util.function.Supplier[Random]): ServerSettings = self.copy(websocketSettings = websocketSettings.withRandomFactoryFactory(new Supplier[Random] {
+  override def withWebsocketRandomFactory(newValue: java.util.function.Supplier[Random]): ServerSettings = self.copy(websocketSettings = this.websocketSettings.withRandomFactoryFactory(new Supplier[Random] {
     override def get(): Random = newValue.get()
   }))
   override def getWebsocketSettings: WebSocketSettings = self.websocketSettings
@@ -118,7 +118,7 @@ abstract class ServerSettings private[akka] () extends akka.http.javadsl.setting
   def withDefaultHostHeader(newValue: Host): ServerSettings = self.copy(defaultHostHeader = newValue)
   def withParserSettings(newValue: ParserSettings): ServerSettings = self.copy(parserSettings = newValue)
   @Deprecated @deprecated("Kept for binary compatibility; Use websocketSettings.withRandomFactoryFactory instead", since = "10.2.0")
-  def withWebsocketRandomFactory(newValue: () => Random): ServerSettings = self.copy(websocketSettings = websocketSettings.withRandomFactoryFactory(new Supplier[Random] {
+  def withWebsocketRandomFactory(newValue: () => Random): ServerSettings = self.copy(websocketSettings = this.websocketSettings.withRandomFactoryFactory(new Supplier[Random] {
     override def get(): Random = newValue()
   }))
   def withWebsocketSettings(newValue: WebSocketSettings): ServerSettings = self.copy(websocketSettings = newValue)
@@ -126,11 +126,11 @@ abstract class ServerSettings private[akka] () extends akka.http.javadsl.setting
   def withHttp2Settings(newValue: Http2ServerSettings): ServerSettings = copy(http2Settings = newValue)
 
   // Scala-only lenses
-  def mapHttp2Settings(f: Http2ServerSettings => Http2ServerSettings): ServerSettings = withHttp2Settings(f(http2Settings))
-  def mapParserSettings(f: ParserSettings => ParserSettings): ServerSettings = withParserSettings(f(parserSettings))
-  def mapPreviewServerSettings(f: PreviewServerSettings => PreviewServerSettings): ServerSettings = withPreviewServerSettings(f(previewServerSettings))
-  def mapWebsocketSettings(f: WebSocketSettings => WebSocketSettings): ServerSettings = withWebsocketSettings(f(websocketSettings))
-  def mapTimeouts(f: ServerSettings.Timeouts => ServerSettings.Timeouts): ServerSettings = withTimeouts(f(timeouts))
+  def mapHttp2Settings(f: Http2ServerSettings => Http2ServerSettings): ServerSettings = withHttp2Settings(f(this.http2Settings))
+  def mapParserSettings(f: ParserSettings => ParserSettings): ServerSettings = withParserSettings(f(this.parserSettings))
+  def mapPreviewServerSettings(f: PreviewServerSettings => PreviewServerSettings): ServerSettings = withPreviewServerSettings(f(this.previewServerSettings))
+  def mapWebsocketSettings(f: WebSocketSettings => WebSocketSettings): ServerSettings = withWebsocketSettings(f(this.websocketSettings))
+  def mapTimeouts(f: ServerSettings.Timeouts => ServerSettings.Timeouts): ServerSettings = withTimeouts(f(this.timeouts))
 
   /**
    * INTERNAL API
diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/WebSocketSettings.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/WebSocketSettings.scala
index d1578f526..54aebb5a9 100644
--- a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/WebSocketSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/WebSocketSettings.scala
@@ -16,7 +16,7 @@ import scala.concurrent.duration._
 abstract class WebSocketSettings extends akka.http.javadsl.settings.WebSocketSettings { self: WebSocketSettingsImpl =>
   def randomFactory: () => Random
   override final val getRandomFactory: Supplier[Random] = new Supplier[Random] {
-    override def get(): Random = randomFactory()
+    override def get(): Random = self.randomFactory()
   }
   override def periodicKeepAliveMode: String
   override def periodicKeepAliveMaxIdle: Duration
@@ -27,7 +27,7 @@ abstract class WebSocketSettings extends akka.http.javadsl.settings.WebSocketSet
    */
   def periodicKeepAliveData: () => ByteString
   final def getPeriodicKeepAliveData: Supplier[ByteString] = new Supplier[ByteString] {
-    override def get(): ByteString = periodicKeepAliveData()
+    override def get(): ByteString = self.periodicKeepAliveData()
   }
 
   override def withRandomFactoryFactory(newValue: Supplier[Random]): WebSocketSettings =
diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/HostConnectionPoolSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HostConnectionPoolSpec.scala
index 2a1224e63..cf1c35a3f 100644
--- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/HostConnectionPoolSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/HostConnectionPoolSpec.scala
@@ -542,7 +542,7 @@ class HostConnectionPoolSpec extends AkkaSpecWithMaterializer(
         lazy val requestIn = TestPublisher.probe[RequestContext]()
         lazy val responseOut = TestSubscriber.probe[ResponseContext]()
 
-        protected val server: Flow[HttpRequest, HttpResponse, Future[Http.OutgoingConnection]]
+        protected def server: Flow[HttpRequest, HttpResponse, Future[Http.OutgoingConnection]]
 
         protected def settings: ConnectionPoolSettings
 
@@ -699,7 +699,7 @@ class HostConnectionPoolSpec extends AkkaSpecWithMaterializer(
           connection.acceptConnectionPromise.future
         }
 
-        protected override lazy val server =
+        protected override lazy val server: Flow[HttpRequest, HttpResponse, Future[Http.OutgoingConnection]] =
           Flow.fromSinkAndSourceMat(
             // buffer is needed because the async subscriber/publisher boundary will otherwise request > 1
             Flow[HttpRequest].buffer(1, OverflowStrategy.backpressure)
diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ResponseParserSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ResponseParserSpec.scala
index dd643a514..f2138e643 100644
--- a/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ResponseParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/impl/engine/parsing/ResponseParserSpec.scala
@@ -386,7 +386,7 @@ abstract class ResponseParserSpec(mode: String, newLine: String) extends AkkaSpe
       generalRawMultiParseTo(GET, expected: _*)
     def generalRawMultiParseTo(requestMethod: HttpMethod, expected: Either[ResponseOutput, HttpResponse]*): Matcher[Seq[String]] =
       equal(expected.map(strictEqualify))
-        .matcher[Seq[Either[ResponseOutput, StrictEqualHttpResponse]]] compose { input: Seq[String] =>
+        .matcher[Seq[Either[ResponseOutput, StrictEqualHttpResponse]]] compose { (input: Seq[String]) =>
           collectBlocking {
             rawParse(requestMethod, input: _*)
               .mapAsync(1) {
diff --git a/akka-http-core/src/test/scala/akka/http/scaladsl/model/DateTimeSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/DateTimeSpec.scala
index 24a4cee79..8eb00aed2 100644
--- a/akka-http-core/src/test/scala/akka/http/scaladsl/model/DateTimeSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/DateTimeSpec.scala
@@ -33,7 +33,7 @@ class DateTimeSpec extends AnyWordSpec with Matchers {
         fmt
       }
       def rfc1123Format(dt: DateTime) = Rfc1123Format.format(new java.util.Date(dt.clicks))
-      val matchSimpleDateFormat: Matcher[DateTime] = Matcher { dt: DateTime =>
+      val matchSimpleDateFormat: Matcher[DateTime] = Matcher { (dt: DateTime) =>
         MatchResult(
           dt.toRfc1123DateTimeString == rfc1123Format(dt),
           dt.toRfc1123DateTimeString + " != " + rfc1123Format(dt),
@@ -79,7 +79,7 @@ class DateTimeSpec extends AnyWordSpec with Matchers {
   "The two DateTime implementations" should {
     "allow for transparent round-trip conversions" in {
       def roundTrip(dt: DateTime) = DateTime(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
-      val roundTripOk: Matcher[DateTime] = Matcher { dt: DateTime =>
+      val roundTripOk: Matcher[DateTime] = Matcher { (dt: DateTime) =>
         MatchResult(
           { val rt = roundTrip(dt); dt == rt && dt.weekday == rt.weekday },
           dt.toRfc1123DateTimeString + " != " + roundTrip(dt).toRfc1123DateTimeString,
diff --git a/akka-http-core/src/test/scala/akka/http/scaladsl/model/HttpEntitySpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/model/HttpEntitySpec.scala
index 0fc03f6f3..b6c6bd730 100755
--- a/akka-http-core/src/test/scala/akka/http/scaladsl/model/HttpEntitySpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/scaladsl/model/HttpEntitySpec.scala
@@ -273,7 +273,7 @@ class HttpEntitySpec extends AkkaSpecWithMaterializer {
     }
 
   def renderStrictDataAs(dataRendering: String): Matcher[Strict] =
-    Matcher { strict: Strict =>
+    Matcher { (strict: Strict) =>
       val expectedRendering = s"${strict.productPrefix}(${strict.contentType},$dataRendering)"
       MatchResult(
         strict.toString == expectedRendering,
diff --git a/build.sbt b/build.sbt
index 6e2616907..8fd0ae41e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -164,7 +164,6 @@ lazy val httpCore = project("akka-http-core")
       if (System.getProperty("akka.http.test-against-akka-main", "false") == "true") AkkaDependency.masterSnapshot
       else AkkaDependency.default
   )
-  .settings(scala3MigrationModeOption)
   .settings(Dependencies.httpCore)
   .settings(VersionGenerator.versionSettings)
   .settings(scalaMacroSupport)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org