Add get/set for WebSocket user props via javax API to skip need for d…

…ep/import in projects
Red5 · Oct 23, 2023 · e08455a · e08455a
1 parent d944040
commit e08455a
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 10 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.22</version>
+        <version>1.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-client</artifactId>

diff --git a/client/src/main/java/org/red5/client/Red5Client.java b/client/src/main/java/org/red5/client/Red5Client.java
@@ -18,7 +18,7 @@ public final class Red5Client {
     /**
      * Current server version with revision
      */
-    public static final String VERSION = "Red5 Client 1.3.22";
+    public static final String VERSION = "Red5 Client 1.3.24";
 
     /**
      * Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope

diff --git a/common/pom.xml b/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.22</version>
+        <version>1.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>net.engio</groupId>
             <artifactId>mbassador</artifactId>
-            <version>1.3.22</version>
+            <version>1.3.24</version>
         </dependency> -->
         <dependency>
             <groupId>junit</groupId>

diff --git a/common/src/main/java/org/red5/server/api/Red5.java b/common/src/main/java/org/red5/server/api/Red5.java
@@ -55,12 +55,12 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 1.3.22";
+    public static final String VERSION = "Red5 Server 1.3.24";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/1,3,22,0";
+    public static final String FMS_VERSION = "RED5/1,3,24,0";
 
     /**
      * Server capabilities

diff --git a/io/pom.xml b/io/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.22</version>
+        <version>1.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <name>Red5</name>
     <description>The Red5 server</description>
     <groupId>org.red5</groupId>
-    <version>1.3.22</version>
+    <version>1.3.24</version>
     <url>https://github.com/Red5/red5-server</url>
     <inceptionYear>2005</inceptionYear>
     <organization>

diff --git a/server/pom.xml b/server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.22</version>
+        <version>1.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

diff --git a/server/src/main/java/org/red5/net/websocket/WebSocketConnection.java b/server/src/main/java/org/red5/net/websocket/WebSocketConnection.java
@@ -659,6 +659,21 @@ public static void setReadTimeout(long readTimeout) {
         WebSocketConnection.readTimeout = readTimeout;
     }
 
+    public void setUserProperty(String key, Object value) {
+        WsSession wsSession = getWsSession();
+        if (wsSession != null) {
+            wsSession.getUserProperties().put(key, value);
+        }
+    }
+
+    public Object getUserProperty(String key) {
+        WsSession wsSession = getWsSession();
+        if (wsSession.getUserProperties().get(key) != null) {
+            return wsSession.getUserProperties().get(key);
+        }
+        return null;
+    }
+
     public void setWsSessionTimeout(long idleTimeout) {
         if (wsSession != null) {
             wsSession.get().setMaxIdleTimeout(idleTimeout);

diff --git a/service/pom.xml b/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.3.22</version>
+        <version>1.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-service</artifactId>