From 31e6970a6e181c6e96d001eb76af9de19c63d8e7 Mon Sep 17 00:00:00 2001
From: dan norwood <norwood@confluent.io>
Date: Mon, 12 Mar 2018 10:19:33 -0700
Subject: [PATCH] remove unused/old suppressions. reduce scope on some

---
 checkstyle/suppressions.xml                           | 9 ++-------
 ksql-cli/src/main/java/io/confluent/ksql/Ksql.java    | 5 +++--
 ksql-cli/src/main/java/io/confluent/ksql/cli/Cli.java | 7 +++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 0dbffcf9f697..0a049b3fed96 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -7,16 +7,11 @@
 <suppressions>
 
     <!-- Checkstyle 6.19 doesn't like properly-formatted annotations -->
-    <suppress files="(KsqlEntity|Cli|Ksql|AbstractCliCommands|CommandStore).java" checks="IndentationCheck"/>
-
-    <!-- can't work out how to resolve the issue with the do {..} while -->
-    <suppress files="CommandStore.java" checks="RightCurly"/>
+    <suppress files="KsqlEntity.java" checks="IndentationCheck"/>
 
     <!-- Suppress some checks on all files -->
-    <suppress files="." checks="ExplicitInitializationCheck"/>
-    <suppress files="." checks="FinalClassCheck"/>
     <suppress files="." checks="AbbreviationAsWordInName"/>
-    <suppress files="." checks="AvoidEscapedUnicodeCharacters"/>
+    <suppress files="JsonPathTokenizer.java" checks="AvoidEscapedUnicodeCharacters"/>
 
     <!-- Semantics may not be well checked by rules -->
     <suppress files="." checks="ParameterNumber"/>
diff --git a/ksql-cli/src/main/java/io/confluent/ksql/Ksql.java b/ksql-cli/src/main/java/io/confluent/ksql/Ksql.java
index c38ce5a7bf2c..00145d6b2003 100644
--- a/ksql-cli/src/main/java/io/confluent/ksql/Ksql.java
+++ b/ksql-cli/src/main/java/io/confluent/ksql/Ksql.java
@@ -54,8 +54,9 @@ public static void main(String[] args) throws IOException {
     try (final Cli cli = new Cli(options.getStreamedQueryRowLimit(),
         options.getStreamedQueryTimeoutMs(),
         restClient,
-        new JLineTerminal(options.getOutputFormat(), restClient))) {
-        cli.runInteractively();
+        new JLineTerminal(options.getOutputFormat(), restClient))
+    ) {
+      cli.runInteractively();
     }
   }
 
diff --git a/ksql-cli/src/main/java/io/confluent/ksql/cli/Cli.java b/ksql-cli/src/main/java/io/confluent/ksql/cli/Cli.java
index 41fbf243e2fc..4178f6670a9b 100644
--- a/ksql-cli/src/main/java/io/confluent/ksql/cli/Cli.java
+++ b/ksql-cli/src/main/java/io/confluent/ksql/cli/Cli.java
@@ -289,8 +289,7 @@ private void handleStatements(String line)
       throws IOException, InterruptedException, ExecutionException {
     StringBuilder consecutiveStatements = new StringBuilder();
     for (SqlBaseParser.SingleStatementContext statementContext :
-        new KsqlParser().getStatements(line)
-        ) {
+        new KsqlParser().getStatements(line)) {
       String statementText = KsqlEngine.getStatementString(statementContext);
       if (statementContext.statement() instanceof SqlBaseParser.QuerystatementContext
           || statementContext.statement() instanceof SqlBaseParser.PrintTopicContext) {
@@ -402,8 +401,8 @@ private void printKsqlResponse(RestResponse<KsqlEntityList> response) throws IOE
         } else if (entity instanceof CommandStatusEntity
             && (
             ((CommandStatusEntity) entity).getCommandStatus().getStatus()
-                == CommandStatus.Status.ERROR
-        )) {
+                == CommandStatus.Status.ERROR)
+        ) {
           String fullMessage = ((CommandStatusEntity) entity).getCommandStatus().getMessage();
           terminal.printError(fullMessage.split("\n")[0], fullMessage);
           noErrorFromServer = false;