Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reworking jetty-compression for JPMS #12531

Merged
merged 27 commits into from
Nov 18, 2024
Merged

Reworking jetty-compression for JPMS #12531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
aa14b45
Reworking jetty-compression for JPMS
joakime Nov 13, 2024
0a1abb0
Fix pom
joakime Nov 13, 2024
0e6f50b
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/co…
joakime Nov 14, 2024
9c8c9aa
Changes from review
joakime Nov 14, 2024
713dfd9
Changes from review
joakime Nov 14, 2024
6244dbd
Cleaning up source
joakime Nov 14, 2024
177500b
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/co…
joakime Nov 15, 2024
b068d44
Moving (include/exclude) verb to before noun
joakime Nov 15, 2024
78921e6
Renaming jetty-compression-api to jetty-compression-common
joakime Nov 15, 2024
a95c780
Renaming module compression-api to commpression-common
joakime Nov 15, 2024
af163a1
Removing class.cast(obj) usages
joakime Nov 15, 2024
fa97456
Fix typo
joakime Nov 15, 2024
a6cf5a6
always add bean
joakime Nov 15, 2024
242c62a
use modern switch/case
joakime Nov 15, 2024
dc8b219
cleanup unused source
joakime Nov 15, 2024
232a12f
configurable gzip (input|output) stream
joakime Nov 15, 2024
9d8b1e7
simplify if statement
joakime Nov 15, 2024
2974ba9
follow jetty style for mod+xml naming
joakime Nov 15, 2024
2f9a788
fix pom syntax
joakime Nov 15, 2024
6f28e1f
fix pom syntax
joakime Nov 15, 2024
9588513
fix pom syntax
joakime Nov 15, 2024
bfe4293
fix pom syntax
joakime Nov 15, 2024
c4e1c16
Changes from review
joakime Nov 18, 2024
29343db
Fixing typo on method name (plural)
joakime Nov 18, 2024
5ad683c
Fix module lib references
joakime Nov 18, 2024
cc61b43
ManagedAttribute typos
joakime Nov 18, 2024
174a392
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/12.1.x/co…
joakime Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion jetty-core/jetty-compression/jetty-compression-brotli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...jetty-compression/jetty-compression-brotli/src/main/config/modules/compression-brotli.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ compression
experimental

[depend]
compression-common
compression

[files]
maven://com.aayushatharva.brotli4j/brotli4j/${brotli4j.version}|lib/compression/brotli4j-${brotli4j.version}.jar

[lib]
lib/compression/jetty-compression-common-${jetty.version}.jar
joakime marked this conversation as resolved.
Show resolved Hide resolved
lib/compression/brotli4j-${brotli4j.version}.jar

[xml]
Expand Down
2 changes: 1 addition & 1 deletion jetty-core/jetty-compression/jetty-compression-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>Core :: Compression :: Common</name>
<description>Jetty Core Compression Common</description>
<properties>
<bundle-symbolic-name>${project.groupId}</bundle-symbolic-name>
<bundle-symbolic-name>${project.groupId}.common</bundle-symbolic-name>
</properties>
<dependencies>
<dependency>
Expand Down
18 changes: 0 additions & 18 deletions ...jetty-compression/jetty-compression-common/src/main/config/modules/compression-common.mod
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion jetty-core/jetty-compression/jetty-compression-gzip/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ore/jetty-compression/jetty-compression-gzip/src/main/config/modules/compression-gzip.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ compression
experimental

[depend]
compression-common
compression

[lib]
lib/compression/jetty-compression-common-${jetty.version}.jar
lib/compression/jetty-compression-gzip-${jetty.version}.jar

[xml]
Expand Down
1 change: 0 additions & 1 deletion jetty-core/jetty-compression/jetty-compression-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
1 change: 1 addition & 0 deletions ...y-core/jetty-compression/jetty-compression-server/src/main/config/modules/compression.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ experimental
server

[lib]
lib/compression/jetty-compression-common-${jetty.version}.jar
lib/compression/jetty-compression-server-${jetty.version}.jar

[xml]
Expand Down
4 changes: 2 additions & 2 deletions ...pression-server/src/main/java/org/eclipse/jetty/compression/server/CompressionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public Set<String> getCompressExcludeMimeTypes()
* Get the set of excluded Path Specs for response compression.
*
* @return the set of excluded Path Specs
* @see #getCompressPathIncludes()
* @see #getCompressIncludesPath()
*/
@ManagedAttribute("Set of Response Compression Path Exclusions")
public Set<String> getCompressExcludePaths()
Expand Down Expand Up @@ -178,7 +178,7 @@ public Set<String> getCompressIncludeMimeTypes()
* @see #getCompressExcludePaths()
*/
@ManagedAttribute("Set of Response Compression Path Exclusions")
public Set<String> getCompressPathIncludes()
public Set<String> getCompressIncludesPath()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename to getCompressIncludesPaths(), plural like the others.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh! bad plural. :-/

{
Set<String> includes = compressPaths.getIncluded();
return Collections.unmodifiableSet(includes);
Expand Down
4 changes: 0 additions & 4 deletions jetty-core/jetty-compression/jetty-compression-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,18 @@
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-brotli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-gzip</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-zstandard</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
1 change: 0 additions & 1 deletion jetty-core/jetty-compression/jetty-compression-zstandard/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...compression/jetty-compression-zstandard/src/main/config/modules/compression-zstandard.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ compression
experimental

[depend]
compression-common
compression

[files]
maven://com.github.luben/zstd-jni/${zstd-jni.version}|lib/compression/zstd-jni-${zstd-jni.version}.jar

[lib]
lib/compression/jetty-compression-common-${jetty.version}.jar
lib/compression/zstd-jni-${zstd-jni.version}.jar

[xml]
Expand Down
25 changes: 25 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,31 @@
<artifactId>jetty-xml</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>jetty-compression-brotli</artifactId>
<groupId>org.eclipse.jetty.compression</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>jetty-compression-common</artifactId>
<groupId>org.eclipse.jetty.compression</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>jetty-compression-gzip</artifactId>
<groupId>org.eclipse.jetty.compression</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>jetty-compression-server</artifactId>
<groupId>org.eclipse.jetty.compression</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>jetty-compression-zstandard</artifactId>
<groupId>org.eclipse.jetty.compression</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.fcgi</groupId>
<artifactId>jetty-fcgi-client</artifactId>
Expand Down
Loading