Skip to content

Commit 8621f56

Browse files
brfrn169brfrn169
committed
Remove deprecated XXXValue classes usages
1 parent 4fad0f6 commit 8621f56

17 files changed

+95
-110
lines changed

‎core/src/test/java/com/scalar/db/api/DeleteTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import com.google.common.collect.ImmutableMap;
77
import com.scalar.db.io.Key;
8-
import com.scalar.db.io.Value;
98
import java.util.Optional;
9+
import org.assertj.core.api.Assertions;
1010
import org.junit.jupiter.api.Test;
1111

1212
public class DeleteTest {
@@ -32,7 +32,7 @@ public void getPartitionKey_ProperKeyGivenInConstructor_ShouldReturnWhatsSet() {
3232
Key actual = del.getPartitionKey();
3333

3434
// Assert
35-
assertThat((Iterable<? extends Value<?>>) expected).isEqualTo(actual);
35+
Assertions.<Key>assertThat(expected).isEqualTo(actual);
3636
}
3737

3838
@Test

‎core/src/test/java/com/scalar/db/api/GetTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import com.google.common.collect.ImmutableMap;
77
import com.scalar.db.io.Key;
8-
import com.scalar.db.io.Value;
98
import java.util.Arrays;
109
import java.util.List;
1110
import java.util.Optional;
11+
import org.assertj.core.api.Assertions;
1212
import org.junit.jupiter.api.Test;
1313

1414
public class GetTest {
@@ -48,7 +48,7 @@ public void getPartitionKey_ProperKeyGivenInConstructor_ShouldReturnWhatsSet() {
4848
Key actual = get.getPartitionKey();
4949

5050
// Assert
51-
assertThat((Iterable<? extends Value<?>>) expected).isEqualTo(actual);
51+
Assertions.<Key>assertThat(expected).isEqualTo(actual);
5252
}
5353

5454
@Test

‎core/src/test/java/com/scalar/db/api/PutTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.util.Arrays;
3737
import java.util.Map;
3838
import java.util.Optional;
39+
import org.assertj.core.api.Assertions;
3940
import org.junit.jupiter.api.Test;
4041

4142
public class PutTest {
@@ -64,7 +65,7 @@ public void getPartitionKey_ProperKeyGivenInConstructor_ShouldReturnWhatsSet() {
6465
Key actual = put.getPartitionKey();
6566

6667
// Assert
67-
assertThat((Iterable<? extends Value<?>>) expected).isEqualTo(actual);
68+
Assertions.<Key>assertThat(expected).isEqualTo(actual);
6869
}
6970

7071
@Test

‎core/src/test/java/com/scalar/db/api/ScanTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import com.google.common.collect.ImmutableMap;
77
import com.scalar.db.api.Selection.Conjunction;
88
import com.scalar.db.io.Key;
9-
import com.scalar.db.io.Value;
109
import java.util.Collections;
1110
import java.util.Optional;
11+
import org.assertj.core.api.Assertions;
1212
import org.junit.jupiter.api.Test;
1313

1414
public class ScanTest {
@@ -96,7 +96,7 @@ public void constructorAndSetters_AllSet_ShouldGetWhatsSet() {
9696
.withLimit(100);
9797

9898
// Assert
99-
assertThat((Iterable<? extends Value<?>>) scan.getPartitionKey()).isEqualTo(partitionKey);
99+
Assertions.<Key>assertThat(scan.getPartitionKey()).isEqualTo(partitionKey);
100100
assertThat(scan.getStartClusteringKey()).isEqualTo(Optional.of(startClusteringKey));
101101
assertThat(scan.getEndClusteringKey()).isEqualTo(Optional.of(endClusteringKey));
102102
assertThat(scan.getProjections()).isEqualTo(Collections.singletonList(ANY_NAME_1));

‎core/src/test/java/com/scalar/db/storage/cassandra/ResultInterpreterTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.scalar.db.api.Result;
99
import com.scalar.db.api.TableMetadata;
1010
import com.scalar.db.io.BigIntColumn;
11-
import com.scalar.db.io.BigIntValue;
1211
import com.scalar.db.io.Column;
1312
import com.scalar.db.io.DataType;
1413
import com.scalar.db.io.DateColumn;
@@ -81,7 +80,7 @@ public void interpret_ShouldReturnWhatsSet() {
8180
when(row.getString(ANY_NAME_2)).thenReturn(ANY_TEXT_2);
8281
when(row.getBool(ANY_COLUMN_NAME_1)).thenReturn(true);
8382
when(row.getInt(ANY_COLUMN_NAME_2)).thenReturn(Integer.MAX_VALUE);
84-
when(row.getLong(ANY_COLUMN_NAME_3)).thenReturn(BigIntValue.MAX_VALUE);
83+
when(row.getLong(ANY_COLUMN_NAME_3)).thenReturn(BigIntColumn.MAX_VALUE);
8584
when(row.getFloat(ANY_COLUMN_NAME_4)).thenReturn(Float.MAX_VALUE);
8685
when(row.getDouble(ANY_COLUMN_NAME_5)).thenReturn(Double.MAX_VALUE);
8786
when(row.getString(ANY_COLUMN_NAME_6)).thenReturn("string");

‎core/src/test/java/com/scalar/db/storage/cosmos/ConditionalQueryBuilderTest.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.scalar.db.api.PutIf;
1111
import com.scalar.db.api.PutIfExists;
1212
import com.scalar.db.api.PutIfNotExists;
13-
import com.scalar.db.io.IntValue;
1413
import org.jooq.Condition;
1514
import org.jooq.SQLDialect;
1615
import org.jooq.SelectConditionStep;
@@ -27,7 +26,6 @@ public class ConditionalQueryBuilderTest {
2726
private static final String ANY_NAME_3 = "name3";
2827
private static final String ANY_NAME_4 = "name4";
2928
private static final int ANY_INT = 1;
30-
private static final IntValue ANY_INT_VALUE = new IntValue("any_int", ANY_INT);
3129

3230
@Mock private SelectConditionStep<org.jooq.Record> select;
3331

@@ -57,9 +55,8 @@ public void getQuery_PutIfAcceptCalled_ShouldReturnQuery() {
5755
SelectConditionStep<org.jooq.Record> testSelect =
5856
DSL.using(SQLDialect.DEFAULT).selectFrom("Record r").where(DSL.field("r.id").eq(ANY_ID));
5957
PutIf condition =
60-
ConditionBuilder.putIf(
61-
ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT_VALUE.getAsInt()))
62-
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT_VALUE.getAsInt()))
58+
ConditionBuilder.putIf(ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT))
59+
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT))
6360
.and(ConditionBuilder.column(ANY_NAME_3).isNullInt())
6461
.and(ConditionBuilder.column(ANY_NAME_4).isNotNullInt())
6562
.build();
@@ -96,9 +93,8 @@ public void getQuery_PutIfAcceptCalled_ShouldReturnQuery() {
9693
public void visit_PutIfAcceptCalled_ShouldCallWhere() {
9794
// Arrange
9895
PutIf condition =
99-
ConditionBuilder.putIf(
100-
ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT_VALUE.get()))
101-
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT_VALUE.get()))
96+
ConditionBuilder.putIf(ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT))
97+
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT))
10298
.build();
10399
ConditionalQueryBuilder builder = new ConditionalQueryBuilder(select);
104100

@@ -140,9 +136,8 @@ public void visit_PutIfNotExistsAcceptCalled_ShouldNotCallWhere() {
140136
public void visit_DeleteIfAcceptCalled_ShouldCallWhere() {
141137
// Arrange
142138
DeleteIf condition =
143-
ConditionBuilder.deleteIf(
144-
ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT_VALUE.get()))
145-
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT_VALUE.get()))
139+
ConditionBuilder.deleteIf(ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT))
140+
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT))
146141
.build();
147142
ConditionalQueryBuilder builder = new ConditionalQueryBuilder(select);
148143

‎core/src/test/java/com/scalar/db/storage/cosmos/CosmosMutationTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.scalar.db.api.Put;
99
import com.scalar.db.api.PutIf;
1010
import com.scalar.db.api.TableMetadata;
11-
import com.scalar.db.io.IntValue;
1211
import com.scalar.db.io.Key;
1312
import java.util.Arrays;
1413
import java.util.Collections;
@@ -30,7 +29,6 @@ public class CosmosMutationTest {
3029
private static final int ANY_INT_1 = 1;
3130
private static final int ANY_INT_2 = 2;
3231
private static final int ANY_INT_3 = 3;
33-
private static final IntValue ANY_INT_VALUE = new IntValue("any_int", ANY_INT_3);
3432

3533
@Mock private TableMetadata metadata;
3634

@@ -203,9 +201,8 @@ public void makeConditionalQuery_MutationWithoutAllClusteringKeyGiven_ShouldRetu
203201
public void makeConditionalQuery_MutationWithConditionsGiven_ShouldReturnQuery() {
204202
// Arrange
205203
PutIf conditions =
206-
ConditionBuilder.putIf(
207-
ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_VALUE.get()))
208-
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_VALUE.get()))
204+
ConditionBuilder.putIf(ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_3))
205+
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_3))
209206
.build();
210207
Put put = Put.newBuilder(preparePut()).condition(conditions).build();
211208
CosmosMutation cosmosMutation = new CosmosMutation(put, metadata);

‎core/src/test/java/com/scalar/db/storage/dynamo/ConditionExpressionBuilderTest.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.scalar.db.api.PutIf;
88
import com.scalar.db.api.PutIfExists;
99
import com.scalar.db.api.PutIfNotExists;
10-
import com.scalar.db.io.IntValue;
1110
import org.junit.jupiter.api.BeforeEach;
1211
import org.junit.jupiter.api.Test;
1312
import org.mockito.MockitoAnnotations;
@@ -18,7 +17,6 @@ public class ConditionExpressionBuilderTest {
1817
private static final String ANY_NAME_3 = "name3";
1918
private static final String ANY_NAME_4 = "name4";
2019
private static final int ANY_INT = 1;
21-
private static final IntValue ANY_INT_VALUE = new IntValue("any_int", ANY_INT);
2220

2321
@BeforeEach
2422
public void setUp() throws Exception {
@@ -43,9 +41,8 @@ public void build_NoConditionsGiven_ShouldReturnEmpty() {
4341
public void build_PutIfAcceptCalled_ShouldReturnCondition() {
4442
// Arrange
4543
PutIf condition =
46-
ConditionBuilder.putIf(
47-
ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT_VALUE.getAsInt()))
48-
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT_VALUE.getAsInt()))
44+
ConditionBuilder.putIf(ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT))
45+
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT))
4946
.and(ConditionBuilder.column(ANY_NAME_3).isNullInt())
5047
.and(ConditionBuilder.column(ANY_NAME_4).isNotNullInt())
5148
.build();
@@ -101,9 +98,8 @@ public void visit_PutIfNotExistsAcceptCalled_ShouldReturnEmpty() {
10198
public void visit_DeleteIfAcceptCalled_ShouldCallWhere() {
10299
// Arrange
103100
DeleteIf condition =
104-
ConditionBuilder.deleteIf(
105-
ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT_VALUE.getAsInt()))
106-
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT_VALUE.getAsInt()))
101+
ConditionBuilder.deleteIf(ConditionBuilder.column(ANY_NAME_1).isEqualToInt(ANY_INT))
102+
.and(ConditionBuilder.column(ANY_NAME_2).isGreaterThanInt(ANY_INT))
107103
.and(ConditionBuilder.column(ANY_NAME_3).isNullInt())
108104
.and(ConditionBuilder.column(ANY_NAME_4).isNotNullInt())
109105
.build();

‎core/src/test/java/com/scalar/db/storage/dynamo/DynamoMutationTest.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.scalar.db.api.Put;
88
import com.scalar.db.api.PutIf;
99
import com.scalar.db.api.TableMetadata;
10-
import com.scalar.db.io.IntValue;
1110
import com.scalar.db.io.Key;
1211
import java.util.Collections;
1312
import java.util.HashMap;
@@ -31,7 +30,6 @@ public class DynamoMutationTest {
3130
private static final int ANY_INT_1 = 1;
3231
private static final int ANY_INT_2 = 2;
3332
private static final int ANY_INT_3 = 3;
34-
private static final IntValue ANY_INT_VALUE = new IntValue("any_int", ANY_INT_3);
3533

3634
@Mock private TableMetadata metadata;
3735

@@ -98,9 +96,8 @@ public void getIfExistsCondition_PutGiven_ShouldReturnCondition() {
9896
public void getCondition_PutGiven_ShouldReturnCondition() {
9997
// Arrange
10098
PutIf conditions =
101-
ConditionBuilder.putIf(
102-
ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_VALUE.get()))
103-
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_VALUE.get()))
99+
ConditionBuilder.putIf(ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_3))
100+
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_3))
104101
.build();
105102
Put put = Put.newBuilder(preparePut()).condition(conditions).build();
106103

@@ -126,9 +123,8 @@ public void getCondition_PutGiven_ShouldReturnCondition() {
126123
public void getConditionColumnMap_PutGiven_ShouldReturnCondition() {
127124
// Arrange
128125
PutIf conditions =
129-
ConditionBuilder.putIf(
130-
ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_VALUE.get()))
131-
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_VALUE.get()))
126+
ConditionBuilder.putIf(ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_3))
127+
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_3))
132128
.build();
133129
Put put = Put.newBuilder(preparePut()).condition(conditions).build();
134130

@@ -172,9 +168,8 @@ public void getUpdateExpression_PutWithIfExistsGiven_ShouldReturnExpression() {
172168
public void getConditionBindMap_PutWithPutIfGiven_ShouldReturnBindMap() {
173169
// Arrange
174170
PutIf conditions =
175-
ConditionBuilder.putIf(
176-
ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_VALUE.get()))
177-
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_VALUE.get()))
171+
ConditionBuilder.putIf(ConditionBuilder.column(ANY_NAME_3).isEqualToInt(ANY_INT_3))
172+
.and(ConditionBuilder.column(ANY_NAME_4).isGreaterThanInt(ANY_INT_3))
178173
.build();
179174
Put put = Put.newBuilder(preparePut()).condition(conditions).build();
180175
Map<String, AttributeValue> expected = new HashMap<>();

0 commit comments

Comments
 (0)