This is an automated email from the ASF dual-hosted git repository.
raboof pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new 924bd7e29 use java API in Java tests (#1179)
924bd7e29 is described below
commit 924bd7e2989f9f2b0df1633f980fe4530d8bfc84
Author: PJ Fanning <[email protected]>
AuthorDate: Sat Jul 25 14:07:12 2026 +0100
use java API in Java tests (#1179)
* use java API in Java tests
* more
* Update CookieDirectivesExamplesTest.java
* more
* update
* Update HttpMessageTest.java
* more
---
.../docs/http/javadsl/HttpClientDecodingExampleTest.java | 6 +++---
.../javadsl/server/HttpBasicAuthenticatorExample.java | 2 +-
.../http/javadsl/server/OAuth2AuthenticatorExample.java | 2 +-
.../docs/http/javadsl/server/WebSocketCoreExample.java | 4 ++--
.../server/directives/FutureDirectivesExamplesTest.java | 16 ++++++++--------
.../pekko/http/scaladsl/model/headers/headers.scala | 7 ++++---
.../apache/pekko/http/javadsl/model/HttpMessageTest.java | 8 ++++----
.../java/org/apache/pekko/http/javadsl/HttpAPIsTest.java | 2 +-
.../pekko/http/javadsl/server/HandlerBindingTest.java | 2 +-
.../javadsl/server/directives/PathDirectivesTest.java | 2 +-
.../unmarshalling/sse/EventStreamUnmarshallingTest.java | 5 ++---
11 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
b/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
index 7364069ba..00ee40e4d 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
@@ -23,7 +23,7 @@ import org.apache.pekko.http.javadsl.Http;
import org.apache.pekko.http.javadsl.coding.Coder;
import org.apache.pekko.http.javadsl.model.HttpRequest;
import org.apache.pekko.http.javadsl.model.HttpResponse;
-import org.apache.pekko.http.scaladsl.model.headers.HttpEncodings;
+import org.apache.pekko.http.javadsl.model.headers.HttpEncodings;
public class HttpClientDecodingExampleTest {
@@ -45,9 +45,9 @@ public class HttpClientDecodingExampleTest {
response -> {
// Pick the right coder
final Coder coder;
- if (HttpEncodings.gzip().equals(response.encoding())) {
+ if (HttpEncodings.GZIP.equals(response.encoding())) {
coder = Coder.Gzip;
- } else if (HttpEncodings.deflate().equals(response.encoding())) {
+ } else if (HttpEncodings.DEFLATE.equals(response.encoding())) {
coder = Coder.Deflate;
} else {
coder = Coder.NoCoding;
diff --git
a/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
b/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
index 3453961c5..89d6105a0 100644
---
a/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
+++
b/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
@@ -18,11 +18,11 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.headers.Authorization;
import org.apache.pekko.http.javadsl.model.headers.Host;
import org.apache.pekko.http.javadsl.server.Route;
import
org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
-import org.apache.pekko.http.scaladsl.model.headers.Authorization;
// #basic-authenticator-java
import static
org.apache.pekko.http.javadsl.server.Directives.authenticateBasic;
diff --git
a/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
b/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
index 8b1d3b58c..aaaeba933 100644
---
a/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
+++
b/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
@@ -14,10 +14,10 @@
package docs.http.javadsl.server;
import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.headers.Authorization;
import org.apache.pekko.http.javadsl.model.headers.Host;
import
org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
-import org.apache.pekko.http.scaladsl.model.headers.Authorization;
import java.util.Optional;
diff --git
a/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java
b/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java
index b09f2ad79..f3c8bb91a 100644
--- a/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java
@@ -27,6 +27,7 @@ import org.apache.pekko.actor.ActorSystem;
import org.apache.pekko.http.javadsl.ConnectionContext;
import org.apache.pekko.http.javadsl.Http;
import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.AttributeKeys;
import org.apache.pekko.http.javadsl.model.HttpRequest;
import org.apache.pekko.http.javadsl.model.HttpResponse;
import org.apache.pekko.http.javadsl.model.StatusCodes;
@@ -37,7 +38,6 @@ import
org.apache.pekko.http.javadsl.model.ws.WebSocketUpgrade;
import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
import org.apache.pekko.http.javadsl.settings.ServerSettings;
import org.apache.pekko.http.javadsl.settings.WebSocketSettings;
-import org.apache.pekko.http.scaladsl.model.AttributeKeys;
import org.apache.pekko.japi.JavaPartialFunction;
import org.apache.pekko.japi.function.Function;
import org.apache.pekko.stream.Materializer;
@@ -54,7 +54,7 @@ public class WebSocketCoreExample {
if (request.getUri().path().equals("/greeter")) {
return request
- .getAttribute(AttributeKeys.webSocketUpgrade())
+ .getAttribute(AttributeKeys.webSocketUpgrade)
.map(
upgrade -> {
Flow<Message, Message, NotUsed> greeterFlow = greeter();
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
index e8b64dc20..9f64e1330 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
@@ -17,10 +17,10 @@ import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
import org.apache.pekko.http.javadsl.marshalling.Marshaller;
import org.apache.pekko.http.javadsl.server.Route;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
-import org.apache.pekko.http.scaladsl.model.StatusCodes;
import org.apache.pekko.japi.pf.PFBuilder;
import org.apache.pekko.pattern.CircuitBreaker;
import org.apache.pekko.testkit.javadsl.TestKit;
@@ -73,7 +73,7 @@ public class FutureDirectivesExamplesTest extends
JUnitJupiterRouteTest {
.matchAny(
ex ->
complete(
-
StatusCodes.InternalServerError(),
+
StatusCodes.INTERNAL_SERVER_ERROR,
"An error occurred: " +
ex.getMessage()))
.build())
.get()));
@@ -82,7 +82,7 @@ public class FutureDirectivesExamplesTest extends
JUnitJupiterRouteTest {
testRoute(route)
.run(HttpRequest.GET("/divide/10/0"))
- .assertStatusCode(StatusCodes.InternalServerError())
+ .assertStatusCode(StatusCodes.INTERNAL_SERVER_ERROR)
.assertEntity("An error occurred: / by zero");
// #onComplete
}
@@ -112,7 +112,7 @@ public class FutureDirectivesExamplesTest extends
JUnitJupiterRouteTest {
testRoute(route)
.run(HttpRequest.GET("/failure"))
- .assertStatusCode(StatusCodes.InternalServerError())
+ .assertStatusCode(StatusCodes.INTERNAL_SERVER_ERROR)
.assertEntity("There was an internal server error.");
// #onSuccess
}
@@ -146,7 +146,7 @@ public class FutureDirectivesExamplesTest extends
JUnitJupiterRouteTest {
testRoute(route)
.run(HttpRequest.GET("/failure"))
- .assertStatusCode(StatusCodes.InternalServerError())
+ .assertStatusCode(StatusCodes.INTERNAL_SERVER_ERROR)
.assertEntity("There was an internal server error.");
// #completeOrRecoverWith
}
@@ -183,7 +183,7 @@ public class FutureDirectivesExamplesTest extends
JUnitJupiterRouteTest {
.matchAny(
ex ->
complete(
-
StatusCodes.InternalServerError(),
+
StatusCodes.INTERNAL_SERVER_ERROR,
"An error occurred: " +
ex.toString()))
.build())
.get()));
@@ -192,7 +192,7 @@ public class FutureDirectivesExamplesTest extends
JUnitJupiterRouteTest {
testRoute(route)
.run(HttpRequest.GET("/divide/10/0"))
- .assertStatusCode(StatusCodes.InternalServerError())
+ .assertStatusCode(StatusCodes.INTERNAL_SERVER_ERROR)
.assertEntity("An error occurred: java.lang.ArithmeticException: / by
zero");
// The circuit-breaker will eventually be opened
@@ -206,7 +206,7 @@ public class FutureDirectivesExamplesTest extends
JUnitJupiterRouteTest {
.assertEntity(
"The server is currently unavailable (because it is
overloaded or down for"
+ " maintenance).")
- .assertStatusCode(StatusCodes.ServiceUnavailable());
+ .assertStatusCode(StatusCodes.SERVICE_UNAVAILABLE);
return null;
});
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/headers.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/headers.scala
index 82f84f49f..2a7919ec8 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/headers.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/headers/headers.scala
@@ -18,9 +18,6 @@ import java.net.InetSocketAddress
import java.security.MessageDigest
import java.util
import javax.net.ssl.SSLSession
-import org.apache.pekko
-import pekko.annotation.{ ApiMayChange, InternalApi }
-import pekko.stream.scaladsl.ScalaSessionAPI
import scala.collection.immutable.TreeMap
import scala.reflect.ClassTag
@@ -29,12 +26,16 @@ import scala.annotation.tailrec
import scala.collection.immutable
import org.parboiled2.CharPredicate
import org.parboiled2.util.Base64
+
+import org.apache.pekko
+import pekko.annotation.{ ApiMayChange, InternalApi }
import pekko.event.Logging
import pekko.http.impl.util._
import pekko.http.impl.model.parser.CharacterClasses
import pekko.http.impl.model.parser.CharacterClasses.`attr-char`
import pekko.http.javadsl.{ model => jm }
import pekko.http.scaladsl.model._
+import pekko.stream.scaladsl.ScalaSessionAPI
sealed abstract class ModeledCompanion[T: ClassTag] extends Renderable {
val name = ModeledCompanion.nameFromClass(getClass)
diff --git
a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java
b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java
index 1b7cab299..baf0f8d2f 100644
---
a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java
+++
b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/HttpMessageTest.java
@@ -15,10 +15,10 @@ package org.apache.pekko.http.javadsl.model;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
-import org.apache.pekko.http.scaladsl.model.AttributeKey$;
import org.junit.jupiter.api.Test;
public class HttpMessageTest {
@@ -29,7 +29,7 @@ public class HttpMessageTest {
AttributeKey<String> otherStringKey = AttributeKey.create("other",
String.class);
// it should be possible to use 'Scala attribute keys' in the Java API's
- AttributeKey<Integer> intKey = AttributeKey$.MODULE$.apply("int",
Integer.class);
+ AttributeKey<Integer> intKey = AttributeKey.create("int", Integer.class);
// keys with the same name but different types should be considered
different
AttributeKey<Integer> otherIntKey = AttributeKey.create("other",
Integer.class);
@@ -61,7 +61,7 @@ public class HttpMessageTest {
RemoteAddress remoteAddress = RemoteAddress.create(new byte[] {10, 0, 0,
1});
HttpRequest newRequest = request.addAttribute(AttributeKeys.remoteAddress,
remoteAddress);
- assert
(newRequest.getAttribute(AttributeKeys.remoteAddress).get().equals(remoteAddress));
+
assertTrue(newRequest.getAttribute(AttributeKeys.remoteAddress).get().equals(remoteAddress));
}
@Test
@@ -70,6 +70,6 @@ public class HttpMessageTest {
HttpRequest request =
HttpRequest.create().addAttribute(AttributeKeys.sslSession,
SslSessionInfo.create(session));
- assert (request.getAttribute(AttributeKeys.sslSession).get().getSession()
== session);
+
assertTrue(request.getAttribute(AttributeKeys.sslSession).get().getSession() ==
session);
}
}
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
index 426e9d300..e3d3a26f9 100644
--- a/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
+++ b/http-tests/src/test/java/org/apache/pekko/http/javadsl/HttpAPIsTest.java
@@ -23,8 +23,8 @@ import org.apache.pekko.event.LoggingAdapter;
import org.apache.pekko.http.javadsl.model.HttpRequest;
import org.apache.pekko.http.javadsl.model.HttpResponse;
import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
+import org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
-import org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings;
import org.apache.pekko.japi.function.Function;
import org.apache.pekko.stream.javadsl.Flow;
import org.junit.jupiter.api.Test;
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java
index f268decf6..852ad6a51 100644
---
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java
+++
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/HandlerBindingTest.java
@@ -16,9 +16,9 @@ package org.apache.pekko.http.javadsl.server;
import static org.apache.pekko.http.javadsl.server.Directives.*;
import static
org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers.INTEGER;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
-import org.apache.pekko.http.scaladsl.model.HttpRequest;
import org.junit.jupiter.api.Test;
public class HandlerBindingTest extends JUnitJupiterRouteTest {
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java
index d5ab4fdcc..d0c5c181c 100644
---
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java
+++
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/PathDirectivesTest.java
@@ -15,12 +15,12 @@ package org.apache.pekko.http.javadsl.server.directives;
import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
import org.apache.pekko.http.javadsl.model.StatusCodes;
import org.apache.pekko.http.javadsl.model.headers.Host;
import org.apache.pekko.http.javadsl.server.PathMatchers;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
import org.apache.pekko.http.javadsl.testkit.TestRoute;
-import org.apache.pekko.http.scaladsl.model.HttpRequest;
import org.junit.jupiter.api.Test;
public class PathDirectivesTest extends JUnitJupiterRouteTest {
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
index ed791099f..ba258a754 100644
---
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
+++
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
@@ -16,8 +16,6 @@
package org.apache.pekko.http.javadsl.unmarshalling.sse;
-import static scala.jdk.javaapi.FutureConverters.asJava;
-
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.pekko.actor.ActorSystem;
@@ -48,7 +46,8 @@ public class EventStreamUnmarshallingTest {
Assertions.assertEquals(events, unmarshalledEvents);
} finally {
- asJava(system.terminate()).toCompletableFuture().get(42,
TimeUnit.SECONDS);
+ system.terminate();
+ system.getWhenTerminated().toCompletableFuture().get(42,
TimeUnit.SECONDS);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
