(accumulo) 01/01: Merge branch 'main' into elasticity

[cshannon]

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

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

commit a064d05538c55f55984b14a0fedc368e2ff86331
Merge: a545e1e45e 7724f6ad7b
Author: Christopher L. Shannon <cshan...@apache.org>
AuthorDate: Sat Jun 8 12:47:21 2024 -0400

    Merge branch 'main' into elasticity

 .../apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --cc 
minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
index 36f242f59a,1cd63b4889..b5c6667519
--- 
a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
+++ 
b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
@@@ -75,12 -75,14 +75,11 @@@ public class MiniAccumuloConfigImpl 
    private Map<String,String> siteConfig = new HashMap<>();
    private Map<String,String> configuredSiteConig = new HashMap<>();
    private Map<String,String> clientProps = new HashMap<>();
 -  private int numTservers = 2;
 -  private int numScanServers = 0;
 -  private int numCompactors = 1;
    private Map<ServerType,Long> memoryConfig = new HashMap<>();
-   private final EnumMap<ServerType,
-       Class<?>> serverTypeClasses = new EnumMap<ServerType,Class<?>>(
-           Map.of(MANAGER, Manager.class, GARBAGE_COLLECTOR, 
SimpleGarbageCollector.class, MONITOR,
-               Monitor.class, ZOOKEEPER, ZooKeeperServerMain.class, 
TABLET_SERVER,
-               TabletServer.class, SCAN_SERVER, ScanServer.class, COMPACTOR, 
Compactor.class));
+   private final EnumMap<ServerType,Class<?>> serverTypeClasses =
+       new EnumMap<>(Map.of(MANAGER, Manager.class, GARBAGE_COLLECTOR, 
SimpleGarbageCollector.class,
+           MONITOR, Monitor.class, ZOOKEEPER, ZooKeeperServerMain.class, 
TABLET_SERVER,
+           TabletServer.class, SCAN_SERVER, ScanServer.class, COMPACTOR, 
Compactor.class));
    private boolean jdwpEnabled = false;
    private Map<String,String> systemProperties = new HashMap<>();