This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f12b518ae079253a00e0716f70f81c5637b7fcc1 Merge: f648af7b26 6de1ecb0f2 Author: Daniel Roberts ddanielr <[email protected]> AuthorDate: Wed Sep 24 00:35:45 2025 +0000 Merge branch '2.1' .../miniclusterImpl/MiniAccumuloClusterImpl.java | 10 +++- .../miniclusterImpl/MiniAccumuloConfigImpl.java | 56 +++++++--------------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --cc minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java index 0cbc0e889f,363fe20478..83163a9573 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java @@@ -35,11 -33,10 +33,10 @@@ import java.util.HashMap import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import java.util.Objects; import java.util.function.Consumer; +import java.util.function.Function; import org.apache.accumulo.compactor.Compactor; - import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.core.conf.HadoopCredentialProvider; import org.apache.accumulo.core.conf.Property; @@@ -121,14 -120,8 +119,10 @@@ public class MiniAccumuloConfigImpl private String[] nativePathItems = null; - // These are only used on top of existing instances - private Configuration hadoopConf; - private SiteConfiguration accumuloConf; - private Consumer<MiniAccumuloConfigImpl> preStartConfigProcessor; + private final ClusterServerConfiguration serverConfiguration; + /** * @param dir An empty or nonexistent directory that Accumulo and Zookeeper can store data in. * Creating the directory is left to the user. Java 7, Guava, and Junit provide methods for @@@ -234,9 -231,9 +228,9 @@@ return; } - File keystoreFile = new File(getConfDir(), "credential-provider.jks"); - String keystoreUri = "jceks://file" + keystoreFile.getAbsolutePath(); + Path keystoreFile = confDir.resolve("credential-provider.jks"); + String keystoreUri = "jceks://file" + keystoreFile.toAbsolutePath(); - Configuration conf = getHadoopConfiguration(); + Configuration conf = buildHadoopConfiguration(); HadoopCredentialProvider.setPath(conf, keystoreUri); // Set the URI on the siteCfg @@@ -773,27 -812,9 +767,9 @@@ * @since 1.6.2 */ public File getHadoopConfDir() { - return this.hadoopConfDir; + return hadoopConfDir; } - /** - * @return accumulo Configuration being used - * - * @since 1.6.2 - */ - public AccumuloConfiguration getAccumuloConfiguration() { - return accumuloConf; - } - - /** - * @return hadoop Configuration being used - * - * @since 1.6.2 - */ - public Configuration getHadoopConfiguration() { - return hadoopConf; - } - /** * @return the default Accumulo "superuser" * @since 1.7.0
