Reworking jetty-compression for JPMS

jetty-core/jetty-compression/jetty-compression-brotli/pom.xml

@@ -23,15 +23,9 @@
       <artifactId>brotli4j</artifactId>
       <version>${brotli4j.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-      <version>${netty.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.compression</groupId>
-      <artifactId>jetty-compression-api</artifactId>
-      <version>${project.version}</version>
+      <artifactId>jetty-compression-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

jetty-core/jetty-compression/jetty-compression-brotli/src/main/config/modules/compression-brotli.mod

@@ -10,13 +10,13 @@ compression
 experimental
 
 [depend]
-compression-api
 compression
 
 [files]
 maven://com.aayushatharva.brotli4j/brotli4j/${brotli4j.version}|lib/compression/brotli4j-${brotli4j.version}.jar
 
 [lib]
+lib/compression/jetty-compression-brotli-${jetty.version}.jar
 lib/compression/brotli4j-${brotli4j.version}.jar
 
 [xml]

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;
+}

jetty-core/jetty-compression/jetty-compression-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;
@@ -99,10 +101,10 @@ public DecoderConfig getDefaultDecoderConfig()
     }
 
     @Override
-    public void setDefaultDecoderConfig(DecoderConfig config)
+    public InputStream newDecoderInputStream(InputStream in, DecoderConfig config) throws IOException
     {
-        BrotliDecoderConfig brotliDecoderConfig = BrotliDecoderConfig.class.cast(config);
-        this.defaultDecoderConfig = brotliDecoderConfig;
+        BrotliDecoderConfig brotliDecoderConfig = (BrotliDecoderConfig)config;
+        return new BrotliInputStream(in, brotliDecoderConfig.getBufferSize());
     }
 
     @Override
@@ -112,10 +114,10 @@ public EncoderConfig getDefaultEncoderConfig()
     }
 
     @Override
-    public void setDefaultEncoderConfig(EncoderConfig config)
+    public DecoderSource newDecoderSource(Content.Source source, DecoderConfig config)
     {
-        BrotliEncoderConfig brotliEncoderConfig = BrotliEncoderConfig.class.cast(config);
-        this.defaultEncoderConfig = Objects.requireNonNull(brotliEncoderConfig);
+        BrotliDecoderConfig brotliDecoderConfig = (BrotliDecoderConfig)config;
+        return new BrotliDecoderSource(source, brotliDecoderConfig);
     }
 
     @Override
@@ -149,31 +151,30 @@ public HttpField getXContentEncodingField()
     }
 
     @Override
-    public InputStream newDecoderInputStream(InputStream in, DecoderConfig config) throws IOException
+    public OutputStream newEncoderOutputStream(OutputStream out, EncoderConfig config) throws IOException
     {
-        BrotliDecoderConfig brotliDecoderConfig = BrotliDecoderConfig.class.cast(config);
-        return new BrotliInputStream(in, config.getBufferSize());
+        BrotliEncoderConfig brotliEncoderConfig = (BrotliEncoderConfig)config;
+        return new BrotliOutputStream(out, brotliEncoderConfig.asEncoderParams());
     }
 
     @Override
-    public DecoderSource newDecoderSource(Content.Source source, DecoderConfig config)
+    public EncoderSink newEncoderSink(Content.Sink sink, EncoderConfig config)
     {
-        BrotliDecoderConfig brotliDecoderConfig = BrotliDecoderConfig.class.cast(config);
-        return new BrotliDecoderSource(this, source, brotliDecoderConfig);
+        BrotliEncoderConfig brotliEncoderConfig = (BrotliEncoderConfig)config;
+        return new BrotliEncoderSink(sink, brotliEncoderConfig);
     }
 
     @Override
-    public OutputStream newEncoderOutputStream(OutputStream out, EncoderConfig config) throws IOException
+    public void setDefaultDecoderConfig(DecoderConfig config)
     {
-        BrotliEncoderConfig brotliEncoderConfig = BrotliEncoderConfig.class.cast(config);
-        return new BrotliOutputStream(out, brotliEncoderConfig.asEncoderParams());
+        this.defaultDecoderConfig = (BrotliDecoderConfig)config;
     }
 
     @Override
-    public EncoderSink newEncoderSink(Content.Sink sink, EncoderConfig config)
+    public void setDefaultEncoderConfig(EncoderConfig config)
     {
-        BrotliEncoderConfig brotliEncoderConfig = BrotliEncoderConfig.class.cast(config);
-        return new BrotliEncoderSink(this, sink, brotliEncoderConfig);
+        BrotliEncoderConfig brotliEncoderConfig = (BrotliEncoderConfig)config;
+        this.defaultEncoderConfig = Objects.requireNonNull(brotliEncoderConfig);
     }
 
     private ByteOrder getByteOrder()

jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliDecoderConfig.java

@@ -20,8 +20,8 @@ public class BrotliDecoderConfig implements DecoderConfig
     /**
      * Default Buffer Size as found in Brotli4j.
      */
-    public static final int DEFAULT_BUFFER_SIZE = 16384;
-    public static final int MIN_BUFFER_SIZE = 32;
+    private static final int DEFAULT_BUFFER_SIZE = 16384;
+    private static final int MIN_BUFFER_SIZE = 32;
     private int bufferSize = DEFAULT_BUFFER_SIZE;
 
     @Override
@@ -33,6 +33,6 @@ public int getBufferSize()
     @Override
     public void setBufferSize(int size)
     {
-        this.bufferSize = this.bufferSize = Math.max(MIN_BUFFER_SIZE, size);
+        this.bufferSize = Math.max(MIN_BUFFER_SIZE, size);
     }
 }

jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliEncoderConfig.java

@@ -24,32 +24,25 @@ 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;
+    private static final int DEFAULT_QUALITY = 11;
     /**
      * Default Brotli Window.
      *
      * @see <a href="https://www.brotli.org/encode.html">Encoder Defaults</a>
      */
-    public static final int DEFAULT_WINDOW = 22;
-
-    public static final int MIN_BUFFER_SIZE = 32;
+    private static final int DEFAULT_WINDOW = 22;
+    private 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 +115,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 +139,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;
     }
 }

jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliDecoderSource.java → jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/internal/BrotliDecoderSource.java

@@ -11,29 +11,27 @@
 // ========================================================================
 //
 
-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.BrotliDecoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.util.BufferUtil;
 
 public class BrotliDecoderSource extends DecoderSource
 {
-    private static final ByteBuffer EMPTY_BUFFER = BufferUtil.EMPTY_BUFFER;
-    private final BrotliCompression compression;
     private final DecoderJNI.Wrapper decoder;
 
-    public BrotliDecoderSource(BrotliCompression compression, Content.Source source, BrotliDecoderConfig config)
+    public BrotliDecoderSource(Content.Source source, BrotliDecoderConfig config)
     {
         super(source);
-        this.compression = compression;
         try
         {
-            this.decoder = new DecoderJNI.Wrapper(compression.getBufferSize());
+            this.decoder = new DecoderJNI.Wrapper(config.getBufferSize());
         }
         catch (IOException e)
         {
@@ -58,10 +56,7 @@ protected Content.Chunk nextChunk(Content.Chunk readChunk) throws IOException
                 {
                     return last ? Content.Chunk.EOF : Content.Chunk.EMPTY;
                 }
-                case OK ->
-                {
-                    decoder.push(0);
-                }
+                case OK -> decoder.push(0);
                 case NEEDS_MORE_INPUT ->
                 {
                     ByteBuffer input = decoder.getInputBuffer();
@@ -81,10 +76,7 @@ protected Content.Chunk nextChunk(Content.Chunk readChunk) throws IOException
                     // rely on status.OK to go to EOF
                     return Content.Chunk.from(output, false);
                 }
-                default ->
-                {
-                    throw new IOException("Decoder failure: Corrupted input buffer");
-                }
+                default -> throw new IOException("Decoder failure: Corrupted input buffer");
             }
         }
     }

jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/BrotliEncoderSink.java → jetty-core/jetty-compression/jetty-compression-brotli/src/main/java/org/eclipse/jetty/compression/brotli/internal/BrotliEncoderSink.java

@@ -11,19 +11,19 @@
 // ========================================================================
 //
 
-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.BrotliEncoderConfig;
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class BrotliEncoderSink extends EncoderSink
 {
@@ -44,23 +44,21 @@ enum State
         /**
          * Finish operation completed.
          */
-        FINISHED;
+        FINISHED
     }
 
-    private static final Logger LOG = LoggerFactory.getLogger(BrotliEncoderSink.class);
     private static final ByteBuffer EMPTY_BUFFER = ByteBuffer.allocate(0);
-    private final BrotliCompression compression;
     private final EncoderJNI.Wrapper encoder;
     private final ByteBuffer inputBuffer;
-    private final AtomicReference<State> state = new AtomicReference<State>(State.PROCESSING);
+    private final AtomicReference<State> state = new AtomicReference<>(State.PROCESSING);
 
-    public BrotliEncoderSink(BrotliCompression compression, Content.Sink sink, BrotliEncoderConfig config)
+    public BrotliEncoderSink(Content.Sink sink, BrotliEncoderConfig config)
     {
         super(sink);
-        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)
@@ -94,7 +92,7 @@ protected WriteRecord encode(boolean last, ByteBuffer content)
                             }
 
                             // the only place the input buffer gets set.
-                            int len = BufferUtil.put(content, inputBuffer);
+                            BufferUtil.put(content, inputBuffer);
                             // do not flip input buffer, that's not what Brotli4j expects/wants.
                         }
                         // content is fully consumed.
@@ -174,9 +172,4 @@ protected void release()
     {
         this.encoder.destroy();
     }
-
-    private State getState()
-    {
-        return state.get();
-    }
 }