jetty · joakime · Nov 18, 2024 · Nov 13, 2024 · Nov 13, 2024 · Nov 14, 2024
diff --git a/jetty-core/jetty-compression/jetty-compression-api/pom.xml b/jetty-core/jetty-compression/jetty-compression-api/pom.xml
@@ -19,7 +19,15 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
+      <artifactId>jetty-http</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

diff --git a/jetty-core/jetty-compression/jetty-compression-api/src/main/java/module-info.java b/jetty-core/jetty-compression/jetty-compression-api/src/main/java/module-info.java
@@ -0,0 +1,20 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.compression
+{
+    requires transitive org.eclipse.jetty.http;
+    requires org.slf4j;
+
+    exports org.eclipse.jetty.compression;
+}
diff --git a/jetty-core/jetty-compression/jetty-compression-brotli/pom.xml b/jetty-core/jetty-compression/jetty-compression-brotli/pom.xml
@@ -23,11 +23,11 @@
       <artifactId>brotli4j</artifactId>
       <version>${brotli4j.version}</version>
     </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-buffer</artifactId>
       <version>${netty.version}</version>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
       <artifactId>jetty-compression-api</artifactId>

diff --git a/jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/module-info.java b/jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/module-info.java
@@ -0,0 +1,21 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.compression.brotli
+{
+    requires transitive org.eclipse.jetty.compression;
+    requires org.slf4j;
+
+    requires com.aayushatharva.brotli4j;
+    exports org.eclipse.jetty.compression.brotli;
+}
diff --git a/...pression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliCompression.java b/...pression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliCompression.java
@@ -28,6 +28,8 @@
 import org.eclipse.jetty.compression.DecoderSource;
 import org.eclipse.jetty.compression.EncoderConfig;
 import org.eclipse.jetty.compression.EncoderSink;
+import org.eclipse.jetty.compression.brotli.internal.BrotliDecoderSource;
+import org.eclipse.jetty.compression.brotli.internal.BrotliEncoderSink;
 import org.eclipse.jetty.http.CompressedContentFormat;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;

diff --git a/...ession-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliEncoderConfig.java b/...ession-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliEncoderConfig.java
@@ -25,12 +25,6 @@ public class BrotliEncoderConfig implements EncoderConfig
      * @see <a href="https://www.brotli.org/encode.html">Encoder Defaults</a>
      */
     public static final int DEFAULT_QUALITY = 11;
-    /**
-     * Default Brotli Mode (Strategy).
-     *
-     * @see <a href="https://www.brotli.org/encode.html">Encoder Defaults</a>
-     */
-    public static final Encoder.Mode DEFAULT_MODE = Encoder.Mode.GENERIC;
     /**
      * Default Brotli Window.
      *
@@ -41,15 +35,15 @@ public class BrotliEncoderConfig implements EncoderConfig
     public static final int MIN_BUFFER_SIZE = 32;
 
     private int bufferSize = 4096;
+    private int strategy = 0;
     private int quality = DEFAULT_QUALITY;
-    private Encoder.Mode mode = DEFAULT_MODE;
     private int lgWindow = DEFAULT_WINDOW;
 
     public Parameters asEncoderParams()
     {
         Parameters params = new Parameters();
         params.setQuality(getCompressionLevel());
-        params.setMode(getMode());
+        params.setMode(Encoder.Mode.of(getStrategy()));
         params.setWindow(getLgWindow());
         return params;
     }
@@ -122,15 +116,10 @@ public void setLgWindow(int window)
         this.lgWindow = window;
     }
 
-    public Encoder.Mode getMode()
-    {
-        return mode;
-    }
-
     @Override
     public int getStrategy()
     {
-        return mode.ordinal();
+        return strategy;
     }
 
     /**
@@ -151,6 +140,6 @@ public void setStrategy(int strategy)
         if ((strategy < 0) || (strategy > Encoder.Mode.values().length))
             throw new IllegalArgumentException("Unsupported brotli strategy mode: " + strategy);
 
-        mode = Encoder.Mode.of(strategy);
+        this.strategy = strategy;
     }
 }
diff --git a/...mpression/brotli/BrotliDecoderSource.java → .../brotli/internal/BrotliDecoderSource.java b/...mpression/brotli/BrotliDecoderSource.java → .../brotli/internal/BrotliDecoderSource.java
@@ -11,13 +11,15 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.brotli;
+package org.eclipse.jetty.compression.brotli.internal;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import com.aayushatharva.brotli4j.decoder.DecoderJNI;
 import org.eclipse.jetty.compression.DecoderSource;
+import org.eclipse.jetty.compression.brotli.BrotliCompression;
+import org.eclipse.jetty.compression.brotli.BrotliDecoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.util.BufferUtil;
 

diff --git a/...compression/brotli/BrotliEncoderSink.java → ...on/brotli/internal/BrotliEncoderSink.java b/...compression/brotli/BrotliEncoderSink.java → ...on/brotli/internal/BrotliEncoderSink.java
@@ -11,14 +11,17 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.brotli;
+package org.eclipse.jetty.compression.brotli.internal;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.aayushatharva.brotli4j.encoder.Encoder;
 import com.aayushatharva.brotli4j.encoder.EncoderJNI;
 import org.eclipse.jetty.compression.EncoderSink;
+import org.eclipse.jetty.compression.brotli.BrotliCompression;
+import org.eclipse.jetty.compression.brotli.BrotliEncoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
@@ -60,7 +63,8 @@ public BrotliEncoderSink(BrotliCompression compression, Content.Sink sink, Brotl
         this.compression = compression;
         try
         {
-            this.encoder = new EncoderJNI.Wrapper(config.getBufferSize(), config.getCompressionLevel(), config.getLgWindow(), config.getMode());
+            Encoder.Mode mode = Encoder.Mode.of(config.getStrategy());
+            this.encoder = new EncoderJNI.Wrapper(config.getBufferSize(), config.getCompressionLevel(), config.getLgWindow(), mode);
             this.inputBuffer = encoder.getInputBuffer();
         }
         catch (IOException e)

diff --git a/jetty-core/jetty-compression/jetty-compression-gzip/src/main/java/module-info.java b/jetty-core/jetty-compression/jetty-compression-gzip/src/main/java/module-info.java
@@ -0,0 +1,20 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.compression.gzip
+{
+    requires transitive org.eclipse.jetty.compression;
+    requires org.slf4j;
+
+    exports org.eclipse.jetty.compression.gzip;
+}
diff --git a/...ty-compression-gzip/src/main/java/org/eclipse/jetty/compression/gzip/GzipCompression.java b/...ty-compression-gzip/src/main/java/org/eclipse/jetty/compression/gzip/GzipCompression.java
@@ -24,6 +24,10 @@
 import org.eclipse.jetty.compression.DecoderSource;
 import org.eclipse.jetty.compression.EncoderConfig;
 import org.eclipse.jetty.compression.EncoderSink;
+import org.eclipse.jetty.compression.gzip.internal.ConfiguredGzipInputStream;
+import org.eclipse.jetty.compression.gzip.internal.ConfiguredGzipOutputStream;
+import org.eclipse.jetty.compression.gzip.internal.GzipDecoderSource;
+import org.eclipse.jetty.compression.gzip.internal.GzipEncoderSink;
 import org.eclipse.jetty.http.CompressedContentFormat;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;

diff --git a/...ssion/gzip/ConfiguredGzipInputStream.java → ...p/internal/ConfiguredGzipInputStream.java b/...ssion/gzip/ConfiguredGzipInputStream.java → ...p/internal/ConfiguredGzipInputStream.java
@@ -11,12 +11,14 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.gzip;
+package org.eclipse.jetty.compression.gzip.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
 
+import org.eclipse.jetty.compression.gzip.GzipDecoderConfig;
+
 public class ConfiguredGzipInputStream extends GZIPInputStream
 {
     public ConfiguredGzipInputStream(InputStream in, GzipDecoderConfig config) throws IOException

diff --git a/...sion/gzip/ConfiguredGzipOutputStream.java → .../internal/ConfiguredGzipOutputStream.java b/...sion/gzip/ConfiguredGzipOutputStream.java → .../internal/ConfiguredGzipOutputStream.java
@@ -11,13 +11,15 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.gzip;
+package org.eclipse.jetty.compression.gzip.internal;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.util.zip.GZIPOutputStream;
 
+import org.eclipse.jetty.compression.gzip.GzipEncoderConfig;
+
 /**
  * A {@link GZIPOutputStream} that you can configure, unlike the
  * JVM default provided one.

diff --git a/...y/compression/gzip/GzipDecoderSource.java → ...sion/gzip/internal/GzipDecoderSource.java b/...y/compression/gzip/GzipDecoderSource.java → ...sion/gzip/internal/GzipDecoderSource.java
@@ -11,14 +11,16 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.gzip;
+package org.eclipse.jetty.compression.gzip.internal;
 
 import java.nio.ByteBuffer;
 import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
 import java.util.zip.ZipException;
 
 import org.eclipse.jetty.compression.DecoderSource;
+import org.eclipse.jetty.compression.gzip.GzipCompression;
+import org.eclipse.jetty.compression.gzip.GzipDecoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.util.BufferUtil;

diff --git a/...tty/compression/gzip/GzipEncoderSink.java → ...ession/gzip/internal/GzipEncoderSink.java b/...tty/compression/gzip/GzipEncoderSink.java → ...ession/gzip/internal/GzipEncoderSink.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.gzip;
+package org.eclipse.jetty.compression.gzip.internal;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -20,6 +20,8 @@
 import java.util.zip.Deflater;
 
 import org.eclipse.jetty.compression.EncoderSink;
+import org.eclipse.jetty.compression.gzip.GzipCompression;
+import org.eclipse.jetty.compression.gzip.GzipEncoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.util.BufferUtil;

diff --git a/...gzip/src/test/java/org/eclipse/jetty/compression/gzip/ConfiguredGzipOutputStreamTest.java b/...gzip/src/test/java/org/eclipse/jetty/compression/gzip/ConfiguredGzipOutputStreamTest.java
@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.zip.Deflater;
 
+import org.eclipse.jetty.compression.gzip.internal.ConfiguredGzipOutputStream;
 import org.junit.jupiter.api.Test;
 
 import static java.nio.charset.StandardCharsets.UTF_8;

diff --git a/jetty-core/jetty-compression/jetty-compression-server/src/main/java/module-info.java b/jetty-core/jetty-compression/jetty-compression-server/src/main/java/module-info.java
@@ -0,0 +1,21 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.compression.server
+{
+    requires transitive org.eclipse.jetty.compression;
+    requires transitive org.eclipse.jetty.server;
+    requires org.slf4j;
+
+    exports org.eclipse.jetty.compression.server;
+}
diff --git a/jetty-core/jetty-compression/jetty-compression-zstandard/src/main/java/module-info.java b/jetty-core/jetty-compression/jetty-compression-zstandard/src/main/java/module-info.java
@@ -0,0 +1,22 @@
+//
+// ========================================================================
+// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.compression.zstandard
+{
+    requires transitive org.eclipse.jetty.compression;
+    requires org.slf4j;
+
+    requires com.github.luben.zstd_jni;
+
+    exports org.eclipse.jetty.compression.zstandard;
+}
diff --git a/...zstandard/src/main/java/org/eclipse/jetty/compression/zstandard/ZstandardCompression.java b/...zstandard/src/main/java/org/eclipse/jetty/compression/zstandard/ZstandardCompression.java
@@ -27,6 +27,8 @@
 import org.eclipse.jetty.compression.DecoderSource;
 import org.eclipse.jetty.compression.EncoderConfig;
 import org.eclipse.jetty.compression.EncoderSink;
+import org.eclipse.jetty.compression.zstandard.internal.ZstandardDecoderSource;
+import org.eclipse.jetty.compression.zstandard.internal.ZstandardEncoderSink;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.PreEncodedHttpField;

diff --git a/...ion/zstandard/ZstandardDecoderSource.java → ...dard/internal/ZstandardDecoderSource.java b/...ion/zstandard/ZstandardDecoderSource.java → ...dard/internal/ZstandardDecoderSource.java
@@ -11,12 +11,14 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.zstandard;
+package org.eclipse.jetty.compression.zstandard.internal;
 
 import java.nio.ByteBuffer;
 
 import com.github.luben.zstd.ZstdDecompressCtx;
 import org.eclipse.jetty.compression.DecoderSource;
+import org.eclipse.jetty.compression.zstandard.ZstandardCompression;
+import org.eclipse.jetty.compression.zstandard.ZstandardDecoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.io.RetainableByteBuffer;
 

diff --git a/...ssion/zstandard/ZstandardEncoderSink.java → ...andard/internal/ZstandardEncoderSink.java b/...ssion/zstandard/ZstandardEncoderSink.java → ...andard/internal/ZstandardEncoderSink.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.compression.zstandard;
+package org.eclipse.jetty.compression.zstandard.internal;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -21,6 +21,8 @@
 import com.github.luben.zstd.ZstdCompressCtx;
 import com.github.luben.zstd.ZstdFrameProgression;
 import org.eclipse.jetty.compression.EncoderSink;
+import org.eclipse.jetty.compression.zstandard.ZstandardCompression;
+import org.eclipse.jetty.compression.zstandard.ZstandardEncoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.io.RetainableByteBuffer;
 import org.eclipse.jetty.util.BufferUtil;