From ce5a9556475a96c65663623017068a41b94790f4 Mon Sep 17 00:00:00 2001 From: Jiafu Tang Date: Thu, 21 Dec 2023 20:57:10 +0800 Subject: [PATCH 1/4] [Chore] remove unused import --- .../org/apache/pekko/http/javadsl/model/HttpRequest.java | 5 ----- .../main/java/org/apache/pekko/http/javadsl/model/Query.java | 2 -- .../org/apache/pekko/http/javadsl/model/RemoteAddress.java | 1 - .../apache/pekko/http/impl/engine/http2/FrameLogger.scala | 1 - .../pekko/http/impl/engine/http2/Http2Multiplexer.scala | 1 - .../apache/pekko/http/impl/engine/http2/PriorityTree.scala | 1 - .../pekko/http/impl/engine/parsing/HttpHeaderParser.scala | 1 - .../http/impl/util/EnhancedByteStringTraversableOnce.scala | 1 - .../pekko/http/cors/scaladsl/model/HttpHeaderRange.scala | 2 -- .../pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala | 2 -- .../pekko/http/cors/scaladsl/settings/CorsSettings.scala | 1 - .../pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala | 2 -- .../pekko/http/javadsl/unmarshalling/Unmarshallers.java | 2 -- .../org/apache/pekko/http/scaladsl/server/Directives.scala | 1 - project/CopyrightHeader.scala | 1 - 15 files changed, 24 deletions(-) diff --git a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/HttpRequest.java b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/HttpRequest.java index 60deb8995..8d82d87c9 100644 --- a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/HttpRequest.java +++ b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/HttpRequest.java @@ -13,12 +13,7 @@ package org.apache.pekko.http.javadsl.model; -import org.apache.pekko.Done; import org.apache.pekko.http.impl.util.JavaAccessors; -import org.apache.pekko.stream.Materializer; -import org.apache.pekko.stream.javadsl.Sink; - -import java.util.concurrent.CompletionStage; /** Represents an Http request. */ public abstract class HttpRequest diff --git a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/Query.java b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/Query.java index ac1e5a822..3f3042c93 100644 --- a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/Query.java +++ b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/Query.java @@ -15,8 +15,6 @@ import org.apache.pekko.http.impl.model.JavaQuery; import org.apache.pekko.http.impl.model.UriJavaAccessor; -import org.apache.pekko.http.scaladsl.model.*; -import org.apache.pekko.http.javadsl.model.HttpCharset; import org.apache.pekko.japi.Pair; import org.parboiled2.CharPredicate; import org.parboiled2.ParserInput$; diff --git a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java index 6399afe16..e5d2ebf0e 100644 --- a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java +++ b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/RemoteAddress.java @@ -17,7 +17,6 @@ import java.net.InetSocketAddress; import java.util.Optional; -import org.apache.pekko.http.javadsl.model.headers.HttpEncodingRanges; import org.apache.pekko.util.OptionConverters; public abstract class RemoteAddress { diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala index 14c46b4e4..0a83f729a 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala @@ -19,7 +19,6 @@ import pekko.annotation.InternalApi import pekko.stream.scaladsl.{ BidiFlow, Flow } import pekko.util.ByteString -import scala.collection.immutable.Seq import FrameEvent._ import pekko.event.Logging import pekko.stream.Attributes diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala index 808f7ef29..bab483f14 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala @@ -14,7 +14,6 @@ package org.apache.pekko.http.impl.engine.http2 import org.apache.pekko -import pekko.http.ccompat._ import pekko.annotation.InternalApi import pekko.event.LoggingAdapter diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala index 5824fdaed..0f6999b62 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala @@ -16,7 +16,6 @@ package org.apache.pekko.http.impl.engine.http2 import org.apache.pekko import pekko.annotation.InternalApi import pekko.http.impl.engine.http2.util.AsciiTreeLayout -import pekko.http.ccompat.imm._ import scala.collection.immutable import scala.collection.immutable.{ TreeMap, TreeSet } 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 8e00dd545..371db7cf9 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 @@ -29,7 +29,6 @@ import pekko.http.scaladsl.settings.ParserSettings import scala.annotation.tailrec import pekko.util.ByteString -import pekko.http.ccompat._ import pekko.http.impl.util._ import pekko.http.scaladsl.model.{ ErrorInfo, HttpHeader, MediaTypes, StatusCode, StatusCodes } import pekko.http.scaladsl.model.headers.{ EmptyHeader, RawHeader } diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala index 96bfd63c6..56c9bdec7 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala @@ -15,7 +15,6 @@ package org.apache.pekko.http.impl.util import org.apache.pekko import pekko.annotation.InternalApi -import pekko.http.ccompat._ import pekko.util.ByteString /** diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala index 3b7bdfa4e..ff83e1e11 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala @@ -21,8 +21,6 @@ import org.apache.pekko import pekko.http.cors.javadsl import pekko.util.Helpers -import scala.collection.immutable.Seq - abstract class HttpHeaderRange extends javadsl.model.HttpHeaderRange object HttpHeaderRange { diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala index 91c5e10ca..7da79d4bf 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala @@ -22,8 +22,6 @@ import pekko.http.javadsl.{ model => jm } import pekko.http.scaladsl.model.headers.HttpOrigin import pekko.http.cors.javadsl -import scala.collection.immutable.Seq - /** * HttpOrigin matcher. */ diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala index d06e34f2a..de538a953 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala @@ -34,7 +34,6 @@ import com.typesafe.config.ConfigException.{ Missing, WrongType } import com.typesafe.config.{ Config, ConfigFactory } import scala.collection.JavaConverters._ -import scala.collection.immutable.Seq import scala.util.Try /** diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala index a1774c074..aa1dff0df 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala @@ -22,8 +22,6 @@ import pekko.http.scaladsl.model.{ HttpHeader, HttpMethod } import pekko.http.scaladsl.model.headers._ import pekko.http.cors.scaladsl.model.{ HttpHeaderRange, HttpOriginMatcher } -import scala.collection.immutable.Seq - /** INTERNAL API */ final private[pekko] case class CorsSettingsImpl( allowGenericHttpRequests: Boolean, diff --git a/http/src/main/java/org/apache/pekko/http/javadsl/unmarshalling/Unmarshallers.java b/http/src/main/java/org/apache/pekko/http/javadsl/unmarshalling/Unmarshallers.java index 05acccb2b..adc19fec0 100644 --- a/http/src/main/java/org/apache/pekko/http/javadsl/unmarshalling/Unmarshallers.java +++ b/http/src/main/java/org/apache/pekko/http/javadsl/unmarshalling/Unmarshallers.java @@ -13,8 +13,6 @@ package org.apache.pekko.http.javadsl.unmarshalling; -import java.util.function.Function; - public interface Unmarshallers { /** Creates an unmarshaller from an asynchronous Java function. */ // #unmarshaller-creation diff --git a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Directives.scala b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Directives.scala index 4fd1074e1..5086ec211 100644 --- a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Directives.scala +++ b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Directives.scala @@ -13,7 +13,6 @@ package org.apache.pekko.http.scaladsl.server -import org.apache.pekko import directives._ /** diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala index f14a259a6..cafee79d9 100644 --- a/project/CopyrightHeader.scala +++ b/project/CopyrightHeader.scala @@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils object CopyrightHeader extends AutoPlugin { import HeaderPlugin.autoImport._ - import ValidatePullRequest.{ additionalTasks, ValidatePR } override def requires = HeaderPlugin override def trigger = allRequirements From c48367568022b1a7eca51b4c9f005c9aee4b73c1 Mon Sep 17 00:00:00 2001 From: Jiafu Tang Date: Thu, 21 Dec 2023 21:20:33 +0800 Subject: [PATCH 2/4] [Chore] remove unused import --- .../apache/pekko/http/shaded/com/twitter/hpack/StaticTable.java | 2 -- .../org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala | 2 -- .../org/apache/pekko/http/cors/scaladsl/CorsRejection.scala | 1 - 3 files changed, 5 deletions(-) diff --git a/http-core/src/main/java/org/apache/pekko/http/shaded/com/twitter/hpack/StaticTable.java b/http-core/src/main/java/org/apache/pekko/http/shaded/com/twitter/hpack/StaticTable.java index e67512ec3..b08660c3f 100644 --- a/http-core/src/main/java/org/apache/pekko/http/shaded/com/twitter/hpack/StaticTable.java +++ b/http-core/src/main/java/org/apache/pekko/http/shaded/com/twitter/hpack/StaticTable.java @@ -36,8 +36,6 @@ import java.util.List; import java.util.Map; -import static org.apache.pekko.http.shaded.com.twitter.hpack.HpackUtil.ISO_8859_1; - final class StaticTable { private static final String EMPTY = ""; diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala index 6f4c63547..8d87a4553 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala @@ -27,8 +27,6 @@ import pekko.http.cors.javadsl import pekko.http.cors.scaladsl.model.HttpOriginMatcher import pekko.http.cors.scaladsl.settings.CorsSettings -import scala.collection.immutable.Seq - /** * Provides directives that implement the CORS mechanism, enabling cross origin requests. * diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala index 2f1cb5106..031eeaa24 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala @@ -26,7 +26,6 @@ import pekko.http.cors.javadsl import java.util import scala.collection.JavaConverters._ -import scala.collection.immutable.Seq /** * Rejection created by the CORS directives. Signal the CORS request was rejected. The reason of the rejection is From 34bb35bfbde2f9815ce4134b9130c844abc8ffd3 Mon Sep 17 00:00:00 2001 From: Jiafu Tang Date: Thu, 21 Dec 2023 21:51:09 +0800 Subject: [PATCH 3/4] revert `pekko.http.ccompat._` --- .../apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala | 1 + .../org/apache/pekko/http/impl/engine/http2/PriorityTree.scala | 1 + .../apache/pekko/http/impl/engine/parsing/HttpHeaderParser.scala | 1 + .../pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala | 1 + 4 files changed, 4 insertions(+) diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala index bab483f14..808f7ef29 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2Multiplexer.scala @@ -14,6 +14,7 @@ package org.apache.pekko.http.impl.engine.http2 import org.apache.pekko +import pekko.http.ccompat._ import pekko.annotation.InternalApi import pekko.event.LoggingAdapter diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala index 0f6999b62..5824fdaed 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/PriorityTree.scala @@ -16,6 +16,7 @@ package org.apache.pekko.http.impl.engine.http2 import org.apache.pekko import pekko.annotation.InternalApi import pekko.http.impl.engine.http2.util.AsciiTreeLayout +import pekko.http.ccompat.imm._ import scala.collection.immutable import scala.collection.immutable.{ TreeMap, TreeSet } 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 371db7cf9..8e00dd545 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 @@ -29,6 +29,7 @@ import pekko.http.scaladsl.settings.ParserSettings import scala.annotation.tailrec import pekko.util.ByteString +import pekko.http.ccompat._ import pekko.http.impl.util._ import pekko.http.scaladsl.model.{ ErrorInfo, HttpHeader, MediaTypes, StatusCode, StatusCodes } import pekko.http.scaladsl.model.headers.{ EmptyHeader, RawHeader } diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala index 56c9bdec7..96bfd63c6 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/util/EnhancedByteStringTraversableOnce.scala @@ -15,6 +15,7 @@ package org.apache.pekko.http.impl.util import org.apache.pekko import pekko.annotation.InternalApi +import pekko.http.ccompat._ import pekko.util.ByteString /** From 9572b00a233908892232853b53956f6a3f6e2b1b Mon Sep 17 00:00:00 2001 From: Jiafu Tang Date: Sat, 23 Dec 2023 12:27:27 +0800 Subject: [PATCH 4/4] revert seq imports --- .../org/apache/pekko/http/impl/engine/http2/FrameLogger.scala | 1 + .../org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala | 2 ++ .../org/apache/pekko/http/cors/scaladsl/CorsRejection.scala | 1 + .../apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala | 2 ++ .../pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala | 2 ++ .../apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala | 1 + .../pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala | 2 ++ 7 files changed, 11 insertions(+) diff --git a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala index 0a83f729a..14c46b4e4 100644 --- a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala +++ b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/FrameLogger.scala @@ -19,6 +19,7 @@ import pekko.annotation.InternalApi import pekko.stream.scaladsl.{ BidiFlow, Flow } import pekko.util.ByteString +import scala.collection.immutable.Seq import FrameEvent._ import pekko.event.Logging import pekko.stream.Attributes diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala index 8d87a4553..6f4c63547 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsDirectives.scala @@ -27,6 +27,8 @@ import pekko.http.cors.javadsl import pekko.http.cors.scaladsl.model.HttpOriginMatcher import pekko.http.cors.scaladsl.settings.CorsSettings +import scala.collection.immutable.Seq + /** * Provides directives that implement the CORS mechanism, enabling cross origin requests. * diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala index 031eeaa24..2f1cb5106 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/CorsRejection.scala @@ -26,6 +26,7 @@ import pekko.http.cors.javadsl import java.util import scala.collection.JavaConverters._ +import scala.collection.immutable.Seq /** * Rejection created by the CORS directives. Signal the CORS request was rejected. The reason of the rejection is diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala index ff83e1e11..3b7bdfa4e 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpHeaderRange.scala @@ -21,6 +21,8 @@ import org.apache.pekko import pekko.http.cors.javadsl import pekko.util.Helpers +import scala.collection.immutable.Seq + abstract class HttpHeaderRange extends javadsl.model.HttpHeaderRange object HttpHeaderRange { diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala index 7da79d4bf..91c5e10ca 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/model/HttpOriginMatcher.scala @@ -22,6 +22,8 @@ import pekko.http.javadsl.{ model => jm } import pekko.http.scaladsl.model.headers.HttpOrigin import pekko.http.cors.javadsl +import scala.collection.immutable.Seq + /** * HttpOrigin matcher. */ diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala index de538a953..d06e34f2a 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettings.scala @@ -34,6 +34,7 @@ import com.typesafe.config.ConfigException.{ Missing, WrongType } import com.typesafe.config.{ Config, ConfigFactory } import scala.collection.JavaConverters._ +import scala.collection.immutable.Seq import scala.util.Try /** diff --git a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala index aa1dff0df..a1774c074 100644 --- a/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala +++ b/http-cors/src/main/scala/org/apache/pekko/http/cors/scaladsl/settings/CorsSettingsImpl.scala @@ -22,6 +22,8 @@ import pekko.http.scaladsl.model.{ HttpHeader, HttpMethod } import pekko.http.scaladsl.model.headers._ import pekko.http.cors.scaladsl.model.{ HttpHeaderRange, HttpOriginMatcher } +import scala.collection.immutable.Seq + /** INTERNAL API */ final private[pekko] case class CorsSettingsImpl( allowGenericHttpRequests: Boolean,