Validate zstd compression

micronaut-projects · Apr 25, 2024 · 4da7ff4 · 4da7ff4
1 parent 336907a
commit 4da7ff4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -53,6 +53,7 @@ systemlambda = "1.2.1"
 testcontainers = "1.19.7"
 vertx = "4.5.7"
 wiremock = "2.33.2"
+zstdjni = "1.5.6-3"
 
 #
 # Versions which start with managed- are managed by Micronaut in the sense
@@ -271,6 +272,8 @@ httpcomponents-mime = { module = "org.apache.httpcomponents:httpmime", version.r
 
 wiremock = { module = "com.github.tomakehurst:wiremock-jre8", version.ref = "wiremock" }
 
+zstdjni = { module = "com.github.luben:zstd-jni", version.ref = "zstdjni" }
+
 [bundles]
 asm = ["asm", "asm-commons"]
 

diff --git a/http-server-netty/build.gradle b/http-server-netty/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     compileOnly libs.managed.netty.incubator.codec.http3
     compileOnly libs.brotli4j
 
+    testRuntimeOnly libs.zstdjni
     testImplementation libs.jmh.core
     testAnnotationProcessor libs.jmh.generator.annprocess
 

diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/CompressionSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/CompressionSpec.groovy
@@ -24,6 +24,8 @@ import io.netty.handler.codec.compression.SnappyFrameDecoder
 import io.netty.handler.codec.compression.SnappyFrameEncoder
 import io.netty.handler.codec.compression.ZlibCodecFactory
 import io.netty.handler.codec.compression.ZlibWrapper
+import io.netty.handler.codec.compression.ZstdDecoder
+import io.netty.handler.codec.compression.ZstdEncoder
 import io.netty.handler.codec.http.HttpHeaderNames
 import io.netty.handler.codec.http.HttpHeaderValues
 import jakarta.inject.Singleton
@@ -72,6 +74,7 @@ class CompressionSpec extends Specification {
         HttpHeaderValues.GZIP      | ZlibCodecFactory.newZlibDecoder(ZlibWrapper.GZIP)
         HttpHeaderValues.DEFLATE   | ZlibCodecFactory.newZlibDecoder(ZlibWrapper.ZLIB)
         HttpHeaderValues.SNAPPY    | new SnappyFrameDecoder()
+        HttpHeaderValues.ZSTD      | new ZstdDecoder()
     }
 
     def compressionLevel(int threshold, int actual, boolean compressed) {
@@ -142,6 +145,7 @@ class CompressionSpec extends Specification {
         HttpHeaderValues.DEFLATE   | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.ZLIB)
         HttpHeaderValues.X_DEFLATE | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.ZLIB)
         HttpHeaderValues.SNAPPY    | new SnappyFrameEncoder()
+        HttpHeaderValues.ZSTD      | new ZstdEncoder()
     }
 
     @Requires(property = "spec.name", value = "CompressionSpec")

diff --git a/...src/test/groovy/io/micronaut/http/server/netty/handler/PipeliningServerHandlerSpec.groovy b/...src/test/groovy/io/micronaut/http/server/netty/handler/PipeliningServerHandlerSpec.groovy
@@ -15,6 +15,7 @@ import io.netty.channel.embedded.EmbeddedChannel
 import io.netty.handler.codec.compression.SnappyFrameEncoder
 import io.netty.handler.codec.compression.ZlibCodecFactory
 import io.netty.handler.codec.compression.ZlibWrapper
+import io.netty.handler.codec.compression.ZstdEncoder
 import io.netty.handler.codec.http.DefaultFullHttpRequest
 import io.netty.handler.codec.http.DefaultFullHttpResponse
 import io.netty.handler.codec.http.DefaultHttpContent
@@ -414,6 +415,7 @@ class PipeliningServerHandlerSpec extends Specification {
         HttpHeaderValues.DEFLATE   | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE)
         HttpHeaderValues.X_DEFLATE | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE)
         HttpHeaderValues.SNAPPY    | new SnappyFrameEncoder()
+        HttpHeaderValues.ZSTD      | new ZstdEncoder()
     }
 
     def 'decompression full to full'(ChannelHandler compressor, CharSequence contentEncoding) {
@@ -465,6 +467,7 @@ class PipeliningServerHandlerSpec extends Specification {
         HttpHeaderValues.DEFLATE   | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE)
         HttpHeaderValues.X_DEFLATE | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE)
         HttpHeaderValues.SNAPPY    | new SnappyFrameEncoder()
+        HttpHeaderValues.ZSTD      | new ZstdEncoder()
     }
 
     def 'decompression parts to stream'(ChannelHandler compressor, CharSequence contentEncoding) {
@@ -523,6 +526,7 @@ class PipeliningServerHandlerSpec extends Specification {
         HttpHeaderValues.DEFLATE   | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE)
         HttpHeaderValues.X_DEFLATE | ZlibCodecFactory.newZlibEncoder(ZlibWrapper.NONE)
         HttpHeaderValues.SNAPPY    | new SnappyFrameEncoder()
+        HttpHeaderValues.ZSTD      | new ZstdEncoder()
     }
 
     def 'empty streaming response while in queue'() {