chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <[email protected]>

Author: lachlan-roberts

invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java

@@ -174,9 +174,8 @@ abstract static class TestCase {
     abstract int expectedResponseCode();
 
     /**
-     * Expected response headers map, header name -> value.
-     * Value "*" asserts the header is present with any value.
-     * Value "-" asserts the header is not present.
+     * Expected response headers map, header name -> value. Value "*" asserts the header is present
+     * with any value. Value "-" asserts the header is not present.
      *
      * @return the expected response headers for this test case.
      */
@@ -268,8 +267,7 @@ public void helloWorld() throws Exception {
         fullTarget("HelloWorld"),
         ImmutableList.of(
             TestCase.builder()
-                .setExpectedResponseHeaders(ImmutableMap.of(
-                    "Content-Length", "*"))
+                .setExpectedResponseHeaders(ImmutableMap.of("Content-Length", "*"))
                 .setExpectedResponseText("hello\n")
                 .build(),
             FAVICON_TEST_CASE,
@@ -315,23 +313,23 @@ public void bufferedWrites() throws Exception {
             TestCase.builder()
                 .setUrl("/target?writes=2")
                 .setExpectedResponseText("write 0\nwrite 1\n")
-                .setExpectedResponseHeaders(ImmutableMap.of(
-                    "x-write-0", "true",
-                    "x-write-1", "true",
-                    "x-written", "true",
-                    "Content-Length", "16"
-                ))
+                .setExpectedResponseHeaders(
+                    ImmutableMap.of(
+                        "x-write-0", "true",
+                        "x-write-1", "true",
+                        "x-written", "true",
+                        "Content-Length", "16"))
                 .build(),
             TestCase.builder()
                 .setUrl("/target?writes=2&flush=true")
                 .setExpectedResponseText("write 0\nwrite 1\n")
-                .setExpectedResponseHeaders(ImmutableMap.of(
-                    "x-write-0", "true",
-                    "x-write-1", "true",
-                    "x-written", "-",
-                    "Transfer-Encoding", "chunked"))
-                .build()
-        ));
+                .setExpectedResponseHeaders(
+                    ImmutableMap.of(
+                        "x-write-0", "true",
+                        "x-write-1", "true",
+                        "x-written", "-",
+                        "Transfer-Encoding", "chunked"))
+                .build()));
   }
 
   @Test
@@ -683,10 +681,12 @@ public void packageless() throws Exception {
   public void multipart() throws Exception {
     MultiPartRequestContent multiPartRequestContent = new MultiPartRequestContent();
     byte[] bytes = new byte[17];
-    multiPartRequestContent.addPart(new ContentSourcePart("bytes", null,
-        HttpFields.EMPTY, new ByteBufferRequestContent(ByteBuffer.wrap(bytes))));
-    multiPartRequestContent.addPart(new MultiPart.ContentSourcePart("string", null,
-        HttpFields.EMPTY, new StringRequestContent("1234567890")));
+    multiPartRequestContent.addPart(
+        new ContentSourcePart(
+            "bytes", null, HttpFields.EMPTY, new ByteBufferRequestContent(ByteBuffer.wrap(bytes))));
+    multiPartRequestContent.addPart(
+        new MultiPart.ContentSourcePart(
+            "string", null, HttpFields.EMPTY, new StringRequestContent("1234567890")));
     multiPartRequestContent.close();
 
     String expectedResponse =
@@ -842,27 +842,39 @@ private void testFunction(
         String uri = "http://localhost:" + serverPort + testCase.url();
         Request request = httpClient.POST(uri);
 
-        request.headers(headers -> {
-          testCase.httpContentType().ifPresent(contentType -> headers.put(HttpHeader.CONTENT_TYPE, contentType));
-          testCase.httpHeaders().forEach(headers::put);
-        });
+        request.headers(
+            headers -> {
+              testCase
+                  .httpContentType()
+                  .ifPresent(contentType -> headers.put(HttpHeader.CONTENT_TYPE, contentType));
+              testCase.httpHeaders().forEach(headers::put);
+            });
         request.body(testCase.requestContent());
         ContentResponse response = request.send();
         expect
             .withMessage("Response to %s is %s %s", uri, response.getStatus(), response.getReason())
             .that(response.getStatus())
             .isEqualTo(testCase.expectedResponseCode());
-        testCase.expectedResponseHeaders().ifPresent(expectedResponseHeaders -> {
-          for (Map.Entry<String, String> entry : expectedResponseHeaders.entrySet()) {
-            if ("*".equals(entry.getValue())) {
-              expect.that(response.getHeaders().getFieldNamesCollection()).contains(entry.getKey());
-            } else if ("-".equals(entry.getValue())) {
-              expect.that(response.getHeaders().getFieldNamesCollection()).doesNotContain(entry.getKey());
-            } else {
-              expect.that(response.getHeaders().getValuesList(entry.getKey())).contains(entry.getValue());
-            }
-          }
-        });
+        testCase
+            .expectedResponseHeaders()
+            .ifPresent(
+                expectedResponseHeaders -> {
+                  for (Map.Entry<String, String> entry : expectedResponseHeaders.entrySet()) {
+                    if ("*".equals(entry.getValue())) {
+                      expect
+                          .that(response.getHeaders().getFieldNamesCollection())
+                          .contains(entry.getKey());
+                    } else if ("-".equals(entry.getValue())) {
+                      expect
+                          .that(response.getHeaders().getFieldNamesCollection())
+                          .doesNotContain(entry.getKey());
+                    } else {
+                      expect
+                          .that(response.getHeaders().getValuesList(entry.getKey()))
+                          .contains(entry.getValue());
+                    }
+                  }
+                });
         testCase
             .expectedResponseText()
             .ifPresent(text -> expect.that(response.getContentAsString()).isEqualTo(text));

invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java

@@ -115,9 +115,9 @@ private interface HttpRequestTest {
 
   /**
    * Tests methods on the {@link HttpRequest} object while the request is being serviced. We are not
-   * guaranteed that the underlying {@link Request} object will still be valid when the
-   * request completes, and in fact in Jetty it isn't. So we perform the checks in the context of
-   * the handler, and report any exception back to the test method.
+   * guaranteed that the underlying {@link Request} object will still be valid when the request
+   * completes, and in fact in Jetty it isn't. So we perform the checks in the context of the
+   * handler, and report any exception back to the test method.
    */
   @Test
   public void httpRequestMethods() throws Exception {
@@ -198,12 +198,13 @@ private void httpRequestMethods(
       org.eclipse.jetty.client.Request request =
           httpClient
               .POST(uri)
-              .headers(m -> {
-                m.add(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8");
-                m.add("foo", "bar");
-                m.add("foo", "baz");
-                m.add("CaSe-SeNsItIvE", "VaLuE");
-              })
+              .headers(
+                  m -> {
+                    m.add(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8");
+                    m.add("foo", "bar");
+                    m.add("foo", "baz");
+                    m.add("CaSe-SeNsItIvE", "VaLuE");
+                  })
               .body(new StringRequestContent(TEST_BODY));
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
@@ -249,16 +250,18 @@ public void multiPartRequest() throws Exception {
     httpClient.start();
     String uri = "http://localhost:" + serverPort + "/";
     MultiPartRequestContent multiPart = new MultiPartRequestContent();
-    HttpFields textHttpFields = HttpFields.build()
-      .add("foo", "bar");
-    multiPart.addPart(new MultiPart.ContentSourcePart("text", null, textHttpFields,
-        new StringRequestContent(TEST_BODY)));
-    HttpFields.Mutable bytesHttpFields = HttpFields.build()
-      .add("foo", "baz")
-      .add("foo", "buh");
+    HttpFields textHttpFields = HttpFields.build().add("foo", "bar");
+    multiPart.addPart(
+        new MultiPart.ContentSourcePart(
+            "text", null, textHttpFields, new StringRequestContent(TEST_BODY)));
+    HttpFields.Mutable bytesHttpFields = HttpFields.build().add("foo", "baz").add("foo", "buh");
     assertThat(bytesHttpFields.getValuesList("foo")).containsExactly("baz", "buh");
-    multiPart.addPart(new MultiPart.ContentSourcePart("binary", "/tmp/binary.x",
-        bytesHttpFields, new ByteBufferRequestContent(ByteBuffer.wrap(RANDOM_BYTES))));
+    multiPart.addPart(
+        new MultiPart.ContentSourcePart(
+            "binary",
+            "/tmp/binary.x",
+            bytesHttpFields,
+            new ByteBufferRequestContent(ByteBuffer.wrap(RANDOM_BYTES))));
     multiPart.close();
     HttpRequestTest test =
         request -> {
@@ -290,9 +293,8 @@ public void multiPartRequest() throws Exception {
         };
     try (SimpleServer server = new SimpleServer(testHandler)) {
       testReference.set(test);
-      org.eclipse.jetty.client.Request request = httpClient.POST(uri)
-          .headers(m -> m.put("foo", "oof"))
-          .body(multiPart);
+      org.eclipse.jetty.client.Request request =
+          httpClient.POST(uri).headers(m -> m.put("foo", "oof")).body(multiPart);
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
       throwIfNotNull(exceptionReference.get());