From 0bea008c96bcb4616f1a100782b12667671ae48a Mon Sep 17 00:00:00 2001 From: Amanda Villarreal Date: Tue, 30 Jun 2026 15:57:22 -0500 Subject: [PATCH 1/4] Refactoring minicluster files to remove 1 TODO --- .../accumulo/{ => minicluster}/cluster/AccumuloCluster.java | 0 .../apache/accumulo/{ => minicluster}/cluster/ClusterControl.java | 0 .../apache/accumulo/{ => minicluster}/cluster/ClusterUser.java | 0 .../apache/accumulo/{ => minicluster}/cluster/ClusterUsers.java | 0 .../apache/accumulo/{ => minicluster}/cluster/RemoteShell.java | 0 .../accumulo/{ => minicluster}/cluster/RemoteShellOptions.java | 0 .../cluster/standalone/StandaloneAccumuloCluster.java | 0 .../cluster/standalone/StandaloneClusterControl.java | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/AccumuloCluster.java (100%) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/ClusterControl.java (100%) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/ClusterUser.java (100%) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/ClusterUsers.java (100%) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/RemoteShell.java (100%) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/RemoteShellOptions.java (100%) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/standalone/StandaloneAccumuloCluster.java (100%) rename minicluster/src/main/java/org/apache/accumulo/{ => minicluster}/cluster/standalone/StandaloneClusterControl.java (100%) diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java rename to minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java From 9db77a2e3a13b5e51f56a3e1816e9e6786ea24af Mon Sep 17 00:00:00 2001 From: Amanda Villarreal Date: Tue, 30 Jun 2026 16:04:38 -0500 Subject: [PATCH 2/4] Files modified from refactoring --- .../minicluster/cluster/AccumuloCluster.java | 2 +- .../accumulo/minicluster/cluster/ClusterControl.java | 2 +- .../accumulo/minicluster/cluster/ClusterUser.java | 2 +- .../accumulo/minicluster/cluster/ClusterUsers.java | 2 +- .../accumulo/minicluster/cluster/RemoteShell.java | 2 +- .../minicluster/cluster/RemoteShellOptions.java | 2 +- .../standalone/StandaloneAccumuloCluster.java | 6 +++--- .../cluster/standalone/StandaloneClusterControl.java | 8 ++++---- .../miniclusterImpl/MiniAccumuloClusterControl.java | 2 +- .../miniclusterImpl/MiniAccumuloClusterImpl.java | 2 +- .../standalone/StandaloneAccumuloClusterTest.java | 2 ++ .../standalone/StandaloneClusterControlTest.java | 1 + src/build/ci/check-module-package-conventions.sh | 12 ------------ .../apache/accumulo/test/ConditionalWriterIT.java | 2 +- .../org/apache/accumulo/test/ImportExportIT.java | 2 +- .../accumulo/test/NamespacesIT_SimpleSuite.java | 2 +- .../test/RecoveryCompactionsAreFlushesIT.java | 2 +- .../main/java/org/apache/accumulo/test/UsersIT.java | 2 +- .../accumulo/test/conf/ResourceGroupConfigIT.java | 2 +- .../accumulo/test/functional/AccumuloClientIT.java | 2 +- .../test/functional/CloneTestIT_SimpleSuite.java | 2 +- .../accumulo/test/functional/CredentialsIT.java | 2 +- .../apache/accumulo/test/functional/DeleteIT.java | 2 +- .../test/functional/FunctionalTestUtils.java | 2 +- .../apache/accumulo/test/functional/KerberosIT.java | 2 +- .../accumulo/test/functional/KerberosRenewalIT.java | 2 +- .../accumulo/test/functional/LocalityGroupIT.java | 2 +- .../accumulo/test/functional/ManagerFailoverIT.java | 2 +- .../accumulo/test/functional/PerTableCryptoIT.java | 2 +- .../accumulo/test/functional/PermissionsIT.java | 2 +- .../apache/accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../apache/accumulo/test/functional/RestartIT.java | 2 +- .../accumulo/test/functional/RestartStressIT.java | 2 +- .../accumulo/test/functional/ScanIteratorIT.java | 2 +- .../org/apache/accumulo/test/functional/StartIT.java | 2 +- .../org/apache/accumulo/test/functional/TableIT.java | 2 +- .../test/harness/AccumuloClusterHarness.java | 10 +++++----- .../harness/AccumuloMiniClusterConfiguration.java | 2 +- .../accumulo/test/harness/MiniClusterHarness.java | 2 +- .../accumulo/test/harness/SharedMiniClusterBase.java | 4 ++-- .../StandaloneAccumuloClusterConfiguration.java | 2 +- .../org/apache/accumulo/test/harness/TestingKdc.java | 2 +- 42 files changed, 53 insertions(+), 62 deletions(-) diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java index dcdc8a03048..fba327fffcb 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.minicluster.cluster; import java.util.Properties; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java index a1e14cfc39d..0f2d280ac49 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.minicluster.cluster; import java.io.IOException; import java.util.Map.Entry; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java index 2b7e5426cd6..0feebdd8c70 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.minicluster.cluster; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java index b92f68f6aca..70ed72968b2 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.minicluster.cluster; import org.apache.accumulo.core.security.SystemPermission; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java index 0b6c9190d0e..fc4f892a8aa 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.minicluster.cluster; import static java.util.Objects.requireNonNull; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java index 79f2ba9eabb..6babcbc091b 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster; +package org.apache.accumulo.minicluster.cluster; import java.io.BufferedReader; import java.io.IOException; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java index d12409f5072..d9c122f2f24 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.minicluster.cluster.standalone; import static com.google.common.base.Preconditions.checkArgument; @@ -29,8 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import org.apache.accumulo.cluster.AccumuloCluster; -import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; @@ -40,6 +38,8 @@ import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.server.ServerContext; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java index 8e8b852212d..bc571ab1687 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.minicluster.cluster.standalone; import static java.util.Objects.requireNonNull; @@ -30,12 +30,12 @@ import java.util.List; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.cluster.RemoteShell; -import org.apache.accumulo.cluster.RemoteShellOptions; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; import org.apache.accumulo.manager.state.SetGoalState; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.RemoteShell; +import org.apache.accumulo.minicluster.cluster.RemoteShellOptions; import org.apache.accumulo.server.util.adminCommand.StopAll; import org.apache.hadoop.util.Shell.ExitCodeException; import org.slf4j.Logger; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java index 55c4bad8652..1c7f258a573 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java @@ -34,12 +34,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.data.ResourceGroupId; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.cluster.ClusterControl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; import org.apache.accumulo.server.util.ZooZap; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java index cd881eac576..26355aeccdd 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java @@ -60,7 +60,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.TableNotFoundException; @@ -100,6 +99,7 @@ import org.apache.accumulo.manager.state.SetGoalState; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.init.Initialize; import org.apache.accumulo.server.util.AccumuloStatus; diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java index 97511c7c369..ea85e6fed13 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java @@ -20,6 +20,8 @@ import org.apache.accumulo.core.manager.thrift.ManagerGoalState; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.minicluster.cluster.standalone.StandaloneClusterControl; import org.easymock.EasyMock; import org.junit.jupiter.api.Test; diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java index 72e56dd64f2..3893113353c 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java @@ -20,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.accumulo.minicluster.cluster.standalone.StandaloneClusterControl; import org.junit.jupiter.api.Test; public class StandaloneClusterControlTest { diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 794237451ea..0a71c11c169 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -57,18 +57,6 @@ ALLOWED=( test/src/main/resources/v2_import_test/data/A000000b.rf test/src/main/resources/v2_import_test/data/distcp.txt test/src/main/resources/v2_import_test/data/exportMetadata.zip - - # TODO: these minicluster classes should be moved into the correct package for the module - minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java - minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java - minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java - minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java - minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java - minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java - minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java - minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java - minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java - minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java ) ALLOWED_PIPE_SEP=$({ for x in "${ALLOWED[@]}"; do echo "$x"; done; } | paste -sd'|') diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java index 7c6f8f0e510..cc8ed58612a 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -50,7 +50,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java index a8c7cc6e86a..262fe2bcd9f 100644 --- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.SortedSet; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java index f91124245ee..82fd891adc8 100644 --- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java @@ -40,7 +40,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java index af45e39cce8..cc803497dcf 100644 --- a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java @@ -23,7 +23,7 @@ import java.time.Duration; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; diff --git a/test/src/main/java/org/apache/accumulo/test/UsersIT.java b/test/src/main/java/org/apache/accumulo/test/UsersIT.java index c6ee116909d..a5683083c43 100644 --- a/test/src/main/java/org/apache/accumulo/test/UsersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/UsersIT.java @@ -24,7 +24,7 @@ import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloSecurityException; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java index 3bb57e99695..f5ab1f8462c 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java @@ -33,7 +33,7 @@ import java.util.TreeMap; import java.util.function.Consumer; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java index d6051746f37..490a3d300c2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java @@ -27,7 +27,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java index ab70614f419..4d1edc43ac3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java @@ -39,7 +39,7 @@ import java.util.TreeSet; import java.util.regex.Pattern; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java index a25b55cb8b3..eebb9b209fa 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java @@ -29,7 +29,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java index 552fd5b91fc..a2d4fef7317 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java @@ -22,7 +22,7 @@ import java.time.Duration; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.test.TestIngest; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java index cf2460035f8..8337950c76a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java index 968d1d5dd4a..e3839a2d350 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java @@ -38,7 +38,7 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java index 250e0377cdb..2666d002c11 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Scanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java index a5367c218bd..c8db44086a4 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java @@ -37,7 +37,7 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java index 004be25a1bb..d8edeabab1a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java @@ -21,7 +21,7 @@ import java.time.Duration; import java.util.Map; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.ClientProperty; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java index 7a4085680d8..e7f5f1fd698 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.CloneConfiguration; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java index 9dfe7d05d0c..e2b11957b59 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java @@ -35,7 +35,7 @@ import java.util.Map.Entry; import java.util.Set; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java index a4d4e1f5cb8..e35a8205e13 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -38,8 +38,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java index 0360aa430a2..fb585a89017 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java @@ -29,7 +29,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java index 7fdaacc0205..e7f7596e8d3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -26,7 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java index c1caae73cc1..1e9edffb75a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Objects; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java index f0c11a29f96..b2f726f6b40 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java @@ -23,7 +23,7 @@ import java.time.Duration; -import org.apache.accumulo.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.ClusterControl; import org.apache.accumulo.start.TestMain; import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java index a21d4fcf0a0..a9d720e19d5 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java @@ -27,7 +27,7 @@ import java.io.FileNotFoundException; import java.time.Duration; -import org.apache.accumulo.cluster.AccumuloCluster; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java index 001201aabc9..a73734a1ec2 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java @@ -26,11 +26,11 @@ import java.io.IOException; import java.util.Properties; -import org.apache.accumulo.cluster.AccumuloCluster; -import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.cluster.ClusterUser; -import org.apache.accumulo.cluster.ClusterUsers; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUsers; +import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.SecurityOperations; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java index 6780981afc0..90090a79340 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.Map; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java index 9fa60321098..d807b5abcff 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.UUID; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java index 11a5ae01d1a..23d776bca3c 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java @@ -32,8 +32,8 @@ import java.util.function.Predicate; import java.util.stream.Stream; -import org.apache.accumulo.cluster.ClusterUser; -import org.apache.accumulo.cluster.ClusterUsers; +import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUsers; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java index 91ebaa8b1c7..7b7975e70c5 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java index 3e255126586..459dd395fa5 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Properties; -import org.apache.accumulo.cluster.ClusterUser; +import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.hadoop.minikdc.MiniKdc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From fa89f5b1857fdcf8b299d5e169f69063b6561f5f Mon Sep 17 00:00:00 2001 From: Amanda Villarreal Date: Wed, 1 Jul 2026 12:12:25 -0500 Subject: [PATCH 3/4] Moving cluster files into accumulo-server-base --- .../server}/cluster/AccumuloCluster.java | 0 .../server}/cluster/ClusterControl.java | 0 .../accumulo/server}/cluster/ClusterUser.java | 0 .../server}/cluster/ClusterUsers.java | 0 .../accumulo/server}/cluster/RemoteShell.java | 0 .../server}/cluster/RemoteShellOptions.java | 0 .../standalone/StandaloneAccumuloCluster.java | 0 .../standalone/StandaloneClusterControl.java | 0 .../ci/check-module-package-conventions.sh | 19 ------------------- 9 files changed, 19 deletions(-) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/AccumuloCluster.java (100%) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/ClusterControl.java (100%) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/ClusterUser.java (100%) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/ClusterUsers.java (100%) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/RemoteShell.java (100%) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/RemoteShellOptions.java (100%) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/standalone/StandaloneAccumuloCluster.java (100%) rename {minicluster/src/main/java/org/apache/accumulo/minicluster => server/base/src/main/java/org/apache/accumulo/server}/cluster/standalone/StandaloneClusterControl.java (100%) diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/AccumuloCluster.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterControl.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUser.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/ClusterUsers.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShell.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/RemoteShellOptions.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneAccumuloCluster.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java similarity index 100% rename from minicluster/src/main/java/org/apache/accumulo/minicluster/cluster/standalone/StandaloneClusterControl.java rename to server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 0a71c11c169..5f00b612e78 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -38,25 +38,6 @@ ALLOWED=( server/native/src/main/resources/LICENSE server/native/src/main/resources/Makefile server/native/src/main/resources/NOTICE - - # TODO: these test resources should be moved into the correct package for the module - core/src/test/resources/accumulo.jceks - core/src/test/resources/empty.jceks - core/src/test/resources/site-cfg.jceks - core/src/test/resources/accumulo2.properties - core/src/test/resources/passwords.jceks - minicluster/src/test/resources/FooFilter.jar - server/tserver/src/test/resources/walog-from-15.walog - server/tserver/src/test/resources/walog-from-16.walog - server/tserver/src/test/resources/walog-from-14/550e8400-e29b-41d4-a716-446655440000 - server/tserver/src/test/resources/walog-from-20.walog - test/src/main/resources/v2_import_test/README.md - test/src/main/resources/v2_import_test/data/A0000008.rf - test/src/main/resources/v2_import_test/data/A0000009.rf - test/src/main/resources/v2_import_test/data/A000000a.rf - test/src/main/resources/v2_import_test/data/A000000b.rf - test/src/main/resources/v2_import_test/data/distcp.txt - test/src/main/resources/v2_import_test/data/exportMetadata.zip ) ALLOWED_PIPE_SEP=$({ for x in "${ALLOWED[@]}"; do echo "$x"; done; } | paste -sd'|') From b103b546452c186ef62c4cd2e5a7cbb07c075d86 Mon Sep 17 00:00:00 2001 From: Amanda Villarreal Date: Thu, 2 Jul 2026 10:12:36 -0500 Subject: [PATCH 4/4] Files updated from refactoring --- .../miniclusterImpl/MiniAccumuloClusterControl.java | 2 +- .../miniclusterImpl/MiniAccumuloClusterImpl.java | 2 +- .../accumulo/server/cluster/AccumuloCluster.java | 2 +- .../apache/accumulo/server/cluster/ClusterControl.java | 2 +- .../apache/accumulo/server/cluster/ClusterUser.java | 2 +- .../apache/accumulo/server/cluster/ClusterUsers.java | 2 +- .../apache/accumulo/server/cluster/RemoteShell.java | 2 +- .../accumulo/server/cluster/RemoteShellOptions.java | 2 +- .../cluster/standalone/StandaloneAccumuloCluster.java | 8 ++++---- .../cluster/standalone/StandaloneClusterControl.java | 10 ++++------ .../standalone/StandaloneAccumuloClusterTest.java | 6 ++---- .../standalone/StandaloneClusterControlTest.java | 3 +-- .../org/apache/accumulo/test/ConditionalWriterIT.java | 2 +- .../java/org/apache/accumulo/test/ImportExportIT.java | 2 +- .../apache/accumulo/test/NamespacesIT_SimpleSuite.java | 2 +- .../accumulo/test/RecoveryCompactionsAreFlushesIT.java | 2 +- .../main/java/org/apache/accumulo/test/UsersIT.java | 2 +- .../accumulo/test/conf/ResourceGroupConfigIT.java | 2 +- .../accumulo/test/functional/AccumuloClientIT.java | 2 +- .../test/functional/CloneTestIT_SimpleSuite.java | 2 +- .../apache/accumulo/test/functional/CredentialsIT.java | 2 +- .../org/apache/accumulo/test/functional/DeleteIT.java | 2 +- .../accumulo/test/functional/FunctionalTestUtils.java | 2 +- .../apache/accumulo/test/functional/KerberosIT.java | 2 +- .../accumulo/test/functional/KerberosRenewalIT.java | 2 +- .../accumulo/test/functional/LocalityGroupIT.java | 2 +- .../accumulo/test/functional/ManagerFailoverIT.java | 2 +- .../accumulo/test/functional/PerTableCryptoIT.java | 2 +- .../apache/accumulo/test/functional/PermissionsIT.java | 2 +- .../apache/accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../org/apache/accumulo/test/functional/RestartIT.java | 2 +- .../accumulo/test/functional/RestartStressIT.java | 2 +- .../accumulo/test/functional/ScanIteratorIT.java | 2 +- .../org/apache/accumulo/test/functional/StartIT.java | 2 +- .../org/apache/accumulo/test/functional/TableIT.java | 2 +- .../accumulo/test/harness/AccumuloClusterHarness.java | 10 +++++----- .../test/harness/AccumuloMiniClusterConfiguration.java | 2 +- .../accumulo/test/harness/MiniClusterHarness.java | 2 +- .../accumulo/test/harness/SharedMiniClusterBase.java | 4 ++-- .../StandaloneAccumuloClusterConfiguration.java | 2 +- .../org/apache/accumulo/test/harness/TestingKdc.java | 2 +- 41 files changed, 54 insertions(+), 59 deletions(-) rename {minicluster/src/test/java/org/apache/accumulo => server/base/src/test/java/org/apache/accumulo/server}/cluster/standalone/StandaloneAccumuloClusterTest.java (87%) rename {minicluster/src/test/java/org/apache/accumulo => server/base/src/test/java/org/apache/accumulo/server}/cluster/standalone/StandaloneClusterControlTest.java (92%) diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java index 1c7f258a573..e73c1394fbe 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java @@ -39,7 +39,7 @@ import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.data.ResourceGroupId; import org.apache.accumulo.minicluster.ServerType; -import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; import org.apache.accumulo.server.util.ZooZap; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java index 26355aeccdd..5d1a24caff9 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java @@ -99,7 +99,7 @@ import org.apache.accumulo.manager.state.SetGoalState; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.ServerType; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.init.Initialize; import org.apache.accumulo.server.util.AccumuloStatus; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java index fba327fffcb..5b38678e789 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/AccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster; +package org.apache.accumulo.server.cluster; import java.util.Properties; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java index 0f2d280ac49..4b26c53d983 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster; +package org.apache.accumulo.server.cluster; import java.io.IOException; import java.util.Map.Entry; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java index 0feebdd8c70..586088981ef 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster; +package org.apache.accumulo.server.cluster; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java index 70ed72968b2..de834774186 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/ClusterUsers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster; +package org.apache.accumulo.server.cluster; import org.apache.accumulo.core.security.SystemPermission; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java index fc4f892a8aa..1a51eff2dd7 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShell.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster; +package org.apache.accumulo.server.cluster; import static java.util.Objects.requireNonNull; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java index 6babcbc091b..9b24435536e 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/RemoteShellOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster; +package org.apache.accumulo.server.cluster; import java.io.BufferedReader; import java.io.IOException; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java index d9c122f2f24..c22ae9cd59a 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import static com.google.common.base.Preconditions.checkArgument; @@ -37,10 +37,10 @@ import org.apache.accumulo.core.conf.ConfigurationCopy; import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.minicluster.ServerType; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; -import org.apache.accumulo.minicluster.cluster.ClusterUser; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.server.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.ClusterUser; +import org.apache.accumulo.minicluster.ServerType; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java index bc571ab1687..12777ec5e2f 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.minicluster.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import static java.util.Objects.requireNonNull; @@ -31,11 +31,9 @@ import java.util.Map.Entry; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.manager.state.SetGoalState; -import org.apache.accumulo.minicluster.ServerType; -import org.apache.accumulo.minicluster.cluster.ClusterControl; -import org.apache.accumulo.minicluster.cluster.RemoteShell; -import org.apache.accumulo.minicluster.cluster.RemoteShellOptions; +import org.apache.accumulo.server.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.RemoteShell; +import org.apache.accumulo.server.cluster.RemoteShellOptions; import org.apache.accumulo.server.util.adminCommand.StopAll; import org.apache.hadoop.util.Shell.ExitCodeException; import org.slf4j.Logger; diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloClusterTest.java similarity index 87% rename from minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java rename to server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloClusterTest.java index ea85e6fed13..a9b5ad416f1 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneAccumuloClusterTest.java @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.minicluster.ServerType; -import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; -import org.apache.accumulo.minicluster.cluster.standalone.StandaloneClusterControl; +import org.apache.accumulo.server.minicluster.ServerType; import org.easymock.EasyMock; import org.junit.jupiter.api.Test; diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControlTest.java similarity index 92% rename from minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java rename to server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControlTest.java index 3893113353c..707721bae8b 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/cluster/standalone/StandaloneClusterControlTest.java @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.server.cluster.standalone; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.apache.accumulo.minicluster.cluster.standalone.StandaloneClusterControl; import org.junit.jupiter.api.Test; public class StandaloneClusterControlTest { diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java index cc8ed58612a..1f6777c4343 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -50,7 +50,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java index 262fe2bcd9f..d3dada09880 100644 --- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.SortedSet; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java index 82fd891adc8..41ee8975ea9 100644 --- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java @@ -40,7 +40,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java index cc803497dcf..e26525acd65 100644 --- a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java @@ -23,7 +23,7 @@ import java.time.Duration; import java.util.Map.Entry; -import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; diff --git a/test/src/main/java/org/apache/accumulo/test/UsersIT.java b/test/src/main/java/org/apache/accumulo/test/UsersIT.java index a5683083c43..4994329bd2c 100644 --- a/test/src/main/java/org/apache/accumulo/test/UsersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/UsersIT.java @@ -24,7 +24,7 @@ import java.util.Set; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloSecurityException; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java index f5ab1f8462c..b83460adcab 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java @@ -33,7 +33,7 @@ import java.util.TreeMap; import java.util.function.Consumer; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java index 490a3d300c2..400d1d62a9b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java @@ -27,7 +27,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java index 4d1edc43ac3..bc911ffdff3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java @@ -39,7 +39,7 @@ import java.util.TreeSet; import java.util.regex.Pattern; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java index eebb9b209fa..f65e53415f6 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java @@ -29,7 +29,7 @@ import java.util.Properties; import java.util.Set; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java index a2d4fef7317..4e45de53b48 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java @@ -22,7 +22,7 @@ import java.time.Duration; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.test.TestIngest; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java index 8337950c76a..4e79bb2413d 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java index e3839a2d350..83eabd5fe78 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java @@ -38,7 +38,7 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java index 2666d002c11..2eb0903367b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Scanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java index c8db44086a4..3bafb85346c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java @@ -37,7 +37,7 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java index d8edeabab1a..95daa6e64f1 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java @@ -21,7 +21,7 @@ import java.time.Duration; import java.util.Map; -import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.ClientProperty; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java index e7f5f1fd698..f3875e6c97a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; -import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.CloneConfiguration; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java index e2b11957b59..85d087f253c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java @@ -35,7 +35,7 @@ import java.util.Map.Entry; import java.util.Set; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java index e35a8205e13..202ae6f5d83 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -38,8 +38,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import org.apache.accumulo.minicluster.cluster.ClusterControl; -import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java index fb585a89017..9f38e882888 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java @@ -29,7 +29,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java index e7f7596e8d3..f3dd98feedf 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -26,7 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java index 1e9edffb75a..135b7dd2c76 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.Objects; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java index b2f726f6b40..abd2700b7b2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java @@ -23,7 +23,7 @@ import java.time.Duration; -import org.apache.accumulo.minicluster.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterControl; import org.apache.accumulo.start.TestMain; import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java index a9d720e19d5..2e631efc623 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java @@ -27,7 +27,7 @@ import java.io.FileNotFoundException; import java.time.Duration; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java index a73734a1ec2..30af8347381 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java @@ -26,11 +26,11 @@ import java.io.IOException; import java.util.Properties; -import org.apache.accumulo.minicluster.cluster.AccumuloCluster; -import org.apache.accumulo.minicluster.cluster.ClusterControl; -import org.apache.accumulo.minicluster.cluster.ClusterUser; -import org.apache.accumulo.minicluster.cluster.ClusterUsers; -import org.apache.accumulo.minicluster.cluster.standalone.StandaloneAccumuloCluster; +import org.apache.accumulo.server.cluster.AccumuloCluster; +import org.apache.accumulo.server.cluster.ClusterControl; +import org.apache.accumulo.server.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUsers; +import org.apache.accumulo.server.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.SecurityOperations; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java index 90090a79340..53d105238ab 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.Map; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java index d807b5abcff..db4d2f4e151 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.UUID; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java index 23d776bca3c..3995f37eabc 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java @@ -32,8 +32,8 @@ import java.util.function.Predicate; import java.util.stream.Stream; -import org.apache.accumulo.minicluster.cluster.ClusterUser; -import org.apache.accumulo.minicluster.cluster.ClusterUsers; +import org.apache.accumulo.server.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUsers; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java index 7b7975e70c5..1411963fd68 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; diff --git a/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java index 459dd395fa5..068cefc3e48 100644 --- a/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Properties; -import org.apache.accumulo.minicluster.cluster.ClusterUser; +import org.apache.accumulo.server.cluster.ClusterUser; import org.apache.hadoop.minikdc.MiniKdc; import org.slf4j.Logger; import org.slf4j.LoggerFactory;