Address PR feedback

Author: viktoriya-kutsarova

src/main/java/redis/clients/jedis/ClientSetInfoConfig.java

@@ -7,9 +7,11 @@
  * <p>
  * This class supports two modes of operation:
  * <ul>
- * <li>Legacy mode: Using {@link #withLibNameSuffix(String)} for simple suffix customization</li>
- * <li>Driver info mode: Using {@link #ClientSetInfoConfig(DriverInfo)} for structured driver
- * information with upstream drivers</li>
+ * <li>Advanced mode: Using {@link #withLibNameSuffix(String)} for advanced suffix customization,
+ * where the provided string is already preformatted according to the rules of the `CLIENT SETINFO`
+ * command</li>
+ * <li>Simple mode: Using {@link #ClientSetInfoConfig(DriverInfo)} used when the command parameter
+ * will be built by the driver based on the {@link DriverInfo} provided</li>
  * </ul>
  * <p>
  * For backward compatibility, {@link #getUpstreamDrivers()} returns the upstream drivers string
@@ -76,15 +78,13 @@ public ClientSetInfoConfig(DriverInfo driverInfo) {
   }
 
   /**
-   * Returns whether CLIENT SETINFO is disabled.
    * @return {@code true} if CLIENT SETINFO is disabled, {@code false} otherwise
    */
   public boolean isDisabled() {
     return disabled;
   }
 
   /**
-   * Returns the driver information.
    * @return the driver information
    */
   public DriverInfo getDriverInfo() {

src/main/java/redis/clients/jedis/DriverInfo.java

@@ -1,6 +1,9 @@
+/*
+ * Copyright 2025-Present, Redis Ltd. and Contributors All rights reserved. Licensed under the MIT
+ * License.
+ */
 package redis.clients.jedis;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,19 +23,7 @@
  * @see ClientSetInfoConfig
  * @see <a href="https://redis.io/docs/latest/commands/client-setinfo/">CLIENT SETINFO</a>
  */
-public final class DriverInfo implements Serializable {
-
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * Regex pattern for driver name validation. The name must start with a lowercase letter and
-   * contain only lowercase letters, digits, hyphens, and underscores. Dots are only allowed after
-   * digits (for Scala cross-version naming like akka-redis_2.13). Follows Maven artifactId naming
-   * conventions but also allows underscores and version-specific dots.
-   * @see <a href="https://maven.apache.org/guides/mini/guide-naming-conventions.html">Maven Naming
-   *      Conventions</a>
-   */
-  private static final String DRIVER_NAME_PATTERN = "^[a-z][a-z0-9_-]*(?:[0-9]\\.[0-9]+)?$";
+public final class DriverInfo {
 
   /**
    * Set of brace characters that are not allowed in driver names or versions. These characters are
@@ -120,7 +111,7 @@ public String getName() {
    */
   public String getUpstreamDrivers() {
     if (upstreamDrivers.isEmpty()) {
-      return null;
+      return "";
     }
     return String.join(";", upstreamDrivers);
   }
@@ -196,8 +187,8 @@ public Builder addUpstreamDriver(String driverName, String driverVersion) {
       if (driverVersion == null) {
         throw new JedisValidationException("Driver version must not be null");
       }
-      validateDriverName(driverName);
-      validateDriverVersion(driverVersion);
+      validateDriverField(driverName, "Driver name");
+      validateDriverField(driverVersion, "Driver version");
       String formattedDriverInfo = formatDriverInfo(driverName, driverVersion);
       this.upstreamDrivers.add(0, formattedDriverInfo);
       return this;
@@ -207,7 +198,7 @@ public Builder addUpstreamDriver(String driverName) {
       if (driverName == null) {
         throw new JedisValidationException("Driver name must not be null");
       }
-      validateDriverName(driverName);
+      validateDriverField(driverName, "Driver name");
       this.upstreamDrivers.add(0, driverName);
       return this;
     }
@@ -222,48 +213,22 @@ public DriverInfo build() {
   }
 
   /**
-   * Validates that the driver name follows Maven artifactId naming conventions: lowercase letters,
-   * digits, hyphens, and underscores only, starting with a lowercase letter. Dots are only allowed
-   * after digits (for Scala cross-version naming like akka-redis_2.13).
+   * Validates that the value does not contain characters that would violate the format of the Redis
+   * CLIENT LIST reply.
    * <p>
-   * Additionally validates Redis CLIENT LIST constraints: no spaces, newlines, non-printable
-   * characters, or braces.
-   * @param driverName the driver name to validate
-   * @throws JedisValidationException if the driver name does not follow the expected naming
-   *           conventions
-   * @see <a href="https://maven.apache.org/guides/mini/guide-naming-conventions.html">Maven Naming
-   *      Conventions</a>
-   * @see <a href="https://redis.io/docs/latest/commands/client-setinfo/">CLIENT SETINFO</a>
-   */
-  private static void validateDriverName(String driverName) {
-    if (driverName.trim().isEmpty()) {
-      throw new JedisValidationException("Driver name must not be empty");
-    }
-
-    validateNoInvalidCharacters(driverName, "Driver name");
-
-    if (!driverName.matches(DRIVER_NAME_PATTERN)) {
-      throw new JedisValidationException(
-          "Upstream driver name must follow Maven artifactId naming conventions: "
-              + "lowercase letters, digits, hyphens, and underscores only, starting with a lowercase letter "
-              + "(e.g., 'spring-data-redis', 'lettuce-core', 'akka-redis_2.13')");
-    }
-  }
-
-  /**
-   * Validates that the driver version does not contain characters that would violate the format of
-   * the Redis CLIENT LIST reply: no spaces, newlines, non-printable characters, or brace
-   * characters.
-   * @param driverVersion the driver version to validate
-   * @throws JedisValidationException if the driver version contains invalid characters
+   * Only printable ASCII characters (0x21-0x7E, i.e., '!' to '~') are allowed, excluding braces.
+   * @param value the value to validate
+   * @param fieldName the name of the field for error messages (e.g., "Driver name", "Driver
+   *          version")
+   * @throws JedisValidationException if the value is empty or contains invalid characters
    * @see <a href="https://redis.io/docs/latest/commands/client-setinfo/">CLIENT SETINFO</a>
    */
-  private static void validateDriverVersion(String driverVersion) {
-    if (driverVersion.trim().isEmpty()) {
-      throw new JedisValidationException("Driver version must not be empty");
+  private static void validateDriverField(String value, String fieldName) {
+    if (value.trim().isEmpty()) {
+      throw new JedisValidationException(fieldName + " must not be empty");
     }
 
-    validateNoInvalidCharacters(driverVersion, "Driver version");
+    validateNoInvalidCharacters(value, fieldName);
   }
 
   /**

src/test/java/redis/clients/jedis/misc/ClientSetInfoConfigTest.java

@@ -10,7 +10,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -20,7 +19,7 @@ public class ClientSetInfoConfigTest {
   public void defaultConfig() {
     ClientSetInfoConfig config = ClientSetInfoConfig.DEFAULT;
     assertFalse(config.isDisabled());
-    assertNull(config.getUpstreamDrivers());
+    assertEquals("", config.getUpstreamDrivers());
     assertNotNull(config.getDriverInfo());
     assertEquals("jedis", config.getDriverInfo().getName());
     assertEquals("jedis", config.getDriverInfo().getFormattedName());
@@ -30,7 +29,7 @@ public void defaultConfig() {
   public void disabledConfig() {
     ClientSetInfoConfig config = ClientSetInfoConfig.DISABLED;
     assertTrue(config.isDisabled());
-    assertNull(config.getUpstreamDrivers());
+    assertEquals("", config.getUpstreamDrivers());
   }
 
   @Test
@@ -109,7 +108,7 @@ public void builderCustomName() {
     DriverInfo driverInfo = DriverInfo.builder().name("my-custom-client").build();
     assertEquals("my-custom-client", driverInfo.getName());
     assertEquals("my-custom-client", driverInfo.getFormattedName());
-    assertNull(driverInfo.getUpstreamDrivers());
+    assertEquals("", driverInfo.getUpstreamDrivers());
   }
 
   @Test
@@ -202,16 +201,11 @@ public void driverNameValidation() {
     DriverInfo.builder().addUpstreamDriver("redis-client", "1.0.0");
     DriverInfo.builder().addUpstreamDriver("my_driver", "1.0.0");
     DriverInfo.builder().addUpstreamDriver("driver123", "1.0.0");
+    DriverInfo.builder().addUpstreamDriver("Spring-Data", "1.0.0");
+    DriverInfo.builder().addUpstreamDriver("123driver", "1.0.0");
+    DriverInfo.builder().addUpstreamDriver("driver@name", "1.0.0");
+    DriverInfo.builder().addUpstreamDriver("driver.name", "1.0.0");
 
-    // Invalid names
-    assertThrows(JedisValidationException.class,
-      () -> DriverInfo.builder().addUpstreamDriver("Spring-Data", "1.0.0")); // uppercase
-    assertThrows(JedisValidationException.class,
-      () -> DriverInfo.builder().addUpstreamDriver("123driver", "1.0.0")); // starts with digit
-    assertThrows(JedisValidationException.class,
-      () -> DriverInfo.builder().addUpstreamDriver("driver@name", "1.0.0")); // special char
-    assertThrows(JedisValidationException.class,
-      () -> DriverInfo.builder().addUpstreamDriver("driver.name", "1.0.0")); // dot
     assertThrows(JedisValidationException.class,
       () -> DriverInfo.builder().addUpstreamDriver("driver name", "1.0.0")); // space
   }