KSQL-12955 | Address review comments.

confluentinc · Jan 31, 2025 · 84e811b · 84e811b
1 parent c039955
commit 84e811b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java b/ksqldb-common/src/main/java/io/confluent/ksql/util/KsqlConfig.java
@@ -730,9 +730,9 @@ public enum DeploymentType {
   public static final String KSQL_ENABLE_FIPS = "enable.fips";
   public static final String KSQL_ENABLE_FIPS_DEFAULT = "false";
   public static final String KSQL_ENABLE_FIPS_DOC
-          = "Enable FIPS mode on the server. If FIPS mode is enabled, " +
-          "broker listener security protocols, TLS versions and cipher " +
-          "suites will be validated based on FIPS compliance requirement.";
+          = "Enable FIPS mode on the server. If FIPS mode is enabled, "
+          + "broker listener security protocols, TLS versions and cipher "
+          + "suites will be validated based on FIPS compliance requirement.";
 
   private enum ConfigGeneration {
     LEGACY,

diff --git a/...gine/src/main/java/io/confluent/ksql/schema/registry/KsqlSchemaRegistryClientFactory.java b/...gine/src/main/java/io/confluent/ksql/schema/registry/KsqlSchemaRegistryClientFactory.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.function.Supplier;
 import javax.net.ssl.SSLContext;
-import org.apache.kafka.common.config.internals.ConfluentConfigs;
 import org.apache.kafka.common.security.auth.SslEngineFactory;
 import org.apache.kafka.common.security.ssl.DefaultSslEngineFactory;
 import org.apache.kafka.common.utils.SecurityUtils;

diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/extensions/KsqlResourceContextImpl.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/extensions/KsqlResourceContextImpl.java
@@ -24,6 +24,7 @@ public class KsqlResourceContextImpl implements KsqlResourceContext {
   private final KsqlConfig ksqlConfig;
   private final KsqlRestConfig ksqlRestConfig;
 
+  @SuppressFBWarnings(value = "EI_EXPOSE_REP2")
   public KsqlResourceContextImpl(
           final KsqlConfig ksqlConfig,
           final KsqlRestConfig restConfig) {

diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestConfig.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestConfig.java
@@ -445,11 +445,12 @@ public class KsqlRestConfig extends AbstractConfig {
           KSQL_COMMAND_TOPIC_MIGRATION_MIGRATING
       );
 
-  public static final String KSQL_RESOURCE_EXTENSION =
+  public static final String KSQL_RESOURCE_EXTENSIONS =
           "ksql.resource.extension.class";
   private static final String KSQL_RESOURCE_EXTENSION_DEFAULT = "";
   private static final String KSQL_RESOURCE_EXTENSION_DOC =
-          "A list of KsqlResourceExtension implementations to register with ksqlDB server.";
+          "A list of KsqlResourceExtension implementations "
+                  + "to be registered with the ksqlDB server.";
 
   private static final ConfigDef CONFIG_DEF;
 
@@ -625,7 +626,7 @@ public class KsqlRestConfig extends AbstractConfig {
             Importance.HIGH,
             INTERNAL_LISTENER_DOC
         ).define(
-            KSQL_RESOURCE_EXTENSION,
+            KSQL_RESOURCE_EXTENSIONS,
             Type.LIST,
             KSQL_RESOURCE_EXTENSION_DEFAULT,
             Importance.MEDIUM,
@@ -1079,10 +1080,10 @@ public ClientAuth getClientAuthInternal() {
   }
 
   public List<KsqlResourceExtension> getKsqlResourceExtensions() {
-    if (getString(KSQL_RESOURCE_EXTENSION).isEmpty()) {
+    if (getString(KSQL_RESOURCE_EXTENSIONS).isEmpty()) {
       return Collections.emptyList();
     }
-    return getConfiguredInstances(KSQL_RESOURCE_EXTENSION, KsqlResourceExtension.class);
+    return getConfiguredInstances(KSQL_RESOURCE_EXTENSIONS, KsqlResourceExtension.class);
   }
 
   /**

diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/server/KsqlRestConfigTest.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/server/KsqlRestConfigTest.java
@@ -104,7 +104,7 @@ public void shouldGetConfiguredKsqlResourceExtensions() {
             .putAll(MIN_VALID_CONFIGS)
             .put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest")
             .put(KsqlConfig.KSQL_SERVICE_ID_CONFIG, "test")
-            .put(KsqlRestConfig.KSQL_RESOURCE_EXTENSION,
+            .put(KsqlRestConfig.KSQL_RESOURCE_EXTENSIONS,
                     "io.confluent.ksql.rest.server.extensions.DummyResourceExtension")
             .build()
     );

diff --git a/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/server/KsqlServerMainTest.java b/ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/server/KsqlServerMainTest.java
@@ -37,7 +37,6 @@
 import java.util.Map;
 import java.util.concurrent.Executor;
 import org.apache.kafka.clients.CommonClientConfigs;
-import org.apache.kafka.common.config.internals.ConfluentConfigs;
 import org.apache.kafka.common.security.auth.SecurityProtocol;
 import org.easymock.Capture;
 import org.easymock.EasyMockRunner;