(tomcat) branch 10.1.x updated: Refactor to support TCK tests adding custom transformations

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 301018b721 Refactor to support TCK tests adding custom transformations
301018b721 is described below

commit 301018b72146c1db52f9ed2bf168527365a6c99d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 24 17:41:57 2025 +0100

    Refactor to support TCK tests adding custom transformations
    
    The client filtering of extensions has a bug. Once that is fixed, some
    TCK tests will fail because they expect they client to request a number
    of TCK specific extensions. To support that, the TCK client needs to be
    able to define those extensions. This refactoring will allow that to
    happen. The bug will be fixed in a subsequent commit.
---
 .../apache/tomcat/websocket/PerMessageDeflate.java   |  7 +++++++
 ...mationFactory.java => TransformationBuilder.java} | 19 ++-----------------
 .../tomcat/websocket/TransformationFactory.java      | 20 ++++++++++++++++++--
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/PerMessageDeflate.java 
b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
index ae2fcb0ca5..befd9666c0 100644
--- a/java/org/apache/tomcat/websocket/PerMessageDeflate.java
+++ b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
@@ -44,6 +44,13 @@ public class PerMessageDeflate implements Transformation {
 
     public static final String NAME = "permessage-deflate";
 
+    public static final TransformationBuilder BUILDER = new 
TransformationBuilder() {
+        @Override
+        public Transformation build(List<List<Parameter>> preferences, boolean 
isServer) {
+            return PerMessageDeflate.build(preferences, isServer);
+        }
+    };
+
     private final boolean serverContextTakeover;
     private final int serverMaxWindowBits;
     private final boolean clientContextTakeover;
diff --git a/java/org/apache/tomcat/websocket/TransformationFactory.java 
b/java/org/apache/tomcat/websocket/TransformationBuilder.java
similarity index 61%
copy from java/org/apache/tomcat/websocket/TransformationFactory.java
copy to java/org/apache/tomcat/websocket/TransformationBuilder.java
index b40ceb875f..3b6f21a859 100644
--- a/java/org/apache/tomcat/websocket/TransformationFactory.java
+++ b/java/org/apache/tomcat/websocket/TransformationBuilder.java
@@ -20,22 +20,7 @@ import java.util.List;
 
 import jakarta.websocket.Extension;
 
-public class TransformationFactory {
+public interface TransformationBuilder {
 
-    private static final TransformationFactory factory = new 
TransformationFactory();
-
-    private TransformationFactory() {
-        // Hide default constructor
-    }
-
-    public static TransformationFactory getInstance() {
-        return factory;
-    }
-
-    public Transformation create(String name, List<List<Extension.Parameter>> 
preferences, boolean isServer) {
-        if (PerMessageDeflate.NAME.equals(name)) {
-            return PerMessageDeflate.build(preferences, isServer);
-        }
-        return null;
-    }
+    Transformation build(List<List<Extension.Parameter>> preferences, boolean 
isServer);
 }
diff --git a/java/org/apache/tomcat/websocket/TransformationFactory.java 
b/java/org/apache/tomcat/websocket/TransformationFactory.java
index b40ceb875f..c94a813e11 100644
--- a/java/org/apache/tomcat/websocket/TransformationFactory.java
+++ b/java/org/apache/tomcat/websocket/TransformationFactory.java
@@ -16,7 +16,9 @@
  */
 package org.apache.tomcat.websocket;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import jakarta.websocket.Extension;
 
@@ -24,18 +26,32 @@ public class TransformationFactory {
 
     private static final TransformationFactory factory = new 
TransformationFactory();
 
+    private Map<String,TransformationBuilder> builders = new HashMap<>();
+
+
     private TransformationFactory() {
         // Hide default constructor
+
+        // Configure the built-in transformations
+        builders.put(PerMessageDeflate.NAME, PerMessageDeflate.BUILDER);
     }
 
+
     public static TransformationFactory getInstance() {
         return factory;
     }
 
+
     public Transformation create(String name, List<List<Extension.Parameter>> 
preferences, boolean isServer) {
-        if (PerMessageDeflate.NAME.equals(name)) {
-            return PerMessageDeflate.build(preferences, isServer);
+        TransformationBuilder builder = builders.get(name);
+        if (builder != null) {
+            return builder.build(preferences, isServer);
         }
         return null;
     }
+
+
+    public void registerExtension(String name, TransformationBuilder builder) {
+        builders.put(name, builder);
+    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org