[accumulo] branch master updated: Fix formatting

[mm...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new eec389d  Fix formatting
eec389d is described below

commit eec389d1f804960e8b5b4df781d0332871a69c1b
Author: Mike Miller <mm...@apache.org>
AuthorDate: Thu Apr 19 14:40:09 2018 -0400

    Fix formatting
---
 .../accumulo/test/functional/ConfigurableMacBase.java       | 13 +++++++------
 .../org/apache/accumulo/test/functional/ReadWriteIT.java    |  6 +++---
 .../org/apache/accumulo/test/functional/ShutdownIT.java     |  5 +++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
index cf94f21..4258635 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java
@@ -81,7 +81,7 @@ public class ConfigurableMacBase extends AccumuloITBase {
   }
 
   protected static void configureForSsl(MiniAccumuloConfigImpl cfg, File sslDir) {
-    Map<String, String> siteConfig = cfg.getSiteConfig();
+    Map<String,String> siteConfig = cfg.getSiteConfig();
     if ("true".equals(siteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) {
       // already enabled; don't mess with it
       return;
@@ -100,9 +100,9 @@ public class ConfigurableMacBase extends AccumuloITBase {
     try {
       new CertUtils(Property.RPC_SSL_KEYSTORE_TYPE.getDefaultValue(),
           "o=Apache Accumulo,cn=MiniAccumuloCluster", "RSA", 2048, "sha1WithRSAEncryption")
-          .createAll(rootKeystoreFile, localKeystoreFile, publicTruststoreFile,
-              cfg.getInstanceName(), rootKeystorePassword, cfg.getRootPassword(),
-              truststorePassword);
+              .createAll(rootKeystoreFile, localKeystoreFile, publicTruststoreFile,
+                  cfg.getInstanceName(), rootKeystorePassword, cfg.getRootPassword(),
+                  truststorePassword);
     } catch (Exception e) {
       throw new RuntimeException("error creating MAC keystore", e);
     }
@@ -115,11 +115,12 @@ public class ConfigurableMacBase extends AccumuloITBase {
     siteConfig.put(Property.RPC_SSL_TRUSTSTORE_PASSWORD.getKey(), truststorePassword);
     cfg.setSiteConfig(siteConfig);
 
-    Map<String, String> clientProps = cfg.getClientProps();
+    Map<String,String> clientProps = cfg.getClientProps();
     clientProps.put(ClientProperty.SSL_ENABLED.getKey(), "true");
     clientProps.put(ClientProperty.SSL_KEYSTORE_PATH.getKey(), localKeystoreFile.getAbsolutePath());
     clientProps.put(ClientProperty.SSL_KEYSTORE_PASSWORD.getKey(), cfg.getRootPassword());
-    clientProps.put(ClientProperty.SSL_TRUSTSTORE_PATH.getKey(), publicTruststoreFile.getAbsolutePath());
+    clientProps.put(ClientProperty.SSL_TRUSTSTORE_PATH.getKey(),
+        publicTruststoreFile.getAbsolutePath());
     clientProps.put(ClientProperty.SSL_TRUSTSTORE_PASSWORD.getKey(), truststorePassword);
     cfg.setClientProps(clientProps);
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index bc81e37..9457189 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -202,7 +202,7 @@ public class ReadWriteIT extends AccumuloClusterHarness {
   }
 
   public static void ingest(Connector connector, ConnectionInfo info, int rows, int cols, int width,
-                            int offset, String tableName) throws Exception {
+      int offset, String tableName) throws Exception {
     ingest(connector, info, rows, cols, width, offset, COLF, tableName);
   }
 
@@ -226,8 +226,8 @@ public class ReadWriteIT extends AccumuloClusterHarness {
     verify(connector, info, rows, cols, width, offset, COLF, tableName);
   }
 
-  private static void verify(Connector connector, ConnectionInfo info, int rows, int cols, int width,
-      int offset, String colf, String tableName) throws Exception {
+  private static void verify(Connector connector, ConnectionInfo info, int rows, int cols,
+      int width, int offset, String colf, String tableName) throws Exception {
     ScannerOpts scannerOpts = new ScannerOpts();
     VerifyIngest.Opts opts = new VerifyIngest.Opts();
     opts.rows = rows;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
index efcfb95..aa6bcf2 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ShutdownIT.java
@@ -108,8 +108,9 @@ public class ShutdownIT extends ConfigurableMacBase {
 
   static void runAdminStopTest(Connector c, MiniAccumuloClusterImpl cluster)
       throws InterruptedException, IOException {
-    assertEquals(0, cluster.exec(TestIngest.class, "--config-file",
-        cluster.getConfig().getClientPropsFile().getAbsolutePath(), "--createTable").waitFor());
+    String confPath = cluster.getConfig().getClientPropsFile().getAbsolutePath();
+    int x = cluster.exec(TestIngest.class, "--config-file", confPath, "--createTable").waitFor();
+    assertEquals(0, x);
     List<String> tabletServers = c.instanceOperations().getTabletServers();
     assertEquals(2, tabletServers.size());
     String doomed = tabletServers.get(0);

-- 
To stop receiving notification emails like this one, please contact
mmiller@apache.org.