From 7d8a6686c17ee486dbf6b5ec2e7de0b8c8dcee39 Mon Sep 17 00:00:00 2001
From: Virtually Nick <vnick@apache.org>
Date: Thu, 29 Aug 2024 22:14:52 -0400
Subject: [PATCH] GUACAMOLE-61: New JDBC tokens should follow the standard
 naming conventions.

---
 .../tunnel/AbstractGuacamoleTunnelService.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
index 4e5fe5a575..d9323f4b42 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
@@ -82,10 +82,15 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
      */
     private final Logger logger = LoggerFactory.getLogger(AbstractGuacamoleTunnelService.class);
 
+    /**
+     * The prefix that will be used to generate JDBC tokens.
+     */
+    private final String JDBC_TOKEN_PREFIX = "JDBC_";
+
     /**
      * The token that contains the date the connection was started.
      */
-    private final String JDBC_DATE_TOKEN = "GUAC_JDBC_STARTDATE";
+    private final String JDBC_DATE_TOKEN = JDBC_TOKEN_PREFIX + "STARTDATE";
     
     /**
      * The format of the date in the date token.
@@ -95,7 +100,7 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
     /**
      * The token that contains the start time of the connection.
      */
-    private final String JDBC_TIME_TOKEN = "GUAC_JDBC_STARTTIME";
+    private final String JDBC_TIME_TOKEN = JDBC_TOKEN_PREFIX + "STARTTIME";
     
     /**
      * The format of the time in the time token.
@@ -105,17 +110,17 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
     /**
      * The token that contains the connection name.
      */
-    private final String JDBC_CONNECTION_NAME_TOKEN = "GUAC_JDBC_CONNECTION_NAME";
+    private final String JDBC_CONNECTION_NAME_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_NAME";
     
     /**
      * The token that contains the connection identifier.
      */
-    private final String JDBC_CONNECTION_ID_TOKEN = "GUAC_JDBC_CONNECTION_ID";
+    private final String JDBC_CONNECTION_ID_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_ID";
     
     /**
      * The token that contains the hostname configured in the connection parameters.
      */
-    private final String JDBC_CONNECTION_HOSTNAME_TOKEN = "GUAC_JDBC_HOSTNAME";
+    private final String JDBC_CONNECTION_HOSTNAME_TOKEN = JDBC_TOKEN_PREFIX + "HOSTNAME";
     
     /**
      * The name of the parameter containing the hostname in the configuration.
@@ -125,7 +130,7 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
     /**
      * The token containing the protocol configured in the connection.
      */
-    private final String JDBC_CONNECTION_PROTOCOL_TOKEN = "GUAC_JDBC_PROTOCOL";
+    private final String JDBC_CONNECTION_PROTOCOL_TOKEN = JDBC_TOKEN_PREFIX + "PROTOCOL";
     
     /**
      * Mapper for accessing connections.