Update Jetty version to 12.1.0.alpha2 for testing

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

Author: lachlan-roberts

pom.xml

@@ -65,7 +65,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty.version>9.4.57.v20241219</jetty.version>
-    <jetty12.version>12.0.18</jetty12.version>
+    <jetty12.version>12.1.0.alpha2</jetty12.version>
     <io.grpc>1.71.0</io.grpc>
     <io.netty>4.1.119.Final</io.netty>
     <slf4j.version>2.0.17</slf4j.version>

runtime/local_jetty12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java

@@ -49,6 +49,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
@@ -509,9 +510,12 @@ private void fullWebAppScanner(int interval) throws IOException {
     scanner.setReportExistingFilesOnStartup(false);
     scanner.setScanDepth(3);
 
-    scanner.addListener((Scanner.BulkListener) filenames -> {
-      log.info("A file has changed, reloading the web application.");
-      reloadWebApp();
+    scanner.addListener(new Scanner.BulkListener() {
+      @Override
+      public void pathsChanged(Map<Path, Scanner.Notification> changeSet) throws Exception {
+        log.info("A file has changed, reloading the web application.");
+        reloadWebApp();
+      }
     });
 
     LifeCycle.start(scanner);

runtime/local_jetty12_ee10/src/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java

@@ -54,10 +54,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -517,9 +517,12 @@ private void fullWebAppScanner(int interval) throws IOException {
     scanner.setReportExistingFilesOnStartup(false);
     scanner.setScanDepth(3);
 
-    scanner.addListener((Scanner.BulkListener) filenames -> {
-      log.info("A file has changed, reloading the web application.");
-      reloadWebApp();
+    scanner.addListener(new Scanner.BulkListener() {
+      @Override
+      public void pathsChanged(Map<Path, Scanner.Notification> changeSet) throws Exception {
+          log.info("A file has changed, reloading the web application.");
+          reloadWebApp();
+      }
     });
 
     LifeCycle.start(scanner);

runtime/runtime_impl_jetty12/pom.xml

@@ -121,6 +121,20 @@
             <version>${jetty12.version}</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty.compression</groupId>
+          <artifactId>jetty-compression-common</artifactId>
+          <optional>true</optional>
+          <version>${jetty12.version}</version>
+          <type>jar</type>
+        </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty.compression</groupId>
+          <artifactId>jetty-compression-gzip</artifactId>
+          <optional>true</optional>
+          <version>${jetty12.version}</version>
+          <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.ee8</groupId>
             <artifactId>jetty-ee8-quickstart</artifactId>
@@ -572,6 +586,8 @@
                                     <include>org.eclipse.jetty:jetty-server</include>
                                     <include>org.eclipse.jetty:jetty-session</include>
                                     <include>org.eclipse.jetty:jetty-security</include>
+                                    <include>org.eclipse.jetty.compression:jetty-compression-common</include>
+                                    <include>org.eclipse.jetty.compression:jetty-compression-gzip</include>
                                     <include>org.slf4j:slf4j-jdk14</include>
                                     <include>org.slf4j:slf4j-api</include>
                                     <include>org.eclipse.jetty:jetty-util-ajax</include>

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/impl/ContentChunk.java

@@ -17,43 +17,15 @@
 package com.google.apphosting.runtime.jetty.delegate.impl;
 
 import java.nio.ByteBuffer;
-import java.util.Objects;
-
-import org.eclipse.jetty.io.Content;
-import org.eclipse.jetty.io.Retainable;
+import org.eclipse.jetty.io.internal.ByteBufferChunk;
 import org.eclipse.jetty.util.BufferUtil;
 
-public class ContentChunk extends Retainable.ReferenceCounter implements Content.Chunk {
-  private final ByteBuffer byteBuffer;
-  private final boolean last;
-
+public class ContentChunk extends ByteBufferChunk.WithReferenceCount {
   public ContentChunk(byte[] bytes) {
     this(BufferUtil.toBuffer(bytes), true);
   }
 
   public ContentChunk(ByteBuffer byteBuffer, boolean last) {
-    this.byteBuffer = Objects.requireNonNull(byteBuffer);
-    this.last = last;
-  }
-
-  @Override
-  public ByteBuffer getByteBuffer() {
-    return byteBuffer;
-  }
-
-  @Override
-  public boolean isLast() {
-    return last;
-  }
-
-  @Override
-  public String toString() {
-
-    return String.format(
-        "%s@%x[l=%b,b=%s]",
-        getClass().getSimpleName(),
-        hashCode(),
-        isLast(),
-        BufferUtil.toDetailString(getByteBuffer()));
+    super(byteBuffer, last);
   }
 }

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/impl/DelegateRpcExchange.java

@@ -33,8 +33,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.jetty.io.ByteBufferAccumulator;
 import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.util.Attributes;
 import org.eclipse.jetty.util.Callback;
 
@@ -46,7 +46,7 @@ public class DelegateRpcExchange implements DelegateExchange {
   private final HttpPb.HttpRequest _request;
   private final AtomicReference<Content.Chunk> _content = new AtomicReference<>();
   private final MutableUpResponse _response;
-  private final ByteBufferAccumulator accumulator = new ByteBufferAccumulator();
+  private final RetainableByteBuffer.DynamicCapacity accumulator = new RetainableByteBuffer.DynamicCapacity();
   private final CompletableFuture<Void> _completion = new CompletableFuture<>();
   private final Attributes _attributes = new Attributes.Lazy();
   private final String _httpMethod;
@@ -158,13 +158,15 @@ public void addHeader(String name, String value) {
 
   @Override
   public void write(boolean last, ByteBuffer content, Callback callback) {
-    if (content != null) accumulator.copyBuffer(content);
+    if (content != null) {
+      accumulator.append(content);
+    }
     callback.succeeded();
   }
 
   @Override
   public void succeeded() {
-    _response.setHttpResponseResponse(ByteString.copyFrom(accumulator.takeByteBuffer()));
+    _response.setHttpResponseResponse(ByteString.copyFrom(accumulator.takeByteArray()));
     _response.setError(RuntimePb.UPResponse.ERROR.OK_VALUE);
     _completion.complete(null);
   }

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/internal/DelegateEndpoint.java

@@ -18,7 +18,7 @@
 
 import com.google.apphosting.runtime.jetty.delegate.api.DelegateExchange;
 import java.io.IOException;
-import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadPendingException;
 import java.nio.channels.WritePendingException;
@@ -40,12 +40,12 @@ public DelegateExchange getDelegateExchange() {
   }
 
   @Override
-  public InetSocketAddress getLocalAddress() {
+  public SocketAddress getLocalSocketAddress() {
     return _exchange.getLocalAddr();
   }
 
   @Override
-  public InetSocketAddress getRemoteAddress() {
+  public SocketAddress getRemoteSocketAddress() {
     return _exchange.getRemoteAddr();
   }
 
@@ -121,6 +121,11 @@ public boolean isFillInterested() {
   @Override
   public void write(Callback callback, ByteBuffer... buffers) throws WritePendingException {}
 
+  @Override
+  public Callback cancelWrite(Throwable throwable) {
+    return null;
+  }
+
   @Override
   public Connection getConnection() {
     return null;

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/internal/DelegateHttpStream.java

@@ -88,6 +88,11 @@ public void send(
     delegateExchange.write(last, content, callback);
   }
 
+  @Override
+  public Runnable cancelSend(Throwable throwable, Callback callback) {
+    return null;
+  }
+
   @Override
   public void push(MetaData.Request request) {
     throw new UnsupportedOperationException("push not supported");