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 2023/02/14 14:17:47 UTC
[incubator-pekko-http] branch main updated: rename http2-support module to http2-tests (#55)
This is an automated email from the ASF dual-hosted git repository.
jrudolph pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new e75989163 rename http2-support module to http2-tests (#55)
e75989163 is described below
commit e759891635f4539967e124aa33db336c4284ee7a
Author: Johannes Rudolph <jo...@gmail.com>
AuthorDate: Tue Feb 14 15:17:41 2023 +0100
rename http2-support module to http2-tests (#55)
---
build.sbt | 11 +++++------
.../scala/org/apache/pekko/http/javadsl/ServerBuilder.scala | 6 +++---
.../pekko/http/javadsl/settings/PreviewServerSettings.scala | 4 ----
.../src/main/scala/org/apache/pekko/http/scaladsl/Http.scala | 2 --
.../scala/org/apache/pekko/http/scaladsl/ServerBuilder.scala | 4 ++--
.../org/apache/pekko/http/javadsl/Http2JavaServerTest.java | 0
.../pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala | 0
.../apache/pekko/http/impl/engine/http2/H2cUpgradeSpec.scala | 0
.../pekko/http/impl/engine/http2/HPackEncodingSupport.scala | 0
.../pekko/http/impl/engine/http2/HPackSpecExamples.scala | 0
.../pekko/http/impl/engine/http2/Http2ClientServerSpec.scala | 0
.../apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala | 0
.../pekko/http/impl/engine/http2/Http2FrameHpackSupport.scala | 0
.../apache/pekko/http/impl/engine/http2/Http2FrameProbe.scala | 0
.../pekko/http/impl/engine/http2/Http2FrameSending.scala | 0
.../http/impl/engine/http2/Http2PersistentClientSpec.scala | 0
.../pekko/http/impl/engine/http2/Http2ServerDemuxSpec.scala | 0
.../apache/pekko/http/impl/engine/http2/Http2ServerSpec.scala | 0
.../http/impl/engine/http2/HttpMessageRenderingSpec.scala | 0
.../pekko/http/impl/engine/http2/PriorityTreeSpec.scala | 0
.../pekko/http/impl/engine/http2/ProtocolSwitchSpec.scala | 0
.../pekko/http/impl/engine/http2/RequestParsingSpec.scala | 0
.../pekko/http/impl/engine/http2/TelemetrySpiSpec.scala | 0
.../apache/pekko/http/impl/engine/http2/WindowTracking.scala | 0
.../http/impl/engine/http2/WithInPendingUntilFixed.scala | 0
.../pekko/http/impl/engine/http2/WithPriorKnowledgeSpec.scala | 0
.../http/impl/engine/http2/framing/Http2FramingSpec.scala | 0
.../org/apache/pekko/http/impl/engine/http2/package.scala | 0
.../org/apache/pekko/http/scaladsl/Http2ServerTest.scala | 0
project/Dependencies.scala | 4 +---
30 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/build.sbt b/build.sbt
index 7d9943a7f..2d701dc9f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -38,7 +38,7 @@ inThisBuild(Def.settings(
lazy val userProjects: Seq[ProjectReference] = List[ProjectReference](
parsing,
httpCore,
- http2Support,
+ http2Tests,
http,
httpCaching,
httpTestkit,
@@ -170,14 +170,13 @@ def gustavDir(kind: String) = Def.task {
s"www/$kind/akka-http/$ver"
}
-lazy val http2Support = project("http2-support")
+lazy val http2Tests = project("http2-tests")
.settings(commonSettings)
.settings(AutomaticModuleName.settings("pekko.http.http2"))
.dependsOn(httpCore, httpTestkit % "test", httpCore % "test->test")
.addPekkoModuleDependency("pekko-stream", "provided")
.addPekkoModuleDependency("pekko-stream-testkit", "test")
- .settings(Dependencies.http2)
- .settings(Dependencies.http2Support)
+ .settings(Dependencies.http2Tests)
.settings {
lazy val h2specPath = Def.task {
(Test / target).value / h2specName / h2specExe
@@ -258,7 +257,7 @@ lazy val httpTests = project("http-tests")
lazy val httpJmhBench = project("http-bench-jmh")
.settings(commonSettings)
- .dependsOn(http, http2Support % "compile->compile,test")
+ .dependsOn(http, http2Tests % "compile->compile,test")
.addPekkoModuleDependency("pekko-stream")
.enablePlugins(JmhPlugin)
.enablePlugins(NoPublish) // don't release benchs
@@ -400,7 +399,7 @@ lazy val docs = project("docs")
.addPekkoModuleDependency("pekko-stream-testkit", "provided", PekkoDependency.docs)
.addPekkoModuleDependency("pekko-actor-testkit-typed", "provided", PekkoDependency.docs)
.dependsOn(
- httpCore, http, httpXml, http2Support, httpMarshallersJava, httpMarshallersScala, httpCaching,
+ httpCore, http, httpXml, http2Tests, httpMarshallersJava, httpMarshallersScala, httpCaching,
httpTests % "compile;test->test", httpTestkit % "compile;test->test", httpScalafixRules % ScalafixConfig)
.settings(Dependencies.docs)
.settings(
diff --git a/http-core/src/main/scala/org/apache/pekko/http/javadsl/ServerBuilder.scala b/http-core/src/main/scala/org/apache/pekko/http/javadsl/ServerBuilder.scala
index 676e75184..9813f82f4 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/javadsl/ServerBuilder.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/javadsl/ServerBuilder.scala
@@ -68,7 +68,7 @@ trait ServerBuilder {
* the `akka.http.server.max-connections` setting. Please see the documentation in the reference.conf for more
* information about what kind of guarantees to expect.
*
- * Supports HTTP/2 on the same port if the akka-http2-support module is on the classpath and http2 support is enabled.
+ * Supports HTTP/2 on the same port if http2 support is enabled.
*/
def bind(f: Function[HttpRequest, CompletionStage[HttpResponse]]): CompletionStage[ServerBinding]
@@ -82,7 +82,7 @@ trait ServerBuilder {
* the `akka.http.server.max-connections` setting. Please see the documentation in the reference.conf for more
* information about what kind of guarantees to expect.
*
- * Supports HTTP/2 on the same port if the akka-http2-support module is on the classpath and http2 support is enabled.
+ * Supports HTTP/2 on the same port if http2 support is enabled.
*/
def bind(handlerProvider: HandlerProvider): CompletionStage[ServerBinding]
@@ -94,7 +94,7 @@ trait ServerBuilder {
* the `akka.http.server.max-connections` setting. Please see the documentation in the reference.conf for more
* information about what kind of guarantees to expect.
*
- * Supports HTTP/2 on the same port if the akka-http2-support module is on the classpath and http2 support is enabled.
+ * Supports HTTP/2 on the same port if http2 support is enabled.
*/
def bindSync(f: Function[HttpRequest, HttpResponse]): CompletionStage[ServerBinding]
diff --git a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/PreviewServerSettings.scala b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/PreviewServerSettings.scala
index 5146fabbb..8afd2e64e 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/PreviewServerSettings.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/PreviewServerSettings.scala
@@ -23,10 +23,6 @@ abstract class PreviewServerSettings private[pekko] () { self: PreviewServerSett
/**
* Configures the Http extension to bind using HTTP/2 if given an
* [[pekko.http.scaladsl.HttpsConnectionContext]]. Otherwise binds as plain HTTP.
- *
- * Please note that when using this mode of binding you MUST include
- * `"com.typesafe.akka" %% "akka-http2-support" % AkkaHttpVersion` in your
- * dependencies / classpath.
*/
def enableHttp2: Boolean
diff --git a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala
index 879a155e3..d39f26664 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala
@@ -67,11 +67,9 @@ class HttpExt @InternalStableApi /* constructor signature is hardcoded in Teleme
private def allModules: List[String] = List(
"pekko-parsing",
"pekko-http-core",
- "pekko-http2-support",
"pekko-http",
"pekko-http-caching",
"pekko-http-testkit",
- "pekko-http-tests",
"pekko-http-marshallers-scala",
"pekko-http-marshallers-java",
"pekko-http-spray-json",
diff --git a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ServerBuilder.scala b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ServerBuilder.scala
index 1d6a61188..12319c101 100644
--- a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ServerBuilder.scala
+++ b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ServerBuilder.scala
@@ -63,7 +63,7 @@ trait ServerBuilder {
* the `akka.http.server.max-connections` setting. Please see the documentation in the reference.conf for more
* information about what kind of guarantees to expect.
*
- * Supports HTTP/2 on the same port if the akka-http2-support module is on the classpath and http2 support is enabled.
+ * Supports HTTP/2 on the same port if http2 support is enabled.
*/
def bind(f: HttpRequest => Future[HttpResponse]): Future[ServerBinding]
@@ -75,7 +75,7 @@ trait ServerBuilder {
* the `akka.http.server.max-connections` setting. Please see the documentation in the reference.conf for more
* information about what kind of guarantees to expect.
*
- * Supports HTTP/2 on the same port if the akka-http2-support module is on the classpath and http2 support is enabled.
+ * Supports HTTP/2 on the same port if http2 support is enabled.
*/
def bindSync(f: HttpRequest => HttpResponse): Future[ServerBinding]
diff --git a/http2-support/src/test/java/org/apache/pekko/http/javadsl/Http2JavaServerTest.java b/http2-tests/src/test/java/org/apache/pekko/http/javadsl/Http2JavaServerTest.java
similarity index 100%
rename from http2-support/src/test/java/org/apache/pekko/http/javadsl/Http2JavaServerTest.java
rename to http2-tests/src/test/java/org/apache/pekko/http/javadsl/Http2JavaServerTest.java
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2SpecIntegrationSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2cUpgradeSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2cUpgradeSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2cUpgradeSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/H2cUpgradeSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackEncodingSupport.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackEncodingSupport.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackEncodingSupport.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackEncodingSupport.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackSpecExamples.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackSpecExamples.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackSpecExamples.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/HPackSpecExamples.scala
diff --git a/http2-support/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
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientServerSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientServerSpec.scala
diff --git a/http2-support/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
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameHpackSupport.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameHpackSupport.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameHpackSupport.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameHpackSupport.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameProbe.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameProbe.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameProbe.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameProbe.scala
diff --git a/http2-support/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
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameSending.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2FrameSending.scala
diff --git a/http2-support/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
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2PersistentClientSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2PersistentClientSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerDemuxSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerDemuxSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerDemuxSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerDemuxSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ServerSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/HttpMessageRenderingSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/HttpMessageRenderingSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/HttpMessageRenderingSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/HttpMessageRenderingSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/PriorityTreeSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/PriorityTreeSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/PriorityTreeSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/PriorityTreeSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/ProtocolSwitchSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/ProtocolSwitchSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/ProtocolSwitchSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/ProtocolSwitchSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/RequestParsingSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/RequestParsingSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/RequestParsingSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/RequestParsingSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/TelemetrySpiSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/TelemetrySpiSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/TelemetrySpiSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/TelemetrySpiSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/WindowTracking.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/WindowTracking.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/WindowTracking.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/WindowTracking.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithInPendingUntilFixed.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithInPendingUntilFixed.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithInPendingUntilFixed.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithInPendingUntilFixed.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithPriorKnowledgeSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithPriorKnowledgeSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithPriorKnowledgeSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/WithPriorKnowledgeSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/framing/Http2FramingSpec.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/framing/Http2FramingSpec.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/framing/Http2FramingSpec.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/framing/Http2FramingSpec.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/package.scala b/http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/package.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/impl/engine/http2/package.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/package.scala
diff --git a/http2-support/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala b/http2-tests/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala
similarity index 100%
rename from http2-support/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala
rename to http2-tests/src/test/scala/org/apache/pekko/http/scaladsl/Http2ServerTest.scala
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c2aa36d04..87d49cf48 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -97,9 +97,7 @@ object Dependencies {
lazy val http = Seq()
- lazy val http2 = l ++= Seq()
-
- lazy val http2Support = l ++= Seq(Test.h2spec)
+ lazy val http2Tests = l ++= Seq(Test.h2spec)
lazy val httpTestkit = l ++= Seq(
Test.junit, Test.junitIntf, Compile.junit % "provided",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org