This is an automated email from the ASF dual-hosted git repository.
He-Pin 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 87a89c356 refactor: migrate Collections/Arrays.asList to Java 9+
collection factories (#1089)
87a89c356 is described below
commit 87a89c35628a5985389b93e3a1d9d485e21f756d
Author: He-Pin(kerr) <[email protected]>
AuthorDate: Fri Jun 26 18:22:57 2026 +0800
refactor: migrate Collections/Arrays.asList to Java 9+ collection factories
(#1089)
* refactor: migrate Collections/Arrays.asList to Java 9+ factory methods
Motivation:
Java 9+ provides List.of(), Map.of(), Set.of() factory methods that are
more concise and return truly immutable collections.
Modification:
Replace Arrays.asList() with List.of(), Collections.singletonList()
with List.of(), Collections.emptyList/Map/Set() with List/Map/Set.of(),
new HashMap<>() + put() chains with Map.of(), and
new HashSet<>(Arrays.asList()) with Set.of() across 20 files.
Correctly skips shaded com.twitter.hpack code and array-parameter
conversions in Util.java and MediaTypes.java.
Result:
Cleaner code using Java 17 immutable collection factories.
Tests:
Not run - compile-only test file changes
References:
None - Java 17 API modernization
* fix: revert Collections.emptySet/emptyMap/emptyList to original API
Motivation:
Review feedback: prefer Collections.emptyMap(), Collections.emptySet(),
Collections.emptyList() over Map.of(), Set.of(), List.of() for empty
collections since they use well-known immutable singleton APIs.
Modification:
Revert empty collection conversions while keeping non-empty
Arrays.asList -> List.of and Collections.singletonList -> List.of
conversions.
Result:
Empty collections use the established Collections.empty* API.
* style: apply javafmt to fix Checks failure
Apply javafmt to 5 test files that were failing code style check.
---
.../java/docs/http/javadsl/Http2ClientApp.java | 4 +--
.../javadsl/HttpClientDecodingExampleTest.java | 3 +-
.../HttpRequestDetailedStringExampleTest.java | 4 +--
.../HttpResponseDetailedStringExampleTest.java | 4 +--
.../java/docs/http/javadsl/JacksonXmlSupport.java | 3 +-
.../directives/BasicDirectivesExamplesTest.java | 26 +++++++----------
.../directives/CodingDirectivesExamplesTest.java | 7 ++---
.../directives/CustomDirectivesExamplesTest.java | 9 +++---
.../FileUploadDirectivesExamplesTest.java | 34 ++++++++--------------
.../directives/HostDirectivesExamplesTest.java | 4 +--
.../directives/MiscDirectivesExamplesTest.java | 5 ++--
.../RespondWithDirectivesExamplesTest.java | 7 ++---
.../directives/RouteDirectivesExamplesTest.java | 6 ++--
.../WebSocketDirectivesExamplesTest.java | 15 ++++------
.../http/javadsl/model/EntityDiscardingTest.java | 4 +--
.../pekko/http/javadsl/server/JavaRouteTest.java | 4 +--
.../http/javadsl/server/UnmarshallerTest.java | 4 +--
.../server/directives/CodingDirectivesTest.java | 11 +++----
18 files changed, 63 insertions(+), 91 deletions(-)
diff --git a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
index 6ab48a922..2116749bb 100644
--- a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
+++ b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
@@ -15,7 +15,7 @@ package docs.http.javadsl;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
-import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
@@ -58,7 +58,7 @@ public class Http2ClientApp {
.apply(
HttpRequest.create(
"https://pekko.apache.org/api/pekko/current/org/apache/pekko/actor/typed/scaladsl/index.html";)
-
.withHeaders(Arrays.asList(AcceptEncoding.create(HttpEncodings.GZIP))))
+
.withHeaders(List.of(AcceptEncoding.create(HttpEncodings.GZIP))))
.thenAccept(
res -> {
System.out.println("[1] Got index.html: " + res);
diff --git
a/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
b/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
index 01491b247..7364069ba 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
@@ -14,7 +14,6 @@
package docs.http.javadsl;
// #single-request-decoding-example
-import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -33,7 +32,7 @@ public class HttpClientDecodingExampleTest {
final ActorSystem system = ActorSystem.create();
final List<HttpRequest> httpRequests =
- Arrays.asList(
+ List.of(
HttpRequest.create("https://httpbin.org/gzip";), //
Content-Encoding: gzip in response
HttpRequest.create(
"https://httpbin.org/deflate";), // Content-Encoding: deflate
in response
diff --git
a/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
b/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
index 5bc0e1fb2..be60d14f8 100644
---
a/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
+++
b/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
@@ -15,7 +15,7 @@ package docs.http.javadsl;
import static org.junit.jupiter.api.Assertions.*;
-import java.util.Arrays;
+import java.util.List;
import org.apache.pekko.http.javadsl.model.*;
import org.apache.pekko.http.javadsl.model.headers.Authorization;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ public class HttpRequestDetailedStringExampleTest {
HttpEntity.Strict piiBody = HttpEntities.create("This body contains
information about [user]");
HttpRequest httpRequestWithHeadersAndBody =
-
HttpRequest.create().withEntity(piiBody).withHeaders(Arrays.asList(piiHeader));
+
HttpRequest.create().withEntity(piiBody).withHeaders(List.of(piiHeader));
// Our custom string representation includes body and headers string
representations...
assertTrue(toDetailedString(httpRequestWithHeadersAndBody).contains(piiHeader.toString()));
diff --git
a/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
b/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
index 1edb2d4ad..182a1fa2a 100644
---
a/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
+++
b/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
@@ -16,7 +16,7 @@ package docs.http.javadsl;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.Arrays;
+import java.util.List;
import org.apache.pekko.http.javadsl.model.*;
import org.apache.pekko.http.javadsl.model.headers.Authorization;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ public class HttpResponseDetailedStringExampleTest {
HttpEntity.Strict piiBody = HttpEntities.create("This body contains
information about [user]");
HttpResponse httpResponseWithHeadersAndBody =
-
HttpResponse.create().withEntity(piiBody).withHeaders(Arrays.asList(piiHeader));
+
HttpResponse.create().withEntity(piiBody).withHeaders(List.of(piiHeader));
// Our custom string representation includes body and headers string
representations...
assertTrue(toDetailedString(httpResponseWithHeadersAndBody).contains(piiHeader.toString()));
diff --git a/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java
b/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java
index af088691b..fd188735a 100644
--- a/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java
+++ b/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java
@@ -18,7 +18,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import java.io.IOException;
-import java.util.Arrays;
import java.util.List;
import org.apache.pekko.http.javadsl.marshalling.Marshaller;
import org.apache.pekko.http.javadsl.model.*;
@@ -28,7 +27,7 @@ public class JacksonXmlSupport {
private static final ObjectMapper DEFAULT_XML_MAPPER =
new XmlMapper().enable(SerializationFeature.WRAP_ROOT_VALUE);
private static final List<MediaType> XML_MEDIA_TYPES =
- Arrays.asList(MediaTypes.APPLICATION_XML, MediaTypes.TEXT_XML);
+ List.of(MediaTypes.APPLICATION_XML, MediaTypes.TEXT_XML);
public static <T> Marshaller<T, RequestEntity> marshaller() {
return Marshaller.wrapEntity(
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
index 80028eb88..04c19087b 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
@@ -42,9 +42,8 @@ import scala.concurrent.ExecutionContext;
import scala.concurrent.ExecutionContextExecutor;
import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -619,8 +618,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
.run(
HttpRequest.GET("/")
.withHeaders(
- Arrays.asList(
- RawHeader.create("id", "12345"),
RawHeader.create("id2", "67890"))))
+ List.of(RawHeader.create("id", "12345"),
RawHeader.create("id2", "67890"))))
.assertHeaderKindNotExists("id")
.assertHeaderExists("id2", "67890");
// #mapResponseHeaders
@@ -640,7 +638,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// ignore any rejections and replace them by AuthorizationFailedRejection
final Route route =
mapRejections(
- rejections -> Collections.singletonList((Rejection)
Rejections.authorizationFailed()),
+ rejections -> List.of((Rejection)
Rejections.authorizationFailed()),
() -> path("abc", () -> complete("abc")));
// tests:
@@ -793,8 +791,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
final Route route =
mapRouteResult(
rr -> {
- final Iterable<Rejection> rejections =
- Collections.singletonList(Rejections.authorizationFailed());
+ final Iterable<Rejection> rejections =
List.of(Rejections.authorizationFailed());
return RouteResults.rejected(rejections);
},
() -> complete("abc"));
@@ -817,7 +814,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
Rejected.class,
rejected -> {
final Iterable<Rejection> rejections =
-
Collections.singletonList(Rejections.authorizationFailed());
+ List.of(Rejections.authorizationFailed());
return RouteResults.rejected(rejections);
})
.build(),
@@ -841,7 +838,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
CompletableFuture.supplyAsync(
() -> {
final Iterable<Rejection> rejections =
-
Collections.singletonList(Rejections.authorizationFailed());
+ List.of(Rejections.authorizationFailed());
return RouteResults.rejected(rejections);
}))
.build(),
@@ -863,7 +860,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
() -> {
if (rr instanceof Rejected) {
final Iterable<Rejection> rejections =
-
Collections.singletonList(Rejections.authorizationFailed());
+ List.of(Rejections.authorizationFailed());
return RouteResults.rejected(rejections);
} else {
return rr;
@@ -1123,8 +1120,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// tests:
final Iterator iterator =
- Arrays.asList(
- ByteString.fromString("1"), ByteString.fromString("2"),
ByteString.fromString("3"))
+ List.of(ByteString.fromString("1"), ByteString.fromString("2"),
ByteString.fromString("3"))
.iterator();
final Source<ByteString, NotUsed> dataBytes = Source.fromIterator(() ->
iterator);
@@ -1145,8 +1141,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// tests:
final Iterator iterator =
- Arrays.asList(
- ByteString.fromString("1"), ByteString.fromString("2"),
ByteString.fromString("3"))
+ List.of(ByteString.fromString("1"), ByteString.fromString("2"),
ByteString.fromString("3"))
.iterator();
final Source<ByteString, NotUsed> dataBytes = Source.fromIterator(() ->
iterator);
testRoute(route)
@@ -1177,8 +1172,7 @@ public class BasicDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// tests:
final Iterator iterator =
- Arrays.asList(
- ByteString.fromString("1"), ByteString.fromString("2"),
ByteString.fromString("3"))
+ List.of(ByteString.fromString("1"), ByteString.fromString("2"),
ByteString.fromString("3"))
.iterator();
final Source<ByteString, NotUsed> dataBytes = Source.fromIterator(() ->
iterator);
testRoute(route)
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
index 839a13993..4d2995182 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
@@ -27,7 +27,7 @@ import
org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
import org.apache.pekko.util.ByteString;
import org.junit.jupiter.api.Test;
-import java.util.Collections;
+import java.util.List;
import static
org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller.entityToString;
@@ -108,8 +108,7 @@ public class CodingDirectivesExamplesTest extends
JUnitJupiterRouteTest {
@Test
public void testEncodeResponseWith() {
// #encodeResponseWith
- final Route route =
- encodeResponseWith(Collections.singletonList(Coder.Gzip), () ->
complete("content"));
+ final Route route = encodeResponseWith(List.of(Coder.Gzip), () ->
complete("content"));
// tests:
testRoute(route)
@@ -132,7 +131,7 @@ public class CodingDirectivesExamplesTest extends
JUnitJupiterRouteTest {
.assertRejections(Rejections.unacceptedResponseEncoding(HttpEncodings.GZIP));
final Route routeWithLevel9 =
- encodeResponseWith(Collections.singletonList(Coder.GzipLevel9), () ->
complete("content"));
+ encodeResponseWith(List.of(Coder.GzipLevel9), () ->
complete("content"));
testRoute(routeWithLevel9)
.run(HttpRequest.GET("/"))
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
index e5f5f38aa..fbd474903 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
@@ -20,9 +20,8 @@ import org.apache.pekko.http.javadsl.server.Route;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import java.util.function.Supplier;
import java.util.function.Function;
@@ -127,7 +126,7 @@ public class CustomDirectivesExamplesTest extends
JUnitJupiterRouteTest {
Function<MyCredentials, Set<MyRole>> authLogic =
(credentials) -> {
if (credentials.userId.equals("admin") &&
credentials.safeSecretVerification("secret"))
- return new HashSet<>(Arrays.asList(MyRole.USER, MyRole.ADMIN));
+ return Set.of(MyRole.USER, MyRole.ADMIN);
else return Collections.emptySet();
};
@@ -150,7 +149,7 @@ public class CustomDirectivesExamplesTest extends
JUnitJupiterRouteTest {
.run(
HttpRequest.GET("/admin")
.addHeaders(
- Arrays.asList(
+ List.of(
RawHeader.create("X-My-User-Id", "user"),
RawHeader.create("X-My-User-Secret", "wrong"))))
.assertStatusCode(StatusCodes.FORBIDDEN);
@@ -159,7 +158,7 @@ public class CustomDirectivesExamplesTest extends
JUnitJupiterRouteTest {
.run(
HttpRequest.GET("/admin")
.addHeaders(
- Arrays.asList(
+ List.of(
RawHeader.create("X-My-User-Id", "admin"),
RawHeader.create("X-My-User-Secret", "secret"))))
.assertStatusCode(StatusCodes.OK);
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
index e232245b4..d72304aef 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
@@ -29,8 +29,7 @@ import scala.concurrent.duration.FiniteDuration;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -90,8 +89,7 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
return complete(StatusCodes.OK);
});
- Map<String, String> filenameMapping = new HashMap<>();
- filenameMapping.put("filename", "primes.csv");
+ Map<String, String> filenameMapping = Map.of("filename", "primes.csv");
org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
Multiparts.createStrictFormDataFromParts(
@@ -137,10 +135,8 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
return complete(StatusCodes.OK);
});
- Map<String, String> filenameMappingA = new HashMap<>();
- Map<String, String> filenameMappingB = new HashMap<>();
- filenameMappingA.put("filename", "primesA.csv");
- filenameMappingB.put("filename", "primesB.csv");
+ Map<String, String> filenameMappingA = Map.of("filename", "primesA.csv");
+ Map<String, String> filenameMappingB = Map.of("filename", "primesB.csv");
org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
Multiparts.createStrictFormDataFromParts(
@@ -177,15 +173,14 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
CompletionStage<Integer> sumF =
byteSource
.via(Framing.delimiter(ByteString.fromString("\n"), 1024))
- .mapConcat(bs ->
Arrays.asList(bs.utf8String().split(",")))
+ .mapConcat(bs ->
List.of(bs.utf8String().split(",")))
.map(s -> Integer.parseInt(s))
.runFold(0, (acc, n) -> acc + n,
ctx.getMaterializer());
return onSuccess(sumF, sum -> complete("Sum: " + sum));
});
});
- Map<String, String> filenameMapping = new HashMap<>();
- filenameMapping.put("filename", "primes.csv");
+ Map<String, String> filenameMapping = Map.of("filename", "primes.csv");
org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
Multiparts.createStrictFormDataFromParts(
@@ -222,7 +217,7 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// sum the numbers as they arrive
return item.getValue()
.via(Framing.delimiter(ByteString.fromString("\n"), 1024))
- .mapConcat(bs ->
Arrays.asList(bs.utf8String().split(",")))
+ .mapConcat(bs ->
List.of(bs.utf8String().split(",")))
.map(s -> Integer.parseInt(s))
.runFold(0, (acc, n) -> acc + n,
ctx.getMaterializer());
})
@@ -236,10 +231,8 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
});
});
- Map<String, String> filenameMappingA = new HashMap<>();
- Map<String, String> filenameMappingB = new HashMap<>();
- filenameMappingA.put("filename", "primesA.csv");
- filenameMappingB.put("filename", "primesB.csv");
+ Map<String, String> filenameMappingA = Map.of("filename", "primesA.csv");
+ Map<String, String> filenameMappingB = Map.of("filename", "primesB.csv");
org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
Multiparts.createStrictFormDataFromParts(
@@ -278,7 +271,7 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
CompletionStage<Integer> sumF =
byteSource
.via(Framing.delimiter(ByteString.fromString("\n"), 1024))
- .mapConcat(bs ->
Arrays.asList(bs.utf8String().split(",")))
+ .mapConcat(bs ->
List.of(bs.utf8String().split(",")))
.map(s -> Integer.parseInt(s))
.runFold(0, (acc, n) -> acc + n,
ctx.getMaterializer());
return onSuccess(sumF, sum -> complete("Sum: " + sum));
@@ -286,8 +279,7 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
return fileUpload("csv", processUploadedFile);
});
- Map<String, String> filenameMapping = new HashMap<>();
- filenameMapping.put("filename", "primes.csv");
+ Map<String, String> filenameMapping = Map.of("filename", "primes.csv");
String prefix = "primes";
String suffix = ".csv";
@@ -297,9 +289,7 @@ public class FileUploadDirectivesExamplesTest extends
JUnitJupiterRouteTest {
tempFile = Files.createTempFile(prefix, suffix).toFile();
tempFile.deleteOnExit();
Files.write(
- tempFile.toPath(),
- Arrays.asList("2,3,5", "7,11,13,17,23", "29,31,37"),
- StandardCharsets.UTF_8);
+ tempFile.toPath(), List.of("2,3,5", "7,11,13,17,23", "29,31,37"),
StandardCharsets.UTF_8);
} catch (Exception e) {
// ignore
}
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
index 51067e710..1ae4d25ae 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
@@ -13,7 +13,7 @@
package docs.http.javadsl.server.directives;
-import java.util.Arrays;
+import java.util.List;
import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
@@ -53,7 +53,7 @@ public class HostDirectivesExamplesTest extends
JUnitJupiterRouteTest {
public void testListOfHost() {
// #host1
final Route matchListOfHosts =
- host(Arrays.asList("api.company.com", "rest.company.com"), () ->
complete(StatusCodes.OK));
+ host(List.of("api.company.com", "rest.company.com"), () ->
complete(StatusCodes.OK));
testRoute(matchListOfHosts)
.run(HttpRequest.GET("/").addHeader(Host.create("api.company.com")))
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
index 7a5f761df..f5abce2c3 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
@@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
+import java.util.List;
import java.util.function.Function;
// #withSizeLimitExample
@@ -189,11 +190,11 @@ public class MiscDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// #selectPreferredLanguage
final Route enRoute =
selectPreferredLanguage(
- Arrays.asList(Language.create("en"), Language.create("en-US")),
+ List.of(Language.create("en"), Language.create("en-US")),
lang -> complete(lang.toString()));
final Route deHuRoute =
selectPreferredLanguage(
- Arrays.asList(Language.create("de-DE"), Language.create("hu")),
+ List.of(Language.create("de-DE"), Language.create("hu")),
lang -> complete(lang.toString()));
// tests:
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
index 3bbb9a075..1f64578aa 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
@@ -22,7 +22,6 @@ import org.apache.pekko.http.javadsl.server.Route;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
import java.util.List;
// #multiple-headers
@@ -63,7 +62,7 @@ public class RespondWithDirectivesExamplesTest extends
JUnitJupiterRouteTest {
public void testMultipleHeaders() {
// #multiple-headers
final List<HttpHeader> headers =
- Arrays.asList(
+ List.of(
Origin.create(HttpOrigin.parse("http://pekko.apache.org";)),
RawHeader.create("X-Fish-Name", "Blippy"));
respondWithDefaultHeaders(
@@ -151,7 +150,7 @@ public class RespondWithDirectivesExamplesTest extends
JUnitJupiterRouteTest {
final HttpHeader pekko =
Origin.create(HttpOrigin.parse("http://pekko.apache.org";));
final Route route =
- path("foo", () -> respondWithHeaders(Arrays.asList(gonzo, pekko), ()
-> complete("beep")));
+ path("foo", () -> respondWithHeaders(List.of(gonzo, pekko), () ->
complete("beep")));
testRoute(route)
.run(HttpRequest.GET("/foo"))
@@ -168,7 +167,7 @@ public class RespondWithDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// custom headers
final RawHeader blippy = RawHeader.create("X-Fish-Name", "Blippy");
final HttpHeader pekko =
Origin.create(HttpOrigin.parse("http://pekko.apache.org";));
- final List<HttpHeader> defaultHeaders = Arrays.asList(blippy, pekko);
+ final List<HttpHeader> defaultHeaders = List.of(blippy, pekko);
final RawHeader elTonno = RawHeader.create("X-Fish-Name", "El Tonno");
// format: OFF
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
index 3ea81f524..8e640a73d 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
@@ -23,7 +23,7 @@ import org.apache.pekko.http.javadsl.server.RouteResult;
import org.apache.pekko.http.javadsl.testkit.JUnitJupiterRouteTest;
import org.junit.jupiter.api.Test;
-import java.util.Collections;
+import java.util.List;
import java.util.concurrent.CompletionStage;
import java.util.function.Function;
@@ -82,14 +82,14 @@ public class RouteDirectivesExamplesTest extends
JUnitJupiterRouteTest {
() ->
complete(
StatusCodes.CREATED,
-
Collections.singletonList(ContentType.create(ContentTypes.TEXT_PLAIN_UTF8)),
+
List.of(ContentType.create(ContentTypes.TEXT_PLAIN_UTF8)),
HttpEntities.create("bar"))),
path(
"f",
() ->
complete(
StatusCodes.get(201),
-
Collections.singletonList(ContentType.create(ContentTypes.TEXT_PLAIN_UTF8)),
+
List.of(ContentType.create(ContentTypes.TEXT_PLAIN_UTF8)),
HttpEntities.create("bar"))),
path("g", () -> complete("baz")));
diff --git
a/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
b/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
index 1f8860d0d..f38fbe5d8 100644
---
a/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
+++
b/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
@@ -31,8 +31,8 @@ import org.apache.pekko.util.ByteString;
import org.junit.jupiter.api.Test;
import java.time.Duration;
-import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
// #handleWebSocketMessages
import static org.apache.pekko.http.javadsl.server.Directives.path;
@@ -63,7 +63,7 @@ public class WebSocketDirectivesExamplesTest extends
JUnitJupiterRouteTest {
Source.single("Hello ")
.concat(tm.getStreamedText())
.concat(Source.single("!")));
- return Collections.singletonList(ret);
+ return List.of(ret);
} else if (msg instanceof BinaryMessage bm) {
bm.getStreamedData().runWith(Sink.ignore(),
materializer());
return Collections.emptyList();
@@ -110,7 +110,7 @@ public class WebSocketDirectivesExamplesTest extends
JUnitJupiterRouteTest {
Source.single("Hello ")
.concat(tm.getStreamedText())
.concat(Source.single("!")));
- return Collections.singletonList(ret);
+ return List.of(ret);
} else if (msg instanceof BinaryMessage bm) {
bm.getStreamedData().runWith(Sink.ignore(),
materializer());
return Collections.emptyList();
@@ -135,12 +135,7 @@ public class WebSocketDirectivesExamplesTest extends
JUnitJupiterRouteTest {
// WS creates a WebSocket request for testing
testRoute(websocketMultipleProtocolRoute)
- .run(
- WS(
- Uri.create("/services"),
- wsClient.flow(),
- materializer(),
- Arrays.asList("other", "echo")))
+ .run(WS(Uri.create("/services"), wsClient.flow(), materializer(),
List.of("other", "echo")))
.assertHeaderExists(SecWebSocketProtocol.create("echo"));
wsClient.sendMessage("Peter");
@@ -214,7 +209,7 @@ public class WebSocketDirectivesExamplesTest extends
JUnitJupiterRouteTest {
Uri.create("/services"),
wsClient.flow(),
materializer(),
- Arrays.asList("echo", "alfa", "kilo")))
+ List.of("echo", "alfa", "kilo")))
.assertHeaderExists(SecWebSocketProtocol.create("echo"));
wsClient.sendMessage("ping");
diff --git
a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java
b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java
index 3cd632ac2..ab2ffebe7 100644
---
a/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java
+++
b/http-core/src/test/java/org/apache/pekko/http/javadsl/model/EntityDiscardingTest.java
@@ -15,7 +15,7 @@ package org.apache.pekko.http.javadsl.model;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.apache.pekko.Done;
import org.apache.pekko.actor.ActorSystem;
@@ -30,7 +30,7 @@ public class EntityDiscardingTest {
private ActorSystem sys = ActorSystem.create("test");
private Iterable<ByteString> testData =
- Arrays.asList(ByteString.fromString("abc"),
ByteString.fromString("def"));
+ List.of(ByteString.fromString("abc"), ByteString.fromString("def"));
@Test
public void testHttpRequestDiscardEntity() {
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java
index f6f94e6b5..5f00d9e0c 100644
---
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java
+++
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/JavaRouteTest.java
@@ -17,7 +17,7 @@ import static
org.apache.pekko.http.javadsl.server.Directives.*;
import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
import java.math.BigDecimal;
-import java.util.Arrays;
+import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -60,7 +60,7 @@ public class JavaRouteTest extends JUnitJupiterRouteTest {
private final Unmarshaller<HttpEntity, UUID> UUID_FROM_XML_BODY =
Unmarshaller.forMediaTypes(
- Arrays.asList(MediaTypes.TEXT_XML, MediaTypes.APPLICATION_XML),
+ List.of(MediaTypes.TEXT_XML, MediaTypes.APPLICATION_XML),
Unmarshaller.entityToString())
.thenApply(
s -> {
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java
index 27a8938ba..a459164e1 100644
---
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java
+++
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/UnmarshallerTest.java
@@ -15,7 +15,7 @@ package org.apache.pekko.http.javadsl.server;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.TimeUnit;
import org.apache.pekko.http.javadsl.model.*;
@@ -63,7 +63,7 @@ public class UnmarshallerTest extends JUnitJupiterRouteTest {
public void oneMarshallerCanHaveMultipleMediaTypes() throws Exception {
Unmarshaller<HttpEntity, String> xmlUnmarshaller =
Unmarshaller.forMediaTypes(
- Arrays.asList(MediaTypes.APPLICATION_XML, MediaTypes.TEXT_XML),
+ List.of(MediaTypes.APPLICATION_XML, MediaTypes.TEXT_XML),
Unmarshaller.entityToString())
.thenApply((str) -> "xml");
diff --git
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java
index a026cdc48..d1f4b9e7f 100644
---
a/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java
+++
b/http-tests/src/test/java/org/apache/pekko/http/javadsl/server/directives/CodingDirectivesTest.java
@@ -15,8 +15,8 @@ package org.apache.pekko.http.javadsl.server.directives;
import static org.apache.pekko.http.javadsl.server.Directives.*;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.List;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.apache.pekko.http.javadsl.coding.Coder;
import org.apache.pekko.http.javadsl.model.HttpRequest;
@@ -60,8 +60,7 @@ public class CodingDirectivesTest extends
JUnitJupiterRouteTest {
@Test
public void testEncodingWhenDeflateRequestedAndGzipSupported() {
- TestRoute route =
- testRoute(encodeResponseWith(Arrays.asList(Coder.Gzip), () ->
complete("tester")));
+ TestRoute route = testRoute(encodeResponseWith(List.of(Coder.Gzip), () ->
complete("tester")));
HttpRequest request =
HttpRequest.create().addHeader(AcceptEncoding.create(HttpEncodings.DEFLATE));
@@ -93,9 +92,7 @@ public class CodingDirectivesTest extends
JUnitJupiterRouteTest {
public void testGzipDecoding() {
TestRoute route =
testRoute(
- decodeRequestWith(
- Collections.singleton(Coder.Gzip),
- () -> extractEntity(entity -> complete(entity))));
+ decodeRequestWith(Set.of(Coder.Gzip), () -> extractEntity(entity
-> complete(entity))));
HttpRequest gzipRequest =
HttpRequest.POST("/")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
