[accumulo] branch master updated: Fix formatting

[mmiller]

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 8434345  Fix formatting
8434345 is described below

commit 8434345bef31bc3d2f2dd9d1759ae8b17587f225
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Wed Nov 7 10:55:39 2018 -0500

    Fix formatting
---
 .../main/java/org/apache/accumulo/core/client/AccumuloClient.java | 6 ++++--
 .../org/apache/accumulo/core/client/impl/AccumuloClientImpl.java  | 8 ++++----
 .../java/org/apache/accumulo/core/conf/SiteConfiguration.java     | 3 ++-
 .../java/org/apache/accumulo/server/conf/ZooConfiguration.java    | 5 +++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java 
b/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
index 359419c..2955972 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/AccumuloClient.java
@@ -111,7 +111,8 @@ public interface AccumuloClient extends AutoCloseable {
    * @throws TableNotFoundException
    *           when the specified table doesn't exist
    */
-  BatchScanner createBatchScanner(String tableName) throws 
TableNotFoundException, AccumuloSecurityException, AccumuloException;
+  BatchScanner createBatchScanner(String tableName)
+      throws TableNotFoundException, AccumuloSecurityException, 
AccumuloException;
 
   /**
    * Factory method to create BatchDeleter
@@ -237,7 +238,8 @@ public interface AccumuloClient extends AutoCloseable {
    *
    * @see IsolatedScanner
    */
-  Scanner createScanner(String tableName) throws TableNotFoundException, 
AccumuloSecurityException, AccumuloException;
+  Scanner createScanner(String tableName)
+      throws TableNotFoundException, AccumuloSecurityException, 
AccumuloException;
 
   /**
    * Factory method to create a ConditionalWriter connected to Accumulo.
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java
index eaf0d8d..1506f26 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/AccumuloClientImpl.java
@@ -126,8 +126,8 @@ public class AccumuloClientImpl implements AccumuloClient {
   }
 
   @Override
-  public BatchScanner createBatchScanner(String tableName) throws 
TableNotFoundException,
-      AccumuloSecurityException, AccumuloException {
+  public BatchScanner createBatchScanner(String tableName)
+      throws TableNotFoundException, AccumuloSecurityException, 
AccumuloException {
     Authorizations auths = 
securityOperations().getUserAuthorizations(context.getPrincipal());
     return createBatchScanner(tableName, auths);
   }
@@ -201,8 +201,8 @@ public class AccumuloClientImpl implements AccumuloClient {
   }
 
   @Override
-  public Scanner createScanner(String tableName) throws TableNotFoundException,
-      AccumuloSecurityException, AccumuloException {
+  public Scanner createScanner(String tableName)
+      throws TableNotFoundException, AccumuloSecurityException, 
AccumuloException {
     Authorizations auths = 
securityOperations().getUserAuthorizations(context.getPrincipal());
     return createScanner(tableName, auths);
   }
diff --git 
a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java 
b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
index 35f907b..474bc5e 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
@@ -229,7 +229,8 @@ public class SiteConfiguration extends 
AccumuloConfiguration {
       }
     }
     return overrides.containsKey(prop.getKey()) || 
staticConfigs.containsKey(prop.getKey())
-        || getConfiguration().containsKey(prop.getKey()) || 
parent.isPropertySet(prop, cacheAndWatch);
+        || getConfiguration().containsKey(prop.getKey())
+        || parent.isPropertySet(prop, cacheAndWatch);
   }
 
   @Override
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
 
b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
index aeb4bca..a45b34d 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
@@ -44,7 +44,8 @@ public class ZooConfiguration extends AccumuloConfiguration {
   private final Map<String,String> fixedProps = 
Collections.synchronizedMap(new HashMap<>());
   private final String propPathPrefix;
 
-  protected ZooConfiguration(ServerContext context, ZooCache propCache, 
AccumuloConfiguration parent) {
+  protected ZooConfiguration(ServerContext context, ZooCache propCache,
+      AccumuloConfiguration parent) {
     this.context = context;
     this.propCache = propCache;
     this.parent = parent;
@@ -118,7 +119,7 @@ public class ZooConfiguration extends AccumuloConfiguration 
{
         if (zr.exists(zPath)) {
           return true;
         }
-      } catch (KeeperException|InterruptedException e) {
+      } catch (KeeperException | InterruptedException e) {
         throw new IllegalStateException(e);
       }
     }