Skip to content

Commit b061a53

Browse files
committed
Fix based on feedback
1 parent 3a6d1fa commit b061a53

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

core/src/main/java/com/scalar/db/transaction/consensuscommit/RollbackMutationComposer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import static com.scalar.db.transaction.consensuscommit.Attribute.STATE;
66
import static com.scalar.db.transaction.consensuscommit.Attribute.toIdValue;
77
import static com.scalar.db.transaction.consensuscommit.Attribute.toStateValue;
8-
import static com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils.*;
8+
import static com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils.getTransactionTableMetadata;
99

1010
import com.scalar.db.api.ConditionBuilder;
1111
import com.scalar.db.api.ConditionalExpression;

core/src/test/java/com/scalar/db/io/DateColumnTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
5-
import static org.junit.jupiter.api.Assertions.*;
5+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
66

77
import java.time.Clock;
88
import java.time.LocalDate;

core/src/test/java/com/scalar/db/storage/jdbc/RdbEngineOracleTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.scalar.db.storage.jdbc;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.junit.jupiter.api.Assertions.*;
54

65
import com.scalar.db.api.Scan.Ordering.Order;
76
import com.scalar.db.api.TableMetadata;

core/src/test/java/com/scalar/db/transaction/consensuscommit/TwoPhaseConsensusCommitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class TwoPhaseConsensusCommitTest {
6666
public void setUp() throws Exception {
6767
MockitoAnnotations.openMocks(this).close();
6868

69-
// Arrange1
69+
// Arrange
7070
transaction = new TwoPhaseConsensusCommit(crud, commit, mutationOperationChecker);
7171

7272
when(crud.areAllScannersClosed()).thenReturn(true);

core/src/test/java/com/scalar/db/util/groupcommit/GroupCommitterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.scalar.db.util.groupcommit;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.junit.jupiter.api.Assertions.*;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
55
import static org.mockito.ArgumentMatchers.any;
66
import static org.mockito.Mockito.doReturn;
77
import static org.mockito.Mockito.never;

core/src/test/java/com/scalar/db/util/groupcommit/GroupManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.scalar.db.util.groupcommit;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.junit.jupiter.api.Assertions.*;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
55

66
import com.google.common.util.concurrent.Uninterruptibles;
77
import com.scalar.db.util.groupcommit.GroupCommitKeyManipulator.Keys;

data-loader/core/src/test/java/com/scalar/db/dataloader/core/dataimport/dao/ScalarDbDaoTest.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
package com.scalar.db.dataloader.core.dataimport.dao;
22

3-
import static com.scalar.db.dataloader.core.UnitTestUtils.*;
3+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_COLUMN_1_PK;
4+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_COLUMN_2_CK;
5+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_COLUMN_4;
6+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_COLUMN_5;
7+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_COLUMN_6;
8+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_NAMESPACE;
9+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_TABLE_NAME;
10+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_VALUE_INT;
11+
import static com.scalar.db.dataloader.core.UnitTestUtils.TEST_VALUE_LONG;
412
import static org.assertj.core.api.Assertions.assertThat;
513

614
import com.scalar.db.api.Scan;
715
import com.scalar.db.api.ScanBuilder;
816
import com.scalar.db.dataloader.core.ScanRange;
917
import com.scalar.db.io.Key;
10-
import java.util.*;
18+
import java.util.ArrayList;
19+
import java.util.Arrays;
20+
import java.util.List;
1121
import org.junit.jupiter.api.BeforeEach;
1222
import org.junit.jupiter.api.Test;
1323

0 commit comments

Comments
 (0)