accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] branch master updated: Remove unused code in master and server (#870)
Date Mon, 07 Jan 2019 20:02:19 GMT
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 d59f3d6  Remove unused code in master and server (#870)
d59f3d6 is described below

commit d59f3d68943430abc54bd0ca33774d4e996eca22
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Mon Jan 7 15:02:14 2019 -0500

    Remove unused code in master and server (#870)
    
    * Also deprecated PermissionHander.initTable() since it has never been used
---
 .../apache/accumulo/server/init/Initialize.java    |   5 +-
 .../balancer/HostRegexTableLoadBalancer.java       |   4 -
 .../server/replication/ReplicationUtil.java        |   7 +-
 .../server/rpc/SaslServerConnectionParams.java     |   4 -
 .../apache/accumulo/server/rpc/TServerUtils.java   |  17 ----
 .../accumulo/server/security/SecurityUtil.java     |   3 -
 .../server/security/UserImpersonation.java         |   6 --
 .../security/handler/InsecureAuthenticator.java    |  81 ---------------
 .../security/handler/InsecurePermHandler.java      | 110 ---------------------
 .../server/security/handler/PermissionHandler.java |   5 +-
 .../accumulo/server/tables/TableManager.java       |   8 --
 .../server/replication/ReplicationUtilTest.java    |   5 +-
 .../apache/accumulo/master/TabletGroupWatcher.java |   8 --
 .../DistributedWorkQueueWorkAssigner.java          |  27 -----
 .../master/replication/SequentialWorkAssigner.java |   6 --
 .../accumulo/master/replication/StatusMaker.java   |   4 -
 .../accumulo/master/replication/WorkDriver.java    |  19 ----
 .../accumulo/master/util/TableValidators.java      |  13 ---
 18 files changed, 9 insertions(+), 323 deletions(-)

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 18fa54f..fbecf2c 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
@@ -688,7 +688,6 @@ public class Initialize implements KeywordExecutable {
       instanceNamePath = Constants.ZROOT + Constants.ZINSTANCES + "/" + instanceName;
       if (opts.clearInstanceName) {
         exists = false;
-        break;
       } else {
         // ACCUMULO-4401 setting exists=false is just as important as setting it to true
         exists = zoo.exists(instanceNamePath);
@@ -899,9 +898,9 @@ public class Initialize implements KeywordExecutable {
     boolean uploadAccumuloProps = false;
     @Parameter(names = "--instance-name",
         description = "the instance name, if not provided, will prompt")
-    String cliInstanceName;
+    String cliInstanceName = null;
     @Parameter(names = "--password", description = "set the password on the command line")
-    String cliPassword;
+    String cliPassword = null;
     @Parameter(names = {"-u", "--user"},
         description = "the name of the user to grant system permissions to")
     String rootUser = null;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index 5310333..26f5aec 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -299,10 +299,6 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements
Con
     return isIpBasedRegex;
   }
 
-  public int getMaxConcurrentMigrations() {
-    return maxTServerMigrations;
-  }
-
   @Override
   public void init(ServerContext context) {
     super.init(context);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
index da7993e..0c4fb44 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationUtil.java
@@ -39,7 +39,6 @@ import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection;
 import org.apache.accumulo.core.replication.ReplicationTable;
 import org.apache.accumulo.core.replication.ReplicationTarget;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.TableConfiguration;
 import org.apache.hadoop.fs.Path;
@@ -52,15 +51,13 @@ public class ReplicationUtil {
   public static final String STATUS_FORMATTER_CLASS_NAME = StatusFormatter.class.getName();
 
   private final ServerContext context;
-  private final ZooCache zooCache;
   private final ReplicaSystemFactory factory;
 
   public ReplicationUtil(ServerContext context) {
-    this(context, new ZooCache(context.getZooReaderWriter(), null), new ReplicaSystemFactory());
+    this(context, new ReplicaSystemFactory());
   }
 
-  public ReplicationUtil(ServerContext context, ZooCache cache, ReplicaSystemFactory factory)
{
-    this.zooCache = cache;
+  public ReplicationUtil(ServerContext context, ReplicaSystemFactory factory) {
     this.context = context;
     this.factory = factory;
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/SaslServerConnectionParams.java
b/server/base/src/main/java/org/apache/accumulo/server/rpc/SaslServerConnectionParams.java
index d09c40a..3cbe894 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/SaslServerConnectionParams.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/SaslServerConnectionParams.java
@@ -42,10 +42,6 @@ public class SaslServerConnectionParams extends SaslConnectionParams {
     setSecretManager(secretManager);
   }
 
-  public SaslServerConnectionParams(Properties clientProps, AuthenticationToken token) {
-    this(clientProps, token, null);
-  }
-
   public SaslServerConnectionParams(Properties clientProps, AuthenticationToken token,
       AuthenticationTokenSecretManager secretManager) {
     super(clientProps, token);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index cb13ec4..6d75dfe 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -295,23 +295,6 @@ public class TServerUtils {
   }
 
   /**
-   * Create a {@link TThreadPoolServer} with the provided transport, processor and transport
-   * factory.
-   *
-   * @param transport
-   *          Server transport
-   * @param processor
-   *          Processor implementation
-   * @param transportFactory
-   *          Transport factory
-   * @return A configured {@link TThreadPoolServer}
-   */
-  public static TThreadPoolServer createTThreadPoolServer(TServerTransport transport,
-      TProcessor processor, TTransportFactory transportFactory, TProtocolFactory protocolFactory)
{
-    return createTThreadPoolServer(transport, processor, transportFactory, protocolFactory,
null);
-  }
-
-  /**
    * Create a {@link TThreadPoolServer} with the provided server transport, processor and
transport
    * factory.
    *
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
index 9935297..94b39a8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
 public class SecurityUtil {
   private static final Logger log = LoggerFactory.getLogger(SecurityUtil.class);
   private static final Logger renewalLog = LoggerFactory.getLogger("KerberosTicketRenewal");
-  public static boolean usingKerberos = false;
 
   /**
    * This method is for logging a server in kerberos. If this is used in client code, it
will fail
@@ -62,8 +61,6 @@ public class SecurityUtil {
     if (principal == null || principal.length() == 0)
       return;
 
-    usingKerberos = true;
-
     if (login(principal, keyTab)) {
       try {
         startTicketRenewalThread(UserGroupInformation.getCurrentUser(),
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
index 77a33b9..9912b7e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/UserImpersonation.java
@@ -126,12 +126,6 @@ public class UserImpersonation {
       allUsers = allHosts = false;
     }
 
-    public UsersWithHosts(Set<String> users, Set<String> hosts) {
-      this();
-      this.users = users;
-      this.hosts = hosts;
-    }
-
     public Set<String> getUsers() {
       if (allUsers) {
         return ALWAYS_TRUE;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
deleted file mode 100644
index f2584f1..0000000
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.server.security.handler;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
-import org.apache.accumulo.core.client.security.tokens.NullToken;
-import org.apache.accumulo.server.ServerContext;
-
-/**
- * This is an Authenticator implementation that doesn't actually do any security. Any principal
will
- * authenticate if a NullToken is provided. It's existence is primarily for testing, but
can also be
- * used for any system where user space management is not a concern.
- */
-public class InsecureAuthenticator implements Authenticator {
-
-  @Override
-  public void initialize(ServerContext context, boolean initialize) {}
-
-  @Override
-  public boolean validSecurityHandlers() {
-    return true;
-  }
-
-  @Override
-  public void initializeSecurity(String principal, byte[] token) {}
-
-  @Override
-  public boolean authenticateUser(String principal, AuthenticationToken token) {
-    return token instanceof NullToken;
-  }
-
-  @Override
-  public Set<String> listUsers() {
-    return Collections.emptySet();
-  }
-
-  @Override
-  public void createUser(String principal, AuthenticationToken token) {}
-
-  @Override
-  public void dropUser(String user) {}
-
-  @Override
-  public void changePassword(String user, AuthenticationToken token) {}
-
-  @Override
-  public boolean userExists(String user) {
-    return true;
-  }
-
-  @Override
-  public boolean validTokenClass(String tokenClass) {
-    return tokenClass.equals(NullToken.class.getName());
-  }
-
-  @Override
-  public Set<Class<? extends AuthenticationToken>> getSupportedTokenTypes() {
-    Set<Class<? extends AuthenticationToken>> cs = new HashSet<>();
-    cs.add(NullToken.class);
-    return cs;
-  }
-
-}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
b/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
deleted file mode 100644
index fcd7158..0000000
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.server.security.handler;
-
-import org.apache.accumulo.core.clientImpl.Namespace;
-import org.apache.accumulo.core.security.NamespacePermission;
-import org.apache.accumulo.core.security.SystemPermission;
-import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
-import org.apache.accumulo.server.ServerContext;
-
-/**
- * This is a Permission Handler implementation that doesn't actually do any security. Use
at your
- * own risk.
- */
-public class InsecurePermHandler implements PermissionHandler {
-
-  @Override
-  public void initialize(ServerContext context, boolean initialize) {}
-
-  @Override
-  public boolean validSecurityHandlers(Authenticator authent, Authorizor author) {
-    return true;
-  }
-
-  @Override
-  public void initializeSecurity(TCredentials token, String rootuser) {}
-
-  @Override
-  public boolean hasSystemPermission(String user, SystemPermission permission) {
-    return true;
-  }
-
-  @Override
-  public boolean hasCachedSystemPermission(String user, SystemPermission permission) {
-    return true;
-  }
-
-  @Override
-  public boolean hasTablePermission(String user, String table, TablePermission permission)
{
-    return true;
-  }
-
-  @Override
-  public boolean hasCachedTablePermission(String user, String table, TablePermission permission)
{
-    return true;
-  }
-
-  @Override
-  public void grantSystemPermission(String user, SystemPermission permission) {}
-
-  @Override
-  public void revokeSystemPermission(String user, SystemPermission permission) {}
-
-  @Override
-  public void grantTablePermission(String user, String table, TablePermission permission)
{}
-
-  @Override
-  public void revokeTablePermission(String user, String table, TablePermission permission)
{}
-
-  @Override
-  public void cleanTablePermissions(String table) {}
-
-  @Override
-  public void initUser(String user) {}
-
-  @Override
-  public void cleanUser(String user) {}
-
-  @Override
-  public void initTable(String table) {}
-
-  @Override
-  public boolean hasNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) {
-    return true;
-  }
-
-  @Override
-  public boolean hasCachedNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) {
-    return true;
-  }
-
-  @Override
-  public void grantNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) {}
-
-  @Override
-  public void revokeNamespacePermission(String user, Namespace.ID namespace,
-      NamespacePermission permission) {}
-
-  @Override
-  public void cleanNamespacePermissions(Namespace.ID namespace) {}
-
-}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java
b/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java
index 0b1cd24..63acd8e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java
@@ -139,8 +139,11 @@ public interface PermissionHandler {
   void initUser(String user) throws AccumuloSecurityException;
 
   /**
-   * Initializes a new user
+   * Initializes a new table
+   *
+   * @deprecated since 2.0.0. Method is never called so implementation does nothing.
    */
+  @Deprecated
   void initTable(String table);
 
   /**
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index b4e197b..76a903a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@ -135,14 +135,6 @@ public class TableManager {
       }
     }
 
-    public TableState getOldState() {
-      return oldState;
-    }
-
-    public TableState getNewState() {
-      return newState;
-    }
-
     @Override
     public String getMessage() {
       return message;
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationUtilTest.java
b/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationUtilTest.java
index e85ba65..cbde870 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationUtilTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationUtilTest.java
@@ -24,7 +24,6 @@ import java.util.Map.Entry;
 
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.accumulo.server.ServerContext;
 import org.easymock.EasyMock;
 import org.junit.Before;
@@ -33,7 +32,6 @@ import org.junit.Test;
 public class ReplicationUtilTest {
 
   ServerContext context;
-  ZooCache zc;
   AccumuloConfiguration conf;
   Map<String,String> confEntries;
   ReplicaSystemFactory factory;
@@ -42,12 +40,11 @@ public class ReplicationUtilTest {
   @Before
   public void setup() {
     context = EasyMock.createMock(ServerContext.class);
-    zc = EasyMock.createMock(ZooCache.class);
     conf = EasyMock.createMock(AccumuloConfiguration.class);
     EasyMock.expect(context.getConfiguration()).andReturn(conf).anyTimes();
     factory = new ReplicaSystemFactory();
 
-    util = new ReplicationUtil(context, zc, factory);
+    util = new ReplicationUtil(context, factory);
     confEntries = new HashMap<>();
   }
 
diff --git a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index 668e9ea..fb72c42 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -104,8 +104,6 @@ abstract class TabletGroupWatcher extends Daemon {
   final TabletStateStore store;
   final TabletGroupWatcher dependentWatcher;
 
-  private MasterState masterState;
-
   final TableStats stats = new TableStats();
   private SortedSet<TServerInstance> lastScanServers = ImmutableSortedSet.of();
 
@@ -122,11 +120,6 @@ abstract class TabletGroupWatcher extends Daemon {
     return stats.getLast();
   }
 
-  // returns the master state under which stats were collected
-  MasterState statsState() {
-    return masterState;
-  }
-
   TableCounts getStats(Table.ID tableId) {
     return stats.getLast(tableId);
   }
@@ -150,7 +143,6 @@ abstract class TabletGroupWatcher extends Daemon {
     while (this.master.stillMaster()) {
       // slow things down a little, otherwise we spam the logs when there are many wake-up
events
       sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-      masterState = master.getMasterState();
 
       int totalUnloaded = 0;
       int unloaded = 0;
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java
b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java
index 2b34cfe..dab030e 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/DistributedWorkQueueWorkAssigner.java
@@ -67,45 +67,18 @@ public abstract class DistributedWorkQueueWorkAssigner implements WorkAssigner
{
   protected int maxQueueSize;
   protected ZooCache zooCache;
 
-  /*
-   * Getters/setters for testing purposes
-   */
-  protected AccumuloClient getClient() {
-    return client;
-  }
-
   protected void setClient(AccumuloClient client) {
     this.client = client;
   }
 
-  protected AccumuloConfiguration getConf() {
-    return conf;
-  }
-
-  protected void setConf(AccumuloConfiguration conf) {
-    this.conf = conf;
-  }
-
-  protected DistributedWorkQueue getWorkQueue() {
-    return workQueue;
-  }
-
   protected void setWorkQueue(DistributedWorkQueue workQueue) {
     this.workQueue = workQueue;
   }
 
-  protected int getMaxQueueSize() {
-    return maxQueueSize;
-  }
-
   protected void setMaxQueueSize(int maxQueueSize) {
     this.maxQueueSize = maxQueueSize;
   }
 
-  protected ZooCache getZooCache() {
-    return zooCache;
-  }
-
   protected void setZooCache(ZooCache zooCache) {
     this.zooCache = zooCache;
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java
b/server/master/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java
index 61524f5..390ebd9 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/SequentialWorkAssigner.java
@@ -58,8 +58,6 @@ public class SequentialWorkAssigner extends DistributedWorkQueueWorkAssigner
{
   // @formatter:on
   private Map<String,Map<Table.ID,String>> queuedWorkByPeerName;
 
-  public SequentialWorkAssigner() {}
-
   public SequentialWorkAssigner(AccumuloConfiguration conf, AccumuloClient client) {
     configure(conf, client);
   }
@@ -69,10 +67,6 @@ public class SequentialWorkAssigner extends DistributedWorkQueueWorkAssigner
{
     return NAME;
   }
 
-  protected Map<String,Map<Table.ID,String>> getQueuedWork() {
-    return queuedWorkByPeerName;
-  }
-
   protected void setQueuedWork(Map<String,Map<Table.ID,String>> queuedWork) {
     this.queuedWorkByPeerName = queuedWork;
   }
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
b/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
index f82e707..d20b22a 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/StatusMaker.java
@@ -159,10 +159,6 @@ public class StatusMaker {
     }
   }
 
-  protected void setBatchWriter(BatchWriter bw) {
-    this.replicationWriter = bw;
-  }
-
   /**
    * Create a status record in the replication table
    */
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
index 0f1eb9b..c17f8ca 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/WorkDriver.java
@@ -71,25 +71,6 @@ public class WorkDriver extends Daemon {
     }
   }
 
-  /*
-   * Getters/setters for testing purposes
-   */
-  protected AccumuloClient getClient() {
-    return client;
-  }
-
-  protected void setClient(AccumuloClient client) {
-    this.client = client;
-  }
-
-  protected AccumuloConfiguration getConf() {
-    return conf;
-  }
-
-  protected void setConf(AccumuloConfiguration conf) {
-    this.conf = conf;
-  }
-
   @Override
   public void run() {
     log.info("Starting replication work assignment thread using {}", assignerImplName);
diff --git a/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java
b/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java
index d379bf2..27e4da0 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/util/TableValidators.java
@@ -93,19 +93,6 @@ public class TableValidators {
     }
   };
 
-  public static final Validator<String> NOT_ROOT = new Validator<String>() {
-
-    @Override
-    public boolean test(String tableName) {
-      return !RootTable.NAME.equals(tableName);
-    }
-
-    @Override
-    public String invalidMessage(String tableName) {
-      return "Table cannot be the " + RootTable.NAME + "(Id: " + RootTable.ID + ") table";
-    }
-  };
-
   public static final Validator<Table.ID> NOT_ROOT_ID = new Validator<Table.ID>()
{
 
     @Override


Mime
View raw message