From aff9d6221be89bfdd56d919ccd45291e700babd9 Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Fri, 19 Sep 2025 10:33:44 -0400 Subject: [PATCH 1/9] moved cluster classes into miniClusterImpl --- .../MiniAccumuloClusterControl.java | 2 +- .../MiniAccumuloClusterImpl.java | 2 +- .../cluster/AccumuloCluster.java | 2 +- .../cluster/ClusterControl.java | 2 +- .../cluster/ClusterUser.java | 2 +- .../cluster/ClusterUsers.java | 2 +- .../cluster/RemoteShell.java | 2 +- .../cluster/RemoteShellOptions.java | 2 +- .../standalone/StandaloneAccumuloCluster.java | 6 +++--- .../standalone/StandaloneClusterControl.java | 8 ++++---- .../StandaloneAccumuloClusterTest.java | 2 +- .../StandaloneClusterControlTest.java | 2 +- .../ci/check-module-package-conventions.sh | 20 +++++++++---------- .../harness/AccumuloClusterHarness.java | 10 +++++----- .../accumulo/harness/MiniClusterHarness.java | 2 +- .../harness/SharedMiniClusterBase.java | 4 ++-- .../apache/accumulo/harness/TestingKdc.java | 2 +- .../AccumuloMiniClusterConfiguration.java | 2 +- ...tandaloneAccumuloClusterConfiguration.java | 2 +- .../accumulo/test/ConditionalWriterIT.java | 2 +- .../apache/accumulo/test/ImportExportIT.java | 2 +- .../test/NamespacesIT_SimpleSuite.java | 2 +- .../test/RecoveryCompactionsAreFlushesIT.java | 2 +- .../org/apache/accumulo/test/UsersIT.java | 2 +- .../test/conf/ResourceGroupConfigIT.java | 2 +- .../test/functional/AccumuloClientIT.java | 2 +- .../functional/CloneTestIT_SimpleSuite.java | 2 +- .../test/functional/CredentialsIT.java | 2 +- .../accumulo/test/functional/DeleteIT.java | 2 +- .../test/functional/FunctionalTestUtils.java | 2 +- .../accumulo/test/functional/KerberosIT.java | 2 +- .../test/functional/KerberosRenewalIT.java | 2 +- .../test/functional/LocalityGroupIT.java | 2 +- .../test/functional/ManagerFailoverIT.java | 2 +- .../test/functional/PerTableCryptoIT.java | 2 +- .../test/functional/PermissionsIT.java | 2 +- .../accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../accumulo/test/functional/RestartIT.java | 2 +- .../test/functional/RestartStressIT.java | 2 +- .../test/functional/ScanIteratorIT.java | 2 +- .../accumulo/test/functional/StartIT.java | 2 +- .../accumulo/test/functional/TableIT.java | 2 +- 42 files changed, 62 insertions(+), 62 deletions(-) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/AccumuloCluster.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/ClusterControl.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/ClusterUser.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/ClusterUsers.java (96%) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/RemoteShell.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/RemoteShellOptions.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/standalone/StandaloneAccumuloCluster.java (97%) rename minicluster/src/main/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/standalone/StandaloneClusterControl.java (97%) rename minicluster/src/test/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/standalone/StandaloneAccumuloClusterTest.java (96%) rename minicluster/src/test/java/org/apache/accumulo/{ => miniclusterImpl}/cluster/standalone/StandaloneClusterControlTest.java (96%) 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 fc6762d7306..a45ffda5753 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.data.ResourceGroupId; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; import org.apache.accumulo.server.util.Admin; 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 63aa27227df..750e6641e96 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.AccumuloException; @@ -104,6 +103,7 @@ import org.apache.accumulo.manager.state.SetGoalState; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.miniclusterImpl.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/main/java/org/apache/accumulo/cluster/AccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/AccumuloCluster.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/AccumuloCluster.java index dcdc8a03048..36b02530bab 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.cluster; import java.util.Properties; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterControl.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterControl.java index a1e14cfc39d..9fa8aa5f60c 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.cluster; import java.io.IOException; import java.util.Map.Entry; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUser.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUser.java index 2b7e5426cd6..484e2bd09e8 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.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/cluster/ClusterUsers.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUsers.java similarity index 96% rename from minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUsers.java index b92f68f6aca..76a6a7f5b18 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.cluster; import org.apache.accumulo.core.security.SystemPermission; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShell.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShell.java index 0b6c9190d0e..1b348dd45f1 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.cluster; import static java.util.Objects.requireNonNull; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShellOptions.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShellOptions.java index 79f2ba9eabb..ec5cd22e51e 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.cluster; import java.io.BufferedReader; import java.io.IOException; diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloCluster.java similarity index 97% rename from minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloCluster.java index d12409f5072..548536cbb24 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.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.miniclusterImpl.cluster.AccumuloCluster; +import org.apache.accumulo.miniclusterImpl.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/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControl.java similarity index 97% rename from minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java rename to minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControl.java index 55834c48663..e5f3afc5578 100644 --- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/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.miniclusterImpl.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.miniclusterImpl.cluster.ClusterControl; +import org.apache.accumulo.miniclusterImpl.cluster.RemoteShell; +import org.apache.accumulo.miniclusterImpl.cluster.RemoteShellOptions; import org.apache.accumulo.server.util.Admin; 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/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloClusterTest.java similarity index 96% rename from minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java rename to minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloClusterTest.java index 97511c7c369..4dc0f902e6b 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloClusterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.miniclusterImpl.cluster.standalone; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; import org.apache.accumulo.minicluster.ServerType; diff --git a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControlTest.java similarity index 96% rename from minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java rename to minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControlTest.java index 72e56dd64f2..97407b56af9 100644 --- a/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControlTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.cluster.standalone; +package org.apache.accumulo.miniclusterImpl.cluster.standalone; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index b555f0a6dcd..10c7ad56fb0 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -74,16 +74,16 @@ ALLOWED=( 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 +# 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/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java index 047d9562ab9..c4e11ea4b7e 100644 --- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java @@ -26,11 +26,6 @@ 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.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.SecurityOperations; @@ -42,6 +37,11 @@ import org.apache.accumulo.harness.conf.AccumuloClusterPropertyConfiguration; import org.apache.accumulo.harness.conf.StandaloneAccumuloClusterConfiguration; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUsers; +import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.server.ServerContext; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java b/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java index 670aaba303f..03b50e62323 100644 --- a/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java @@ -32,7 +32,6 @@ import java.util.Map; import java.util.UUID; -import org.apache.accumulo.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; @@ -40,6 +39,7 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.server.security.handler.KerberosAuthenticator; import org.apache.accumulo.server.security.handler.KerberosAuthorizor; import org.apache.accumulo.server.security.handler.KerberosPermissionHandler; diff --git a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java index b1d90ce7f91..2b948811722 100644 --- a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java +++ b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java @@ -32,8 +32,6 @@ 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.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; @@ -48,6 +46,8 @@ import org.apache.accumulo.core.clientImpl.Namespace; import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUsers; import org.apache.accumulo.test.suites.SimpleSharedMacTestSuiteIT; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; diff --git a/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java b/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java index 2b76541444d..6ccf9b80488 100644 --- a/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java +++ b/test/src/main/java/org/apache/accumulo/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.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.minikdc.MiniKdc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java index dabe07b8071..d2916d434e2 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java @@ -21,13 +21,13 @@ import java.io.IOException; import java.util.Map; -import org.apache.accumulo.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; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; import org.apache.accumulo.harness.MiniClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.security.UserGroupInformation; diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java index 2130403f30b..b6f3beaa43c 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java @@ -28,13 +28,13 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.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; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.clientImpl.ClientInfo; import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; 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 e1244cae6f9..a65fa8a2f3d 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,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -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.AccumuloException; @@ -96,6 +95,7 @@ import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.test.constraints.AlphaNumKeyConstraint; import org.apache.accumulo.test.functional.BadIterator; import org.apache.accumulo.test.functional.SlowIterator; 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 e35bece0f2c..84cabf1d404 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,6 @@ import java.util.Set; import java.util.SortedSet; -import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -67,6 +66,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.test.util.FileMetadataUtil; import org.apache.commons.io.FileUtils; import org.apache.hadoop.fs.FSDataInputStream; 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 6dbc831195b..09f64f00e20 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,6 @@ import java.util.SortedSet; import java.util.TreeSet; -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.AccumuloException; @@ -79,6 +78,7 @@ import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.tables.TableNameUtil; import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.test.constraints.NumericValueConstraint; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.io.Text; 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 c7b2c4ade35..2f4d3a766cc 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,6 @@ import java.time.Duration; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; @@ -38,6 +37,7 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.Test; 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 298c47354c8..4b4c842f20b 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,6 @@ import java.util.Set; -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.AccumuloSecurityException; @@ -32,6 +31,7 @@ import org.apache.accumulo.core.client.security.SecurityErrorCode; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.junit.jupiter.api.Test; public class UsersIT extends AccumuloClusterHarness { 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 fd52c42bc2b..b2b0db96d22 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,6 @@ import java.util.TreeMap; import java.util.function.Consumer; -import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -56,6 +55,7 @@ import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; 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 9556f650258..445a25d993b 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,6 @@ import java.util.Properties; import java.util.Set; -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.BatchWriter; @@ -41,6 +40,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; 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 909802641fc..dce054aa0e2 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,6 @@ import java.util.TreeSet; import java.util.regex.Pattern; -import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -70,6 +69,7 @@ import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; 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 e0ae33b3d4f..f7a8556f7c8 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,6 @@ import java.util.Properties; import java.util.Set; -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.AccumuloException; @@ -43,6 +42,7 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.security.UserGroupInformation; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; 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 ced58c0dec9..939574dbe8d 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,10 +22,10 @@ import java.time.Duration; -import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestRandomDeletes; import org.apache.accumulo.test.VerifyIngest; 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 deba28adf2d..ba29ebaf3bc 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 @@ -44,7 +44,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.clientImpl.ClientContext; @@ -67,6 +66,7 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.TestIngest; import org.apache.commons.io.IOUtils; 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 fa06da9336f..9b28da537e6 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,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; -import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -71,6 +70,7 @@ import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.minikdc.MiniKdc; 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 bf74c91166f..6839a8509dd 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,6 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Scanner; @@ -44,6 +43,7 @@ import org.apache.accumulo.harness.MiniClusterHarness; import org.apache.accumulo.harness.TestingKdc; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; 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 6e0e999d545..bb2dab5596b 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,6 @@ import java.util.Set; import java.util.TreeMap; -import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; @@ -54,6 +53,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; 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 da869dcc041..97648658f20 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,6 @@ import java.time.Duration; import java.util.Map; -import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.ClientProperty; @@ -29,6 +28,7 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; 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 43592dab537..ede16f0aa56 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,6 @@ import java.util.Map; import java.util.Set; -import org.apache.accumulo.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; @@ -50,6 +49,7 @@ import org.apache.accumulo.core.spi.crypto.PerTableCryptoServiceFactory; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.server.log.WalStateManager; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; 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 1009f874ca9..e44065be677 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 @@ -34,7 +34,6 @@ import java.util.Map.Entry; import java.util.Set; -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.AccumuloException; @@ -56,6 +55,7 @@ import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; 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 a0e0f488dc3..eecd6f2345f 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,6 @@ 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.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; @@ -52,6 +50,8 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; +import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; 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 2f42b8391d6..c220e6f1807 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,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; @@ -42,6 +41,7 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; 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 58ecffd218c..b38eced7cb0 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,13 +26,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; 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 65ee4c84fb7..f6b91c3ded0 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 @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Map.Entry; -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.BatchScanner; @@ -45,6 +44,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.UserGroupInformation; import org.junit.jupiter.api.AfterEach; 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 c2251091cfa..dcbc389af0d 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,8 +23,8 @@ import java.time.Duration; -import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.start.TestMain; 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 33b387c93cb..ce1b38e32ec 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,6 @@ import java.io.FileNotFoundException; import java.time.Duration; -import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -41,6 +40,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; From b0aa763ae76302aea8f740ab959a6d2c4745c466 Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Tue, 23 Sep 2025 11:46:30 -0400 Subject: [PATCH 2/9] refactored test.../resources --- .../ci/check-module-package-conventions.sh | 14 +++++----- .../accumulo/test}/v2_import_test/README.md | 0 .../test}/v2_import_test/data/A0000008.rf | Bin .../test}/v2_import_test/data/A0000009.rf | Bin .../test}/v2_import_test/data/A000000a.rf | Bin .../test}/v2_import_test/data/A000000b.rf | Bin .../test/v2_import_test/data/distcp.txt | 24 ++++++++++++++++++ .../v2_import_test/data/exportMetadata.zip | Bin .../resources/v2_import_test/data/distcp.txt | 5 ---- 9 files changed, 31 insertions(+), 12 deletions(-) rename test/src/main/resources/{ => org/apache/accumulo/test}/v2_import_test/README.md (100%) rename test/src/main/resources/{ => org/apache/accumulo/test}/v2_import_test/data/A0000008.rf (100%) rename test/src/main/resources/{ => org/apache/accumulo/test}/v2_import_test/data/A0000009.rf (100%) rename test/src/main/resources/{ => org/apache/accumulo/test}/v2_import_test/data/A000000a.rf (100%) rename test/src/main/resources/{ => org/apache/accumulo/test}/v2_import_test/data/A000000b.rf (100%) create mode 100644 test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/distcp.txt rename test/src/main/resources/{ => org/apache/accumulo/test}/v2_import_test/data/exportMetadata.zip (100%) delete mode 100644 test/src/main/resources/v2_import_test/data/distcp.txt diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 10c7ad56fb0..40fee175c35 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -65,13 +65,13 @@ ALLOWED=( 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 +# 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 # 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 diff --git a/test/src/main/resources/v2_import_test/README.md b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/README.md similarity index 100% rename from test/src/main/resources/v2_import_test/README.md rename to test/src/main/resources/org/apache/accumulo/test/v2_import_test/README.md diff --git a/test/src/main/resources/v2_import_test/data/A0000008.rf b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A0000008.rf similarity index 100% rename from test/src/main/resources/v2_import_test/data/A0000008.rf rename to test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A0000008.rf diff --git a/test/src/main/resources/v2_import_test/data/A0000009.rf b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A0000009.rf similarity index 100% rename from test/src/main/resources/v2_import_test/data/A0000009.rf rename to test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A0000009.rf diff --git a/test/src/main/resources/v2_import_test/data/A000000a.rf b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A000000a.rf similarity index 100% rename from test/src/main/resources/v2_import_test/data/A000000a.rf rename to test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A000000a.rf diff --git a/test/src/main/resources/v2_import_test/data/A000000b.rf b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A000000b.rf similarity index 100% rename from test/src/main/resources/v2_import_test/data/A000000b.rf rename to test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/A000000b.rf diff --git a/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/distcp.txt b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/distcp.txt new file mode 100644 index 00000000000..c07955431fb --- /dev/null +++ b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/distcp.txt @@ -0,0 +1,24 @@ +==== + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +==== + +hdfs://localhost:8020/accumulo/tables/1/default_tablet/A000000b.rf +hdfs://localhost:8020/accumulo/tables/1/t-0000002/A000000a.rf +hdfs://localhost:8020/accumulo/tables/1/t-0000001/A0000009.rf +hdfs://localhost:8020/accumulo/tables/1/t-0000003/A0000008.rf +hdfs://localhost:8020/accumulo/export_test/exportMetadata.zip diff --git a/test/src/main/resources/v2_import_test/data/exportMetadata.zip b/test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/exportMetadata.zip similarity index 100% rename from test/src/main/resources/v2_import_test/data/exportMetadata.zip rename to test/src/main/resources/org/apache/accumulo/test/v2_import_test/data/exportMetadata.zip diff --git a/test/src/main/resources/v2_import_test/data/distcp.txt b/test/src/main/resources/v2_import_test/data/distcp.txt deleted file mode 100644 index 672c11fba8f..00000000000 --- a/test/src/main/resources/v2_import_test/data/distcp.txt +++ /dev/null @@ -1,5 +0,0 @@ -hdfs://localhost:8020/accumulo/tables/1/default_tablet/A000000b.rf -hdfs://localhost:8020/accumulo/tables/1/t-0000002/A000000a.rf -hdfs://localhost:8020/accumulo/tables/1/t-0000001/A0000009.rf -hdfs://localhost:8020/accumulo/tables/1/t-0000003/A0000008.rf -hdfs://localhost:8020/accumulo/export_test/exportMetadata.zip From 07564a0bbf9c325c014704c5536766efb39b1f55 Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Wed, 24 Sep 2025 14:50:15 -0400 Subject: [PATCH 3/9] reverted changes to cluster --- .../cluster/AccumuloCluster.java | 2 +- .../cluster/ClusterControl.java | 2 +- .../cluster/ClusterUser.java | 2 +- .../cluster/ClusterUsers.java | 2 +- .../cluster/RemoteShell.java | 2 +- .../cluster/RemoteShellOptions.java | 2 +- .../standalone/StandaloneAccumuloCluster.java | 6 +++--- .../standalone/StandaloneClusterControl.java | 8 ++++---- .../MiniAccumuloClusterControl.java | 2 +- .../MiniAccumuloClusterImpl.java | 2 +- .../StandaloneAccumuloClusterTest.java | 2 +- .../StandaloneClusterControlTest.java | 2 +- .../ci/check-module-package-conventions.sh | 20 +++++++++---------- .../harness/AccumuloClusterHarness.java | 10 +++++----- .../accumulo/harness/MiniClusterHarness.java | 2 +- .../harness/SharedMiniClusterBase.java | 4 ++-- .../apache/accumulo/harness/TestingKdc.java | 2 +- .../AccumuloMiniClusterConfiguration.java | 2 +- ...tandaloneAccumuloClusterConfiguration.java | 2 +- .../accumulo/test/ConditionalWriterIT.java | 2 +- .../apache/accumulo/test/ImportExportIT.java | 2 +- .../test/NamespacesIT_SimpleSuite.java | 2 +- .../test/RecoveryCompactionsAreFlushesIT.java | 2 +- .../org/apache/accumulo/test/UsersIT.java | 2 +- .../test/conf/ResourceGroupConfigIT.java | 2 +- .../test/functional/AccumuloClientIT.java | 2 +- .../functional/CloneTestIT_SimpleSuite.java | 2 +- .../test/functional/CredentialsIT.java | 2 +- .../accumulo/test/functional/DeleteIT.java | 2 +- .../test/functional/FunctionalTestUtils.java | 2 +- .../accumulo/test/functional/KerberosIT.java | 2 +- .../test/functional/KerberosRenewalIT.java | 2 +- .../test/functional/LocalityGroupIT.java | 2 +- .../test/functional/ManagerFailoverIT.java | 2 +- .../test/functional/PerTableCryptoIT.java | 2 +- .../test/functional/PermissionsIT.java | 2 +- .../accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../accumulo/test/functional/RestartIT.java | 2 +- .../test/functional/RestartStressIT.java | 2 +- .../test/functional/ScanIteratorIT.java | 2 +- .../accumulo/test/functional/StartIT.java | 2 +- .../accumulo/test/functional/TableIT.java | 2 +- 42 files changed, 62 insertions(+), 62 deletions(-) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/AccumuloCluster.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/ClusterControl.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/ClusterUser.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/ClusterUsers.java (96%) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/RemoteShell.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/RemoteShellOptions.java (98%) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/standalone/StandaloneAccumuloCluster.java (97%) rename minicluster/src/main/java/org/apache/accumulo/{miniclusterImpl => }/cluster/standalone/StandaloneClusterControl.java (97%) rename minicluster/src/test/java/org/apache/accumulo/{miniclusterImpl => }/cluster/standalone/StandaloneAccumuloClusterTest.java (96%) rename minicluster/src/test/java/org/apache/accumulo/{miniclusterImpl => }/cluster/standalone/StandaloneClusterControlTest.java (96%) diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/AccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/AccumuloCluster.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java index 36b02530bab..dcdc8a03048 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/AccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/AccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster; +package org.apache.accumulo.cluster; import java.util.Properties; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterControl.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java index 9fa8aa5f60c..a1e14cfc39d 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster; +package org.apache.accumulo.cluster; import java.io.IOException; import java.util.Map.Entry; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUser.java b/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUser.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java index 484e2bd09e8..2b7e5426cd6 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUser.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster; +package org.apache.accumulo.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/miniclusterImpl/cluster/ClusterUsers.java b/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java similarity index 96% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUsers.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java index 76a6a7f5b18..b92f68f6aca 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/ClusterUsers.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/ClusterUsers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster; +package org.apache.accumulo.cluster; import org.apache.accumulo.core.security.SystemPermission; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShell.java b/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShell.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java index 1b348dd45f1..0b6c9190d0e 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShell.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShell.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster; +package org.apache.accumulo.cluster; import static java.util.Objects.requireNonNull; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShellOptions.java b/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java similarity index 98% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShellOptions.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java index ec5cd22e51e..79f2ba9eabb 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/RemoteShellOptions.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/RemoteShellOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster; +package org.apache.accumulo.cluster; import java.io.BufferedReader; import java.io.IOException; diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java similarity index 97% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloCluster.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java index 548536cbb24..d12409f5072 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster.standalone; +package org.apache.accumulo.cluster.standalone; import static com.google.common.base.Preconditions.checkArgument; @@ -29,6 +29,8 @@ 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; @@ -38,8 +40,6 @@ 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.miniclusterImpl.cluster.AccumuloCluster; -import org.apache.accumulo.miniclusterImpl.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/miniclusterImpl/cluster/standalone/StandaloneClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java similarity index 97% rename from minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControl.java rename to minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java index e5f3afc5578..55834c48663 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControl.java +++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster.standalone; +package org.apache.accumulo.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.miniclusterImpl.cluster.ClusterControl; -import org.apache.accumulo.miniclusterImpl.cluster.RemoteShell; -import org.apache.accumulo.miniclusterImpl.cluster.RemoteShellOptions; import org.apache.accumulo.server.util.Admin; 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 a45ffda5753..fc6762d7306 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.data.ResourceGroupId; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; import org.apache.accumulo.server.util.Admin; 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 4ba08308419..2f278f74e7f 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java @@ -60,6 +60,7 @@ 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.AccumuloException; @@ -103,7 +104,6 @@ import org.apache.accumulo.manager.state.SetGoalState; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.ServerType; -import org.apache.accumulo.miniclusterImpl.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/miniclusterImpl/cluster/standalone/StandaloneAccumuloClusterTest.java b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java similarity index 96% rename from minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloClusterTest.java rename to minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java index 4dc0f902e6b..97511c7c369 100644 --- a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneAccumuloClusterTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloClusterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster.standalone; +package org.apache.accumulo.cluster.standalone; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; import org.apache.accumulo.minicluster.ServerType; diff --git a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControlTest.java b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java similarity index 96% rename from minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControlTest.java rename to minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java index 97407b56af9..72e56dd64f2 100644 --- a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/cluster/standalone/StandaloneClusterControlTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControlTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.miniclusterImpl.cluster.standalone; +package org.apache.accumulo.cluster.standalone; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 40fee175c35..dac75099f83 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -74,16 +74,16 @@ ALLOWED=( # 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 + 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/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java index c4e11ea4b7e..047d9562ab9 100644 --- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java @@ -26,6 +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.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.SecurityOperations; @@ -37,11 +42,6 @@ import org.apache.accumulo.harness.conf.AccumuloClusterPropertyConfiguration; import org.apache.accumulo.harness.conf.StandaloneAccumuloClusterConfiguration; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUsers; -import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.server.ServerContext; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java b/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java index 03b50e62323..670aaba303f 100644 --- a/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.UUID; +import org.apache.accumulo.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; @@ -39,7 +40,6 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.server.security.handler.KerberosAuthenticator; import org.apache.accumulo.server.security.handler.KerberosAuthorizor; import org.apache.accumulo.server.security.handler.KerberosPermissionHandler; diff --git a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java index 2b948811722..b1d90ce7f91 100644 --- a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java +++ b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java @@ -32,6 +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.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; @@ -46,8 +48,6 @@ import org.apache.accumulo.core.clientImpl.Namespace; import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUsers; import org.apache.accumulo.test.suites.SimpleSharedMacTestSuiteIT; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; diff --git a/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java b/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java index 6ccf9b80488..2b76541444d 100644 --- a/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java +++ b/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Properties; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; +import org.apache.accumulo.cluster.ClusterUser; import org.apache.hadoop.minikdc.MiniKdc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java index d2916d434e2..dabe07b8071 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java @@ -21,13 +21,13 @@ import java.io.IOException; import java.util.Map; +import org.apache.accumulo.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; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; import org.apache.accumulo.harness.MiniClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.security.UserGroupInformation; diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java index b6f3beaa43c..2130403f30b 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java @@ -28,13 +28,13 @@ import java.util.Map; import java.util.Map.Entry; +import org.apache.accumulo.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; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.clientImpl.ClientInfo; import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; 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 a65fa8a2f3d..e1244cae6f9 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -50,6 +50,7 @@ import java.util.function.Function; import java.util.stream.Collectors; +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.AccumuloException; @@ -95,7 +96,6 @@ import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.test.constraints.AlphaNumKeyConstraint; import org.apache.accumulo.test.functional.BadIterator; import org.apache.accumulo.test.functional.SlowIterator; 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 84cabf1d404..e35bece0f2c 100644 --- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java @@ -42,6 +42,7 @@ import java.util.Set; import java.util.SortedSet; +import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -66,7 +67,6 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; -import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.test.util.FileMetadataUtil; import org.apache.commons.io.FileUtils; import org.apache.hadoop.fs.FSDataInputStream; 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 09f64f00e20..6dbc831195b 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,6 +40,7 @@ import java.util.SortedSet; import java.util.TreeSet; +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.AccumuloException; @@ -78,7 +79,6 @@ import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.tables.TableNameUtil; import org.apache.accumulo.harness.SharedMiniClusterBase; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.test.constraints.NumericValueConstraint; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.io.Text; 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 2f4d3a766cc..c7b2c4ade35 100644 --- a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java @@ -23,6 +23,7 @@ import java.time.Duration; import java.util.Map.Entry; +import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; @@ -37,7 +38,6 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.Test; 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 4b4c842f20b..298c47354c8 100644 --- a/test/src/main/java/org/apache/accumulo/test/UsersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/UsersIT.java @@ -24,6 +24,7 @@ import java.util.Set; +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.AccumuloSecurityException; @@ -31,7 +32,6 @@ import org.apache.accumulo.core.client.security.SecurityErrorCode; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.junit.jupiter.api.Test; public class UsersIT extends AccumuloClusterHarness { 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 bf14eb74158..513e78a4b81 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,6 +33,7 @@ import java.util.TreeMap; import java.util.function.Consumer; +import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -58,7 +59,6 @@ import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; import org.apache.accumulo.test.util.Wait; 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 445a25d993b..9556f650258 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,6 +27,7 @@ import java.util.Properties; import java.util.Set; +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.BatchWriter; @@ -40,7 +41,6 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; 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 dce054aa0e2..909802641fc 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,6 +39,7 @@ import java.util.TreeSet; import java.util.regex.Pattern; +import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -69,7 +70,6 @@ import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; -import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; 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 f7a8556f7c8..e0ae33b3d4f 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,6 +29,7 @@ import java.util.Properties; import java.util.Set; +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.AccumuloException; @@ -42,7 +43,6 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.security.UserGroupInformation; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; 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 939574dbe8d..ced58c0dec9 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,10 +22,10 @@ import java.time.Duration; +import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestRandomDeletes; import org.apache.accumulo.test.VerifyIngest; 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 ba29ebaf3bc..deba28adf2d 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 @@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.clientImpl.ClientContext; @@ -66,7 +67,6 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.TestIngest; import org.apache.commons.io.IOUtils; 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 9b28da537e6..fa06da9336f 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,6 +38,7 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; +import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -70,7 +71,6 @@ import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.minikdc.MiniKdc; 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 6839a8509dd..bf74c91166f 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,6 +26,7 @@ import java.util.Map; import java.util.Map.Entry; +import org.apache.accumulo.cluster.ClusterUser; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.Scanner; @@ -43,7 +44,6 @@ import org.apache.accumulo.harness.MiniClusterHarness; import org.apache.accumulo.harness.TestingKdc; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; 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 bb2dab5596b..6e0e999d545 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,6 +37,7 @@ import java.util.Set; import java.util.TreeMap; +import org.apache.accumulo.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchScanner; @@ -53,7 +54,6 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; 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 97648658f20..da869dcc041 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,6 +21,7 @@ import java.time.Duration; import java.util.Map; +import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.ClientProperty; @@ -28,7 +29,6 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; 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 ede16f0aa56..43592dab537 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,6 +35,7 @@ import java.util.Map; import java.util.Set; +import org.apache.accumulo.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; @@ -49,7 +50,6 @@ import org.apache.accumulo.core.spi.crypto.PerTableCryptoServiceFactory; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.server.log.WalStateManager; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; 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 e44065be677..1009f874ca9 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 @@ -34,6 +34,7 @@ import java.util.Map.Entry; import java.util.Set; +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.AccumuloException; @@ -55,7 +56,6 @@ import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; 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 eecd6f2345f..a0e0f488dc3 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,6 +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.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; @@ -50,8 +52,6 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; -import org.apache.accumulo.miniclusterImpl.cluster.standalone.StandaloneAccumuloCluster; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; 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 c220e6f1807..2f42b8391d6 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,6 +29,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.ClientContext; @@ -41,7 +42,6 @@ import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; 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 b38eced7cb0..58ecffd218c 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,13 +26,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; 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 f6b91c3ded0..65ee4c84fb7 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 @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Map.Entry; +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.BatchScanner; @@ -44,7 +45,6 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterUser; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.UserGroupInformation; import org.junit.jupiter.api.AfterEach; 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 dcbc389af0d..c2251091cfa 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,8 +23,8 @@ import java.time.Duration; +import org.apache.accumulo.cluster.ClusterControl; import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.miniclusterImpl.cluster.ClusterControl; import org.apache.accumulo.start.TestMain; 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 ce1b38e32ec..33b387c93cb 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,6 +27,7 @@ import java.io.FileNotFoundException; import java.time.Duration; +import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; @@ -40,7 +41,6 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; -import org.apache.accumulo.miniclusterImpl.cluster.AccumuloCluster; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; From b90d1804d6282d6ab37b208c386cb0de34f669df Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Wed, 24 Sep 2025 17:33:32 -0400 Subject: [PATCH 4/9] moved server resource files --- .../550e8400-e29b-41d4-a716-446655440000 | Bin .../apache/accumulo/tserver}/walog-from-15.walog | Bin .../apache/accumulo/tserver}/walog-from-16.walog | Bin .../apache/accumulo/tserver}/walog-from-20.walog | Bin 4 files changed, 0 insertions(+), 0 deletions(-) rename server/tserver/src/test/resources/{ => org/apache/accumulo/tserver}/walog-from-14/550e8400-e29b-41d4-a716-446655440000 (100%) rename server/tserver/src/test/resources/{ => org/apache/accumulo/tserver}/walog-from-15.walog (100%) rename server/tserver/src/test/resources/{ => org/apache/accumulo/tserver}/walog-from-16.walog (100%) rename server/tserver/src/test/resources/{ => org/apache/accumulo/tserver}/walog-from-20.walog (100%) diff --git a/server/tserver/src/test/resources/walog-from-14/550e8400-e29b-41d4-a716-446655440000 b/server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-14/550e8400-e29b-41d4-a716-446655440000 similarity index 100% rename from server/tserver/src/test/resources/walog-from-14/550e8400-e29b-41d4-a716-446655440000 rename to server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-14/550e8400-e29b-41d4-a716-446655440000 diff --git a/server/tserver/src/test/resources/walog-from-15.walog b/server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-15.walog similarity index 100% rename from server/tserver/src/test/resources/walog-from-15.walog rename to server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-15.walog diff --git a/server/tserver/src/test/resources/walog-from-16.walog b/server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-16.walog similarity index 100% rename from server/tserver/src/test/resources/walog-from-16.walog rename to server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-16.walog diff --git a/server/tserver/src/test/resources/walog-from-20.walog b/server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-20.walog similarity index 100% rename from server/tserver/src/test/resources/walog-from-20.walog rename to server/tserver/src/test/resources/org/apache/accumulo/tserver/walog-from-20.walog From fe14fb7f769a82d6b495e870fdb6cbd3df44c13e Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Wed, 24 Sep 2025 17:33:37 -0400 Subject: [PATCH 5/9] moved server resource files --- src/build/ci/check-module-package-conventions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index dac75099f83..60c781d776c 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -61,10 +61,10 @@ ALLOWED=( 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 +# 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 From 285ac14d5f5e6a0d79448826af2f72bffd28b08a Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Wed, 24 Sep 2025 18:34:20 -0400 Subject: [PATCH 6/9] moved core resource files --- .../classloader/ContextClassLoaderFactoryTest.java | 5 +++-- .../tokens/CredentialProviderTokenTest.java | 3 ++- .../accumulo/core/clientImpl/ClientContextTest.java | 2 +- .../core/conf/HadoopCredentialProviderTest.java | 4 ++-- .../accumulo/core/conf/SiteConfigurationTest.java | 6 ++++-- .../{ => org/apache/accumulo/core}/accumulo.jceks | Bin .../apache/accumulo/core}/accumulo2.properties | 0 .../{ => org/apache/accumulo/core}/empty.jceks | Bin .../{ => org/apache/accumulo/core}/passwords.jceks | Bin .../{ => org/apache/accumulo/core}/site-cfg.jceks | Bin src/build/ci/check-module-package-conventions.sh | 10 +++++----- 11 files changed, 17 insertions(+), 13 deletions(-) rename core/src/test/resources/{ => org/apache/accumulo/core}/accumulo.jceks (100%) rename core/src/test/resources/{ => org/apache/accumulo/core}/accumulo2.properties (100%) rename core/src/test/resources/{ => org/apache/accumulo/core}/empty.jceks (100%) rename core/src/test/resources/{ => org/apache/accumulo/core}/passwords.jceks (100%) rename core/src/test/resources/{ => org/apache/accumulo/core}/site-cfg.jceks (100%) diff --git a/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java b/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java index 352e7ce5d4a..440d6ca72b4 100644 --- a/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java +++ b/core/src/test/java/org/apache/accumulo/core/classloader/ContextClassLoaderFactoryTest.java @@ -63,9 +63,10 @@ public void setup() throws Exception { if (!Files.isDirectory(folder2)) { Files.createDirectories(folder2); } - Path propsFile2 = folder2.resolve("accumulo2.properties"); + Path propsFile2 = folder2.resolve("org/apache/accumulo/core/accumulo2.properties"); FileUtils.copyURLToFile( - Objects.requireNonNull(this.getClass().getResource("/accumulo2.properties")), + Objects.requireNonNull( + this.getClass().getResource("/org/apache/accumulo/core/accumulo2.properties")), propsFile2.toFile()); uri2 = propsFile2.toUri().toURL(); diff --git a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java index d00f3dbe7fc..dfd59c67f62 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java @@ -51,7 +51,8 @@ public class CredentialProviderTokenTest { justification = "keystoreUrl location isn't provided by user input") @BeforeAll public static void setup() throws Exception { - URL keystoreUrl = CredentialProviderTokenTest.class.getResource("/passwords.jceks"); + URL keystoreUrl = + CredentialProviderTokenTest.class.getResource("/org/apache/accumulo/core/passwords.jceks"); assertNotNull(keystoreUrl); keystorePath = "jceks://file/" + Path.of(keystoreUrl.toURI()).toAbsolutePath(); } diff --git a/core/src/test/java/org/apache/accumulo/core/clientImpl/ClientContextTest.java b/core/src/test/java/org/apache/accumulo/core/clientImpl/ClientContextTest.java index 5452da6c7ca..b9000b43d67 100644 --- a/core/src/test/java/org/apache/accumulo/core/clientImpl/ClientContextTest.java +++ b/core/src/test/java/org/apache/accumulo/core/clientImpl/ClientContextTest.java @@ -44,7 +44,7 @@ public class ClientContextTest { - private static final String keystoreName = "/site-cfg.jceks"; + private static final String keystoreName = "/org/apache/accumulo/core/site-cfg.jceks"; // site-cfg.jceks={'ignored.property'=>'ignored', 'instance.secret'=>'mysecret', // 'general.rpc.timeout'=>'timeout'} diff --git a/core/src/test/java/org/apache/accumulo/core/conf/HadoopCredentialProviderTest.java b/core/src/test/java/org/apache/accumulo/core/conf/HadoopCredentialProviderTest.java index 85b3f3738ac..1607bddc044 100644 --- a/core/src/test/java/org/apache/accumulo/core/conf/HadoopCredentialProviderTest.java +++ b/core/src/test/java/org/apache/accumulo/core/conf/HadoopCredentialProviderTest.java @@ -51,8 +51,8 @@ public class HadoopCredentialProviderTest { private static final Configuration hadoopConf = new Configuration(); - private static final String populatedKeyStoreName = "/accumulo.jceks"; - private static final String emptyKeyStoreName = "/empty.jceks"; + private static final String populatedKeyStoreName = "/org/apache/accumulo/core/accumulo.jceks"; + private static final String emptyKeyStoreName = "/org/apache/accumulo/core/empty.jceks"; private static File emptyKeyStore; private static File populatedKeyStore; diff --git a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java index 6afafc87120..e97c8a1615a 100644 --- a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java +++ b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java @@ -39,7 +39,8 @@ public class SiteConfigurationTest { @Test public void testOnlySensitivePropertiesExtractedFromCredentialProvider() throws SecurityException { - URL keystore = SiteConfigurationTest.class.getResource("/site-cfg.jceks"); + URL keystore = + SiteConfigurationTest.class.getResource("/org/apache/accumulo/core/site-cfg.jceks"); assertNotNull(keystore); String credProvPath = "jceks://file" + Path.of(keystore.getFile()).toAbsolutePath(); @@ -68,7 +69,8 @@ public void testDefault() { @Test public void testFile() { System.setProperty("DIR", "/tmp/test/dir"); - URL propsUrl = getClass().getClassLoader().getResource("accumulo2.properties"); + URL propsUrl = + getClass().getClassLoader().getResource("org/apache/accumulo/core/accumulo2.properties"); var conf = new SiteConfiguration.Builder().fromUrl(propsUrl).build(); assertEquals("myhost123:2181", conf.get(Property.INSTANCE_ZK_HOST)); assertEquals("mysecret", conf.get(Property.INSTANCE_SECRET)); diff --git a/core/src/test/resources/accumulo.jceks b/core/src/test/resources/org/apache/accumulo/core/accumulo.jceks similarity index 100% rename from core/src/test/resources/accumulo.jceks rename to core/src/test/resources/org/apache/accumulo/core/accumulo.jceks diff --git a/core/src/test/resources/accumulo2.properties b/core/src/test/resources/org/apache/accumulo/core/accumulo2.properties similarity index 100% rename from core/src/test/resources/accumulo2.properties rename to core/src/test/resources/org/apache/accumulo/core/accumulo2.properties diff --git a/core/src/test/resources/empty.jceks b/core/src/test/resources/org/apache/accumulo/core/empty.jceks similarity index 100% rename from core/src/test/resources/empty.jceks rename to core/src/test/resources/org/apache/accumulo/core/empty.jceks diff --git a/core/src/test/resources/passwords.jceks b/core/src/test/resources/org/apache/accumulo/core/passwords.jceks similarity index 100% rename from core/src/test/resources/passwords.jceks rename to core/src/test/resources/org/apache/accumulo/core/passwords.jceks diff --git a/core/src/test/resources/site-cfg.jceks b/core/src/test/resources/org/apache/accumulo/core/site-cfg.jceks similarity index 100% rename from core/src/test/resources/site-cfg.jceks rename to core/src/test/resources/org/apache/accumulo/core/site-cfg.jceks diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 60c781d776c..896574e6c3a 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -55,11 +55,11 @@ ALLOWED=( test/src/main/java/org/apache/accumulo/harness/TestingKdc.java # 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 +# 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 From 5b24f87a4f3b9021a367a007d30622f9502ba3d8 Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Wed, 24 Sep 2025 18:56:56 -0400 Subject: [PATCH 7/9] moved start test files --- src/build/ci/check-module-package-conventions.sh | 10 +++++----- .../apache/accumulo/start}/HelloWorldTemplate | 0 .../java/{test => org/apache/accumulo/start}/Test.java | 2 +- .../{test => org/apache/accumulo/start}/TestTemplate | 0 .../apache/accumulo/test}/log4j2-test.properties | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename start/src/test/java/{test => org/apache/accumulo/start}/HelloWorldTemplate (100%) rename start/src/test/java/{test => org/apache/accumulo/start}/Test.java (96%) rename start/src/test/java/{test => org/apache/accumulo/start}/TestTemplate (100%) rename test/src/main/resources/{ => org/apache/accumulo/test}/log4j2-test.properties (100%) diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 896574e6c3a..191b1922c1a 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -26,7 +26,7 @@ NUM_EXPECTED=0 ALLOWED=( # test module uses main path for ITs, so log4j2-test.properties is okay there - test/src/main/resources/log4j2-test.properties +# test/src/main/resources/log4j2-test.properties # special exceptions for the main assembly resources; these can be at the root assemble/src/main/resources/LICENSE @@ -38,9 +38,9 @@ ALLOWED=( server/native/src/main/resources/NOTICE # TODO: these test classes should be moved into the correct package for the module - start/src/test/java/test/HelloWorldTemplate - start/src/test/java/test/TestTemplate - start/src/test/java/test/Test.java +# start/src/test/java/test/HelloWorldTemplate +# start/src/test/java/test/TestTemplate +# start/src/test/java/test/Test.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterConfiguration.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java @@ -60,7 +60,6 @@ ALLOWED=( # 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 @@ -74,6 +73,7 @@ ALLOWED=( # 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/test/resources/FooFilter.jar 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 diff --git a/start/src/test/java/test/HelloWorldTemplate b/start/src/test/java/org/apache/accumulo/start/HelloWorldTemplate similarity index 100% rename from start/src/test/java/test/HelloWorldTemplate rename to start/src/test/java/org/apache/accumulo/start/HelloWorldTemplate diff --git a/start/src/test/java/test/Test.java b/start/src/test/java/org/apache/accumulo/start/Test.java similarity index 96% rename from start/src/test/java/test/Test.java rename to start/src/test/java/org/apache/accumulo/start/Test.java index 3c2b196c15f..0b215003b4f 100644 --- a/start/src/test/java/test/Test.java +++ b/start/src/test/java/org/apache/accumulo/start/Test.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package test; +package org.apache.accumulo.start; public interface Test { diff --git a/start/src/test/java/test/TestTemplate b/start/src/test/java/org/apache/accumulo/start/TestTemplate similarity index 100% rename from start/src/test/java/test/TestTemplate rename to start/src/test/java/org/apache/accumulo/start/TestTemplate diff --git a/test/src/main/resources/log4j2-test.properties b/test/src/main/resources/org/apache/accumulo/test/log4j2-test.properties similarity index 100% rename from test/src/main/resources/log4j2-test.properties rename to test/src/main/resources/org/apache/accumulo/test/log4j2-test.properties From baf6e9d50f3d0a0015618062857fe7e8f84db827 Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Wed, 24 Sep 2025 19:01:34 -0400 Subject: [PATCH 8/9] Revert "moved start test files" This reverts commit 5b24f87a4f3b9021a367a007d30622f9502ba3d8. --- src/build/ci/check-module-package-conventions.sh | 10 +++++----- .../apache/accumulo/start => test}/HelloWorldTemplate | 0 .../java/{org/apache/accumulo/start => test}/Test.java | 2 +- .../{org/apache/accumulo/start => test}/TestTemplate | 0 .../apache/accumulo/test => }/log4j2-test.properties | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename start/src/test/java/{org/apache/accumulo/start => test}/HelloWorldTemplate (100%) rename start/src/test/java/{org/apache/accumulo/start => test}/Test.java (96%) rename start/src/test/java/{org/apache/accumulo/start => test}/TestTemplate (100%) rename test/src/main/resources/{org/apache/accumulo/test => }/log4j2-test.properties (100%) diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 191b1922c1a..896574e6c3a 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -26,7 +26,7 @@ NUM_EXPECTED=0 ALLOWED=( # test module uses main path for ITs, so log4j2-test.properties is okay there -# test/src/main/resources/log4j2-test.properties + test/src/main/resources/log4j2-test.properties # special exceptions for the main assembly resources; these can be at the root assemble/src/main/resources/LICENSE @@ -38,9 +38,9 @@ ALLOWED=( server/native/src/main/resources/NOTICE # TODO: these test classes should be moved into the correct package for the module -# start/src/test/java/test/HelloWorldTemplate -# start/src/test/java/test/TestTemplate -# start/src/test/java/test/Test.java + start/src/test/java/test/HelloWorldTemplate + start/src/test/java/test/TestTemplate + start/src/test/java/test/Test.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterConfiguration.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java @@ -60,6 +60,7 @@ ALLOWED=( # 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 @@ -73,7 +74,6 @@ ALLOWED=( # 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/test/resources/FooFilter.jar 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 diff --git a/start/src/test/java/org/apache/accumulo/start/HelloWorldTemplate b/start/src/test/java/test/HelloWorldTemplate similarity index 100% rename from start/src/test/java/org/apache/accumulo/start/HelloWorldTemplate rename to start/src/test/java/test/HelloWorldTemplate diff --git a/start/src/test/java/org/apache/accumulo/start/Test.java b/start/src/test/java/test/Test.java similarity index 96% rename from start/src/test/java/org/apache/accumulo/start/Test.java rename to start/src/test/java/test/Test.java index 0b215003b4f..3c2b196c15f 100644 --- a/start/src/test/java/org/apache/accumulo/start/Test.java +++ b/start/src/test/java/test/Test.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.start; +package test; public interface Test { diff --git a/start/src/test/java/org/apache/accumulo/start/TestTemplate b/start/src/test/java/test/TestTemplate similarity index 100% rename from start/src/test/java/org/apache/accumulo/start/TestTemplate rename to start/src/test/java/test/TestTemplate diff --git a/test/src/main/resources/org/apache/accumulo/test/log4j2-test.properties b/test/src/main/resources/log4j2-test.properties similarity index 100% rename from test/src/main/resources/org/apache/accumulo/test/log4j2-test.properties rename to test/src/main/resources/log4j2-test.properties From 177bcfeb8624014d1b7307d2be844da202aecfe4 Mon Sep 17 00:00:00 2001 From: arbaazkhan1 Date: Wed, 24 Sep 2025 19:08:45 -0400 Subject: [PATCH 9/9] fixed misplaced file --- src/build/ci/check-module-package-conventions.sh | 6 +++--- .../{test => org/apache/accumulo/start}/HelloWorldTemplate | 0 .../test/java/{test => org/apache/accumulo/start}/Test.java | 2 +- .../java/{test => org/apache/accumulo/start}/TestTemplate | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename start/src/test/java/{test => org/apache/accumulo/start}/HelloWorldTemplate (100%) rename start/src/test/java/{test => org/apache/accumulo/start}/Test.java (96%) rename start/src/test/java/{test => org/apache/accumulo/start}/TestTemplate (100%) diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 896574e6c3a..26a8b64075e 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -38,9 +38,9 @@ ALLOWED=( server/native/src/main/resources/NOTICE # TODO: these test classes should be moved into the correct package for the module - start/src/test/java/test/HelloWorldTemplate - start/src/test/java/test/TestTemplate - start/src/test/java/test/Test.java +# start/src/test/java/test/HelloWorldTemplate +# start/src/test/java/test/TestTemplate +# start/src/test/java/test/Test.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterConfiguration.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java diff --git a/start/src/test/java/test/HelloWorldTemplate b/start/src/test/java/org/apache/accumulo/start/HelloWorldTemplate similarity index 100% rename from start/src/test/java/test/HelloWorldTemplate rename to start/src/test/java/org/apache/accumulo/start/HelloWorldTemplate diff --git a/start/src/test/java/test/Test.java b/start/src/test/java/org/apache/accumulo/start/Test.java similarity index 96% rename from start/src/test/java/test/Test.java rename to start/src/test/java/org/apache/accumulo/start/Test.java index 3c2b196c15f..0b215003b4f 100644 --- a/start/src/test/java/test/Test.java +++ b/start/src/test/java/org/apache/accumulo/start/Test.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package test; +package org.apache.accumulo.start; public interface Test { diff --git a/start/src/test/java/test/TestTemplate b/start/src/test/java/org/apache/accumulo/start/TestTemplate similarity index 100% rename from start/src/test/java/test/TestTemplate rename to start/src/test/java/org/apache/accumulo/start/TestTemplate