[accumulo] branch 2.0 updated: Formatting

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.0 by this push:
     new 2e73e96  Formatting
2e73e96 is described below

commit 2e73e96d07109daf3e1345c20c5efa55f351de7c
Author: Mike Miller <mm...@apache.org>
AuthorDate: Fri Jun 14 15:30:59 2019 -0400

    Formatting
---
 .../org/apache/accumulo/core/cli/ClientOpts.java    | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index c5bd00d..7202d0b 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -83,18 +83,17 @@ public class ClientOpts extends Help {
   }
 
   /**
-   * A catch all for older legacy options that have been dropped.  Most of them were replaced with
-   * accumulo-client.properties in 2.0.  Others have been dropped completely.
+   * A catch all for older legacy options that have been dropped. Most of them were replaced with
+   * accumulo-client.properties in 2.0. Others have been dropped completely.
    */
-  private String legacyClientOpts = "-p -tc --tokenClass -i --instance --site-file --keytab " +
-          "--debug -fake --mock --ssl --sasl";
-  @Parameter(names = {"-p", "-tc", "--tokenClass", "-i", "--instance",
-          "--site-file", "--keytab"}, hidden = true)
+  private String legacyClientOpts = "-p -tc --tokenClass -i --instance --site-file --keytab "
+      + "--debug -fake --mock --ssl --sasl";
+  @Parameter(names = {"-p", "-tc", "--tokenClass", "-i", "--instance", "--site-file", "--keytab"},
+      hidden = true)
   private String legacyOpts = null;
-  @Parameter(names = {"--debug", "-fake", "--mock", "--ssl",  "--sasl"}, hidden = true)
+  @Parameter(names = {"--debug", "-fake", "--mock", "--ssl", "--sasl"}, hidden = true)
   private boolean legacyOptsBoolean = false;
 
-
   @Parameter(names = {"-u", "--user"}, description = "Connection user")
   public String principal = null;
 
@@ -140,9 +139,9 @@ public class ClientOpts extends Help {
         if (legacyClientOpts.contains(arg))
           badOptions.append(arg).append(" ");
       }
-      throw new IllegalArgumentException("The Client options: " + badOptions.toString() +
-              "have been dropped. Use accumulo-client.properties for any connection or token " +
-              "options. See '-c, --config-file' option.");
+      throw new IllegalArgumentException("The Client options: " + badOptions.toString()
+          + "have been dropped. Use accumulo-client.properties for any connection or token "
+          + "options. See '-c, --config-file' option.");
     }
   }