From fb2753fb7fe026f1ed5f082cd25eb91963bee0f9 Mon Sep 17 00:00:00 2001 From: Parag Badani Date: Mon, 27 Jan 2025 17:35:53 +0530 Subject: [PATCH] KSQL-12955 | Fix checkstyle errors. --- .../extensions/KsqlResourceContextImpl.java | 4 +++- .../extensions/KsqlResourceExtension.java | 1 - .../ksql/rest/server/KsqlRestApplication.java | 21 +++++++++---------- .../ksql/rest/server/KsqlServerMain.java | 2 -- 4 files changed, 13 insertions(+), 15 deletions(-) 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 index f06311b10f1d..721e9ddc9423 100644 --- 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 @@ -23,7 +23,9 @@ public class KsqlResourceContextImpl implements KsqlResourceContext { private final KsqlConfig ksqlConfig; private final KsqlRestConfig ksqlRestConfig; - public KsqlResourceContextImpl(KsqlConfig ksqlConfig, KsqlRestConfig restConfig) { + public KsqlResourceContextImpl( + final KsqlConfig ksqlConfig, + final KsqlRestConfig restConfig) { this.ksqlConfig = ksqlConfig; this.ksqlRestConfig = restConfig; } diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/extensions/KsqlResourceExtension.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/extensions/KsqlResourceExtension.java index 1c96ccc18695..e0579449f0e3 100644 --- a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/extensions/KsqlResourceExtension.java +++ b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/extensions/KsqlResourceExtension.java @@ -16,7 +16,6 @@ package io.confluent.ksql.rest.extensions; import io.confluent.ksql.util.KsqlException; - import java.io.Closeable; public interface KsqlResourceExtension extends Closeable { diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java index 12e55e11d658..81711cfeb6e5 100644 --- a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java +++ b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java @@ -126,7 +126,6 @@ import io.vertx.core.net.SocketAddress; import io.vertx.ext.dropwizard.DropwizardMetricsOptions; import io.vertx.ext.dropwizard.Match; - import java.io.Console; import java.io.File; import java.io.IOException; @@ -321,7 +320,7 @@ public static SourceName getCommandsStreamName() { public void startAsync() { log.debug("Starting the ksqlDB API server"); - KsqlResourceContext ksqlResourceContext + final KsqlResourceContext ksqlResourceContext = new KsqlResourceContextImpl(ksqlConfigNoPort, restConfig); boolean isFipsValidatorConfigured = false; @@ -329,13 +328,13 @@ public void startAsync() { resourceExtension.register(ksqlResourceContext); if (KsqlConstants.FIPS_VALIDATOR .equals(resourceExtension.getClass().getCanonicalName())) { - isFipsValidatorConfigured = true; + isFipsValidatorConfigured = true; } } if (ksqlConfigNoPort.enableFips() && !isFipsValidatorConfigured) { - throw new KsqlException("Error enabling the FIPS resource extension: `enable.fips` is set to true but the " - + "`ksql.resource.extension.class` config is either not configured or does not contain \"" - + KsqlConstants.FIPS_VALIDATOR + "\""); + throw new KsqlException("Error enabling the FIPS resource extension: `enable.fips` is set" + + " to true but the `ksql.resource.extension.class` config is either not configured" + + " or does not contain \"" + KsqlConstants.FIPS_VALIDATOR + "\""); } this.serverMetadataResource = ServerMetadataResource.create(serviceContext, ksqlConfigNoPort); @@ -535,11 +534,11 @@ public void shutdown() { }); ksqlResourceExtensions.forEach(resourceExtension -> { - try { - resourceExtension.close(); - } catch (IOException e) { - log.error("Exception while closing resource extension", e); - } + try { + resourceExtension.close(); + } catch (IOException e) { + log.error("Exception while closing resource extension", e); + } }); try { diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlServerMain.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlServerMain.java index 19c338272c6d..d573433d2eb1 100644 --- a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlServerMain.java +++ b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlServerMain.java @@ -24,8 +24,6 @@ import io.confluent.ksql.logging.query.QueryLogger; import io.confluent.ksql.metrics.MetricCollectors; import io.confluent.ksql.properties.PropertiesUtil; -import io.confluent.ksql.rest.extensions.KsqlResourceContext; -import io.confluent.ksql.rest.extensions.KsqlResourceContextImpl; import io.confluent.ksql.rest.server.state.ServerState; import io.confluent.ksql.serde.FormatFactory; import io.confluent.ksql.util.KsqlConfig;