This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cep-15-accord by this push:
new 07207aa26e ninja fix imports failing checkstyle
07207aa26e is described below
commit 07207aa26efd876b3c0f7fd6a3dceb7914f0cb52
Author: Ariel Weisberg <aweisb...@apple.com>
AuthorDate: Mon Aug 19 11:20:22 2024 -0400
ninja fix imports failing checkstyle
---
.../org/apache/cassandra/distributed/test/TestBaseImpl.java | 1 -
.../distributed/test/accord/AccordMigrationRaceTestBase.java | 2 +-
.../apache/cassandra/distributed/test/accord/AccordMigrationTest.java | 2 --
.../distributed/test/accord/AccordTimestampPreservationTest.java | 4 ++--
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java
b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java
index 2d71f94862..c529834204 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java
@@ -67,7 +67,6 @@ import
org.apache.cassandra.distributed.api.IInvokableInstance;
import org.apache.cassandra.distributed.api.NodeToolResult;
import org.apache.cassandra.distributed.shared.DistributedTestBase;
import org.apache.cassandra.service.accord.AccordStateCache;
-import org.assertj.core.api.Fail;
import static java.lang.System.currentTimeMillis;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java
index b17ff97060..e5865ef9d3 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java
@@ -91,7 +91,6 @@ import org.apache.cassandra.utils.concurrent.Promise;
import org.eclipse.jetty.util.ConcurrentHashSet;
import static java.lang.String.format;
-import static junit.framework.TestCase.assertEquals;
import static org.apache.cassandra.Util.expectException;
import static org.apache.cassandra.Util.spinAssertEquals;
import static
org.apache.cassandra.config.CassandraRelevantProperties.HINT_DISPATCH_INTERVAL_MS;
@@ -108,6 +107,7 @@ import static
org.apache.cassandra.distributed.test.accord.AccordMigrationRaceTe
import static org.apache.cassandra.distributed.util.QueryResultUtil.assertThat;
import static
org.apache.cassandra.exceptions.RequestFailureReason.RETRY_ON_DIFFERENT_TRANSACTION_SYSTEM;
import static org.apache.cassandra.utils.Throwables.runUnchecked;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
index 26a5862c2c..7a95f99df2 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.distributed.test.accord;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -62,7 +61,6 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.distributed.api.Feature;
import org.apache.cassandra.distributed.api.ICoordinator;
import org.apache.cassandra.distributed.api.IInvokableInstance;
-import org.apache.cassandra.distributed.api.NodeToolResult;
import org.apache.cassandra.distributed.api.Row;
import org.apache.cassandra.distributed.api.SimpleQueryResult;
import org.apache.cassandra.gms.EndpointState;
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java
index 24223cd467..353c591c6d 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java
@@ -48,11 +48,11 @@ import
org.apache.cassandra.service.consensus.migration.ConsensusKeyMigrationSta
import org.apache.cassandra.service.consensus.migration.ConsensusRequestRouter;
import static java.lang.String.format;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.fail;
import static org.apache.cassandra.Util.spinAssertEquals;
import static
org.apache.cassandra.config.CassandraRelevantProperties.HINT_DISPATCH_INTERVAL_MS;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
/*
* Test that non-transactional updates have their timestamps preserved when
written through Accord so that
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
