Removed MAC methods deprecated in 3.1 (apache#4395)

Author: dlmarion

minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java

@@ -51,31 +51,6 @@ public MiniAccumuloConfig(File dir, String rootPassword) {
     this.impl = new MiniAccumuloConfigImpl(dir, rootPassword);
   }
 
-  /**
-   * Calling this method is optional. If not set, it defaults to two.
-   *
-   * @param numTservers the number of tablet servers that mini accumulo cluster should start
-   */
-  // ELASTICITY_TODO: Deprecate in 3.0.0 and remove in elasticity on the merge
-  @Deprecated(since = "3.1.0")
-  public MiniAccumuloConfig setNumTservers(int numTservers) {
-    // impl.setNumTservers(numTservers);
-    return this;
-  }
-
-  /**
-   * Calling this method is optional. If not set, it defaults to zero.
-   *
-   * @param numScanServers the number of scan servers that mini accumulo cluster should start
-   * @since 2.1.0
-   */
-  // ELASTICITY_TODO: Deprecate in 3.0.0 and remove in elasticity on the merge
-  @Deprecated(since = "3.1.0")
-  public MiniAccumuloConfig setNumScanServers(int numScanServers) {
-    // impl.setNumScanServers(numScanServers);
-    return this;
-  }
-
   /**
    * Calling this method is optional. If not set, defaults to 'miniInstance'
    *
@@ -225,16 +200,6 @@ public String getRootPassword() {
     return impl.getRootPassword();
   }
 
-  /**
-   * @return the number of tservers configured for this cluster
-   */
-  // ELASTICITY_TODO: Deprecate in 3.0.0 and remove in elasticity on the merge
-  @Deprecated(since = "3.1.0")
-  public int getNumTservers() {
-    return impl.getClusterServerConfiguration().getTabletServerConfiguration().values().stream()
-        .reduce(0, Integer::sum);
-  }
-
   /**
    * @return is the current configuration in jdwpEnabled mode?
    *

minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java

@@ -150,7 +150,6 @@ public static class Opts extends Help {
    *
    * @param args An optional -p argument can be specified with the path to a valid properties file.
    */
-  @SuppressWarnings("deprecation")
   @SuppressFBWarnings(value = {"PATH_TRAVERSAL_IN", "UNENCRYPTED_SERVER_SOCKET"},
       justification = "code runs in same security context as user who provided input file name; "
           + "socket need not be encrypted, since this class is provided for testing only")
@@ -181,9 +180,6 @@ public static void main(String[] args) throws IOException, InterruptedException
     if (opts.prop.containsKey(INSTANCE_NAME_PROP)) {
       config.setInstanceName(opts.prop.getProperty(INSTANCE_NAME_PROP));
     }
-    if (opts.prop.containsKey(NUM_T_SERVERS_PROP)) {
-      config.setNumTservers(Integer.parseInt(opts.prop.getProperty(NUM_T_SERVERS_PROP)));
-    }
     if (opts.prop.containsKey(ZOO_KEEPER_PORT_PROP)) {
       config.setZooKeeperPort(Integer.parseInt(opts.prop.getProperty(ZOO_KEEPER_PORT_PROP)));
     }