diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9fc64d688..eb2550965 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -16,3 +16,6 @@ a904e917d5851ebffc5e1eabbee70cf1685c4263 # Scala Steward: Reformat with scalafmt 3.10.4 3a1f225850c219c27f8f1b30699aec4eea45923e + +# Scala Steward: Reformat with scalafmt 3.10.5 +66cba5fda8ea1213f1ee8d0732f25d1fc44aecdd diff --git a/.scalafmt.conf b/.scalafmt.conf index e50fb66f9..011ead25c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.10.4 +version = 3.10.5 runner.dialect = scala213 project.git = true style = defaultWithAlign diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/MessageToFrameRendererBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/MessageToFrameRendererBenchmark.scala index 0e6feeb48..8490803eb 100644 --- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/MessageToFrameRendererBenchmark.scala +++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/MessageToFrameRendererBenchmark.scala @@ -23,7 +23,14 @@ import scala.concurrent.Await import scala.concurrent.duration.{ Duration, DurationInt } import org.openjdk.jmh.annotations.{ - Benchmark, BenchmarkMode, Mode, OperationsPerInvocation, OutputTimeUnit, Scope, State, TearDown + Benchmark, + BenchmarkMode, + Mode, + OperationsPerInvocation, + OutputTimeUnit, + Scope, + State, + TearDown } import org.apache.pekko diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2RequestResponseBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2RequestResponseBenchmark.scala index 14487abc3..989719210 100644 --- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2RequestResponseBenchmark.scala +++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2RequestResponseBenchmark.scala @@ -19,7 +19,13 @@ import org.apache.pekko import pekko.http.impl.engine.http2.FrameEvent.{ DataFrame, HeadersFrame } import pekko.http.impl.engine.http2.framing.FrameRenderer import pekko.http.scaladsl.model.{ - AttributeKeys, ContentTypes, HttpEntity, HttpMethods, HttpRequest, HttpResponse, Trailer + AttributeKeys, + ContentTypes, + HttpEntity, + HttpMethods, + HttpRequest, + HttpResponse, + Trailer } import pekko.http.scaladsl.model.HttpEntity.{ Chunk, LastChunk } import pekko.http.scaladsl.model.headers.RawHeader diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/PoolMasterActor.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/PoolMasterActor.scala index fc599e9ec..86e4e6729 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/PoolMasterActor.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/PoolMasterActor.scala @@ -16,7 +16,13 @@ package org.apache.pekko.http.impl.engine.client import org.apache.pekko import pekko.Done import pekko.actor.{ - Actor, ActorLogging, ActorRef, DeadLetterSuppression, Deploy, ExtendedActorSystem, NoSerializationVerificationNeeded, + Actor, + ActorLogging, + ActorRef, + DeadLetterSuppression, + Deploy, + ExtendedActorSystem, + NoSerializationVerificationNeeded, Props } import pekko.annotation.InternalApi diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2.scala index a4ff5255c..2cdb6a42c 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2.scala @@ -15,13 +15,21 @@ package org.apache.pekko.http.impl.engine.http2 import org.apache.pekko import pekko.actor.{ - ActorSystem, ClassicActorSystemProvider, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider + ActorSystem, + ClassicActorSystemProvider, + ExtendedActorSystem, + Extension, + ExtensionId, + ExtensionIdProvider } import pekko.annotation.InternalApi import pekko.event.LoggingAdapter import pekko.http.impl.engine.HttpConnectionIdleTimeoutBidi import pekko.http.impl.engine.server.{ - GracefulTerminatorStage, MasterServerTerminator, ServerTerminator, UpgradeToOtherProtocolResponseHeader + GracefulTerminatorStage, + MasterServerTerminator, + ServerTerminator, + UpgradeToOtherProtocolResponseHeader } import pekko.http.impl.util.LogByteStringTools import pekko.http.scaladsl.Http.OutgoingConnection diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Blueprint.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Blueprint.scala index 2a86ded7d..3b14c0b86 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Blueprint.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Blueprint.scala @@ -29,7 +29,11 @@ import pekko.http.impl.util.LogByteStringTools.logTLSBidiBySetting import pekko.http.impl.util.StreamUtils import pekko.http.scaladsl.model._ import pekko.http.scaladsl.settings.{ - ClientConnectionSettings, Http2ClientSettings, Http2ServerSettings, ParserSettings, ServerSettings + ClientConnectionSettings, + Http2ClientSettings, + Http2ServerSettings, + ParserSettings, + ServerSettings } import pekko.stream.{ BidiShape, Graph, StreamTcpException, ThrottleMode } import pekko.stream.TLSProtocol._ diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Demux.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Demux.scala index 8cad00855..2ad364dd3 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Demux.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Demux.scala @@ -34,7 +34,12 @@ import pekko.stream.Inlet import pekko.stream.Outlet import pekko.stream.scaladsl.Source import pekko.stream.stage.{ - GraphStageLogic, GraphStageWithMaterializedValue, InHandler, OutHandler, StageLogging, TimerGraphStageLogic + GraphStageLogic, + GraphStageWithMaterializedValue, + InHandler, + OutHandler, + StageLogging, + TimerGraphStageLogic } import pekko.util.ByteString import pekko.util.OptionVal diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParser.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParser.scala index a5d8b9468..7bfc0dc25 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParser.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParser.scala @@ -28,7 +28,9 @@ import pekko.http.impl.util.HttpConstants._ import pekko.http.scaladsl.model.{ ErrorInfo, HttpHeader, MediaTypes, StatusCode, StatusCodes } import pekko.http.scaladsl.model.headers.{ EmptyHeader, RawHeader } import pekko.http.scaladsl.settings.ParserSettings.{ - ErrorLoggingVerbosity, IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode + ErrorLoggingVerbosity, + IllegalResponseHeaderNameProcessingMode, + IllegalResponseHeaderValueProcessingMode } import pekko.util.ByteString diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/server/HttpServerBluePrint.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/server/HttpServerBluePrint.scala index 9105a37db..886a3b9d1 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/server/HttpServerBluePrint.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/server/HttpServerBluePrint.scala @@ -32,7 +32,10 @@ import pekko.http.impl.engine.parsing.ParserOutput._ import pekko.http.impl.engine.parsing._ import pekko.http.impl.engine.rendering.ResponseRenderingContext.CloseRequested import pekko.http.impl.engine.rendering.{ - DateHeaderRendering, HttpResponseRendererFactory, ResponseRenderingContext, ResponseRenderingOutput + DateHeaderRendering, + HttpResponseRendererFactory, + ResponseRenderingContext, + ResponseRenderingOutput } import pekko.http.impl.util._ import pekko.http.javadsl.model diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/model/parser/HeaderParser.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/model/parser/HeaderParser.scala index 9a611aa72..e82c6aafc 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/model/parser/HeaderParser.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/model/parser/HeaderParser.scala @@ -18,7 +18,8 @@ import pekko.annotation.InternalApi import pekko.http.scaladsl.settings.ParserSettings import pekko.http.scaladsl.settings.ParserSettings.CookieParsingMode import pekko.http.scaladsl.settings.ParserSettings.{ - IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode + IllegalResponseHeaderNameProcessingMode, + IllegalResponseHeaderValueProcessingMode } import pekko.http.scaladsl.model.headers.HttpCookiePair import pekko.util.ConstantFun diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala index 08079cae7..f6958dc0f 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/settings/ParserSettingsImpl.scala @@ -18,8 +18,11 @@ import org.apache.pekko import pekko.annotation.InternalApi import pekko.http.impl.util._ import pekko.http.scaladsl.settings.ParserSettings.{ - ConflictingContentTypeHeaderProcessingMode, CookieParsingMode, ErrorLoggingVerbosity, - IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode + ConflictingContentTypeHeaderProcessingMode, + CookieParsingMode, + ErrorLoggingVerbosity, + IllegalResponseHeaderNameProcessingMode, + IllegalResponseHeaderValueProcessingMode } import pekko.http.scaladsl.model._ import pekko.http.scaladsl.settings.ParserSettings diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala index fdce20b52..4235cca31 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/util/JavaMapping.scala @@ -26,7 +26,11 @@ import pekko.NotUsed import pekko.annotation.InternalApi import pekko.http.impl.model.{ JavaQuery, JavaUri } import pekko.http.javadsl.{ - model => jm, settings => js, ConnectionContext, HttpConnectionContext, HttpsConnectionContext + model => jm, + settings => js, + ConnectionContext, + HttpConnectionContext, + HttpsConnectionContext } import pekko.http.{ javadsl => jdsl, scaladsl => sdsl } import pekko.http.scaladsl.{ model => sm } diff --git a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HttpConfigurationSpec.scala b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HttpConfigurationSpec.scala index e6693379a..a23cd996b 100644 --- a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HttpConfigurationSpec.scala +++ b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HttpConfigurationSpec.scala @@ -16,7 +16,11 @@ package org.apache.pekko.http.impl.engine.client import org.apache.pekko import pekko.actor.ActorSystem import pekko.http.scaladsl.settings.{ - ClientConnectionSettings, ConnectionPoolSettings, HttpsProxySettings, ParserSettings, ServerSettings + ClientConnectionSettings, + ConnectionPoolSettings, + HttpsProxySettings, + ParserSettings, + ServerSettings } import pekko.testkit.PekkoSpec import com.typesafe.config.ConfigFactory diff --git a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/NewConnectionPoolSpec.scala b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/NewConnectionPoolSpec.scala index 0ba979a7a..c3d8e3843 100644 --- a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/NewConnectionPoolSpec.scala +++ b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/NewConnectionPoolSpec.scala @@ -26,7 +26,11 @@ import pekko.http.impl.engine.server.ServerTerminator import pekko.http.impl.engine.ws.ByteStringSinkProbe import pekko.http.impl.util._ import pekko.http.scaladsl.Http.{ - HostConnectionPool, HostConnectionPoolImpl, HttpServerTerminated, HttpTerminated, OutgoingConnection + HostConnectionPool, + HostConnectionPoolImpl, + HttpServerTerminated, + HttpTerminated, + OutgoingConnection } import pekko.http.scaladsl.model.HttpEntity.{ Chunk, ChunkStreamPart, Chunked, LastChunk } import pekko.http.scaladsl.model.{ HttpEntity, _ } diff --git a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/PrepareResponseSpec.scala b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/PrepareResponseSpec.scala index 243201596..614298a8e 100644 --- a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/PrepareResponseSpec.scala +++ b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/PrepareResponseSpec.scala @@ -17,7 +17,10 @@ import org.apache.pekko import pekko.http.impl.engine.client.OutgoingConnectionBlueprint.PrepareResponse import pekko.http.impl.engine.parsing.ParserOutput import pekko.http.impl.engine.parsing.ParserOutput.{ - EntityChunk, EntityStreamError, StreamedEntityCreator, StrictEntityCreator + EntityChunk, + EntityStreamError, + StreamedEntityCreator, + StrictEntityCreator } import pekko.http.scaladsl.model._ import pekko.http.scaladsl.settings.ParserSettings diff --git a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParserSpec.scala b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParserSpec.scala index c637ff296..279f4f868 100644 --- a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParserSpec.scala +++ b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/parsing/HttpHeaderParserSpec.scala @@ -28,7 +28,8 @@ import pekko.http.scaladsl.model.headers._ import pekko.http.impl.model.parser.CharacterClasses import pekko.http.impl.util._ import pekko.http.scaladsl.settings.ParserSettings.{ - IllegalResponseHeaderNameProcessingMode, IllegalResponseHeaderValueProcessingMode + IllegalResponseHeaderNameProcessingMode, + IllegalResponseHeaderValueProcessingMode } import pekko.testkit.EventFilter diff --git a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/server/PrepareRequestsSpec.scala b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/server/PrepareRequestsSpec.scala index 5a8b5382f..fd7841dad 100644 --- a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/server/PrepareRequestsSpec.scala +++ b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/server/PrepareRequestsSpec.scala @@ -16,7 +16,10 @@ package org.apache.pekko.http.impl.engine.server import org.apache.pekko import pekko.http.impl.engine.parsing.ParserOutput import pekko.http.impl.engine.parsing.ParserOutput.{ - EntityChunk, EntityStreamError, StreamedEntityCreator, StrictEntityCreator + EntityChunk, + EntityStreamError, + StreamedEntityCreator, + StrictEntityCreator } import pekko.http.impl.engine.server.HttpServerBluePrint.PrepareRequests import pekko.http.scaladsl.model._ diff --git a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala index 2d7cf7bd9..172dd1ed1 100644 --- a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala +++ b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala @@ -479,8 +479,18 @@ class MockFailingWritePath extends java.nio.file.Path { selfPath => import java.nio.{ ByteBuffer, MappedByteBuffer } import java.nio.channels.{ FileChannel, FileLock, ReadableByteChannel, SeekableByteChannel, WritableByteChannel } import java.nio.file.{ - AccessMode, CopyOption, DirectoryStream, FileStore, FileSystem, LinkOption, OpenOption, Path, PathMatcher, - WatchEvent, WatchKey, WatchService + AccessMode, + CopyOption, + DirectoryStream, + FileStore, + FileSystem, + LinkOption, + OpenOption, + Path, + PathMatcher, + WatchEvent, + WatchKey, + WatchService } import java.nio.file.attribute.{ BasicFileAttributes, FileAttribute, FileAttributeView, UserPrincipalLookupService } import java.nio.file.spi.FileSystemProvider diff --git a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectivesSpec.scala b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectivesSpec.scala index 2e293f242..ad993b9ba 100644 --- a/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectivesSpec.scala +++ b/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectivesSpec.scala @@ -18,7 +18,10 @@ import pekko.http.scaladsl.model.StatusCodes import pekko.http.scaladsl.model.headers.`Sec-WebSocket-Protocol` import pekko.http.scaladsl.model.ws._ import pekko.http.scaladsl.server.{ - ExpectedWebSocketRequestRejection, Route, RoutingSpec, UnsupportedWebSocketSubprotocolRejection + ExpectedWebSocketRequestRejection, + Route, + RoutingSpec, + UnsupportedWebSocketSubprotocolRejection } import pekko.http.scaladsl.testkit.WSProbe import pekko.stream.OverflowStrategy diff --git a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/BasicDirectives.scala b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/BasicDirectives.scala index 9fe206d57..72b714273 100644 --- a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/BasicDirectives.scala +++ b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/BasicDirectives.scala @@ -33,7 +33,13 @@ import pekko.http.impl.model.JavaUri import pekko.http.impl.util.JavaMapping import pekko.http.impl.util.Util.convertIterable import pekko.http.javadsl.model.{ - HttpEntity, HttpHeader, HttpRequest, HttpResponse, RequestEntity, ResponseEntity, Uri + HttpEntity, + HttpHeader, + HttpRequest, + HttpResponse, + RequestEntity, + ResponseEntity, + Uri } import pekko.http.javadsl.server import pekko.http.javadsl.server._ diff --git a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/RouteDirectives.scala b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/RouteDirectives.scala index b1972828a..3d31c7f66 100644 --- a/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/RouteDirectives.scala +++ b/http/src/main/scala/org/apache/pekko/http/javadsl/server/directives/RouteDirectives.scala @@ -22,7 +22,13 @@ import org.apache.pekko import pekko.http.impl.model.JavaUri import pekko.http.javadsl.marshalling.Marshaller import pekko.http.javadsl.model.{ - HttpHeader, HttpRequest, HttpResponse, RequestEntity, ResponseEntity, StatusCode, Uri + HttpHeader, + HttpRequest, + HttpResponse, + RequestEntity, + ResponseEntity, + StatusCode, + Uri } import pekko.http.javadsl.server.{ Rejection, Route, RoutingJavaMapping } import pekko.http.javadsl.server.RoutingJavaMapping._ diff --git a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientServerSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientServerSpec.scala index 7a5dd9873..75c8d9f5f 100644 --- a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientServerSpec.scala +++ b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientServerSpec.scala @@ -23,8 +23,19 @@ import pekko.http.impl.engine.ws.ByteStringSinkProbe import pekko.http.impl.util.{ ExampleHttpContexts, PekkoSpecWithMaterializer } import pekko.http.scaladsl.Http import pekko.http.scaladsl.model.{ - headers, AttributeKey, ContentTypes, HttpEntity, HttpHeader, HttpMethod, HttpMethods, HttpRequest, HttpResponse, - RequestResponseAssociation, StatusCode, StatusCodes, Uri + headers, + AttributeKey, + ContentTypes, + HttpEntity, + HttpHeader, + HttpMethod, + HttpMethods, + HttpRequest, + HttpResponse, + RequestResponseAssociation, + StatusCode, + StatusCodes, + Uri } import pekko.http.scaladsl.model.headers.HttpEncodings import pekko.http.scaladsl.settings.ClientConnectionSettings diff --git a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala index 64c438220..d17c0185f 100644 --- a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala +++ b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala @@ -40,7 +40,11 @@ import pekko.http.scaladsl.model.HttpEntity.Chunked import pekko.http.scaladsl.model.HttpEntity.LastChunk import pekko.http.scaladsl.model.HttpMethods.GET import pekko.http.scaladsl.model.headers.{ - `Access-Control-Allow-Origin`, `Cache-Control`, `Content-Length`, `Content-Type`, RawHeader + `Access-Control-Allow-Origin`, + `Cache-Control`, + `Content-Length`, + `Content-Type`, + RawHeader } import pekko.http.scaladsl.model.headers.CacheDirectives._ import pekko.http.scaladsl.settings.ClientConnectionSettings diff --git a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameSending.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameSending.scala index fa83b372d..7d84fd572 100644 --- a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameSending.scala +++ b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameSending.scala @@ -17,7 +17,12 @@ import java.nio.ByteOrder import org.apache.pekko import pekko.http.impl.engine.http2.FrameEvent.{ - ContinuationFrame, HeadersFrame, PriorityFrame, Setting, SettingsFrame, WindowUpdateFrame + ContinuationFrame, + HeadersFrame, + PriorityFrame, + Setting, + SettingsFrame, + WindowUpdateFrame } import pekko.http.impl.engine.http2.Http2Protocol.{ ErrorCode, Flags, FrameType, SettingIdentifier } import pekko.http.impl.engine.http2.framing.FrameRenderer diff --git a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2PersistentClientSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2PersistentClientSpec.scala index 338080a29..b9e25cfb6 100644 --- a/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2PersistentClientSpec.scala +++ b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2PersistentClientSpec.scala @@ -26,8 +26,20 @@ import pekko.http.impl.engine.ws.ByteStringSinkProbe import pekko.http.impl.util.{ ExampleHttpContexts, PekkoSpecWithMaterializer } import pekko.http.scaladsl.{ ClientTransport, Http } import pekko.http.scaladsl.model.{ - headers, AttributeKey, AttributeKeys, ContentTypes, HttpEntity, HttpHeader, HttpMethod, HttpMethods, HttpRequest, - HttpResponse, RequestResponseAssociation, StatusCode, StatusCodes, Uri + headers, + AttributeKey, + AttributeKeys, + ContentTypes, + HttpEntity, + HttpHeader, + HttpMethod, + HttpMethods, + HttpRequest, + HttpResponse, + RequestResponseAssociation, + StatusCode, + StatusCodes, + Uri } import pekko.http.scaladsl.model.headers.HttpEncodings import pekko.http.scaladsl.settings.ClientConnectionSettings