ACCUMULO-3451 fixes checkstyle violations for 1.6 fixes additional checkstyle rule violations introduced in the 1.6 branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ca1ff02 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ca1ff02 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ca1ff02 Branch: refs/heads/1.6 Commit: 9ca1ff02ef732a8c3727049615ea005bffb7778a Parents: 1368d09 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jan 8 21:29:50 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jan 8 21:29:50 2015 -0500 ---------------------------------------------------------------------- .../accumulo/core/security/crypto/CryptoModuleParameters.java | 2 +- .../security/crypto/NonCachingSecretKeyEncryptionStrategy.java | 3 ++- .../org/apache/accumulo/core/util/shell/ShellOptionsJC.java | 6 +++--- pom.xml | 2 +- .../main/java/org/apache/accumulo/server/init/Initialize.java | 3 ++- .../apache/accumulo/server/util/CustomNonBlockingServer.java | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ca1ff02/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java index 573d64b..b9bf253 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java @@ -280,7 +280,7 @@ public class CryptoModuleParameters { * <li>the code reading an encrypted stream and coming across the encrypted version of one of these keys, OR * <li>the {@link CryptoModuleParameters#getKeyEncryptionStrategyClass()} that encrypted the plaintext key (see * {@link CryptoModuleParameters#getPlaintextKey()}). - * <ul> + * </ul> * <p> * For <b>encryption</b>, this value is generally not required, but is usually set by the underlying module during encryption. <br> * For <b>decryption</b>, this value is <b>usually required</b>. http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ca1ff02/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java index f42f9ff..500627c 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java +++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/NonCachingSecretKeyEncryptionStrategy.java @@ -47,7 +47,8 @@ public class NonCachingSecretKeyEncryptionStrategy implements SecretKeyEncryptio if (!fs.exists(pathToKey)) { if (encryptionMode == Cipher.UNWRAP_MODE) { - log.error("There was a call to decrypt the session key but no key encryption key exists. Either restore it, reconfigure the conf file to point to it in HDFS, or throw the affected data away and begin again."); + log.error("There was a call to decrypt the session key but no key encryption key exists. " + + "Either restore it, reconfigure the conf file to point to it in HDFS, or throw the affected data away and begin again."); throw new RuntimeException("Could not find key encryption key file in configured location in HDFS (" + pathToKeyName + ")"); } else { DataOutputStream out = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ca1ff02/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java index 4787693..dfa24c5 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java +++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java @@ -169,9 +169,9 @@ public class ShellOptionsJC { @Parameter(names = {"--ssl"}, description = "use ssl to connect to accumulo") private boolean useSsl = false; - @Parameter( - names = "--config-file", - description = "read the given client config file. If omitted, the path searched can be specified with $ACCUMULO_CLIENT_CONF_PATH, which defaults to ~/.accumulo/config:$ACCUMULO_CONF_DIR/client.conf:/etc/accumulo/client.conf") + @Parameter(names = "--config-file", description = "read the given client config file. " + + "If omitted, the path searched can be specified with $ACCUMULO_CLIENT_CONF_PATH, " + + "which defaults to ~/.accumulo/config:$ACCUMULO_CONF_DIR/client.conf:/etc/accumulo/client.conf") private String clientConfigFile = null; @Parameter(names = {"-zi", "--zooKeeperInstanceName"}, description = "use a zookeeper instance with the given instance name") http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ca1ff02/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6a90918..8ada8fc 100644 --- a/pom.xml +++ b/pom.xml @@ -954,7 +954,7 @@ </checkstyleRules> <violationSeverity>warning</violationSeverity> <includeTestSourceDirectory>true</includeTestSourceDirectory> - <excludes>**/thrift/*.java</excludes> + <excludes>**/thrift/*.java,**/HelpMojo.java</excludes> </configuration> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ca1ff02/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java index fae9397..e0a3797 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java +++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java @@ -170,7 +170,8 @@ public class Initialize { c.println(); c.println("You can change the instance secret in accumulo by using:"); c.println(" bin/accumulo " + org.apache.accumulo.server.util.ChangeSecret.class.getName() + " oldPassword newPassword."); - c.println("You will also need to edit your secret in your configuration file by adding the property instance.secret to your conf/accumulo-site.xml. Without this accumulo will not operate correctly"); + c.println("You will also need to edit your secret in your configuration file by adding the property instance.secret to your conf/accumulo-site.xml. " + + "Without this accumulo will not operate correctly"); } try { if (isInitialized(fs)) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ca1ff02/server/base/src/main/java/org/apache/accumulo/server/util/CustomNonBlockingServer.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CustomNonBlockingServer.java b/server/base/src/main/java/org/apache/accumulo/server/util/CustomNonBlockingServer.java index ca53399..472bcb9 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/CustomNonBlockingServer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/CustomNonBlockingServer.java @@ -250,8 +250,8 @@ public class CustomNonBlockingServer extends THsHaServer { clientKey = client.registerSelector(selector, SelectionKey.OP_READ); // add this key to the map - FrameBuffer frameBuffer = processorFactory_.isAsyncProcessor() ? - new CustomAsyncFrameBuffer(client, clientKey,SelectAcceptThread.this) : + FrameBuffer frameBuffer = + processorFactory_.isAsyncProcessor() ? new CustomAsyncFrameBuffer(client, clientKey,SelectAcceptThread.this) : new CustomFrameBuffer(client, clientKey,SelectAcceptThread.this); clientKey.attach(frameBuffer);
