Skip to content

Commit ff395d0

Browse files
olim7tolim7t
committed
Rename CoreWriteType to DefaultWriteType
1 parent 51a09ac commit ff395d0

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎core/src/main/java/com/datastax/oss/driver/api/core/retry/DefaultRetryPolicy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.datastax.oss.driver.api.core.connection.HeartbeatException;
2121
import com.datastax.oss.driver.api.core.context.DriverContext;
2222
import com.datastax.oss.driver.api.core.servererrors.CoordinatorException;
23-
import com.datastax.oss.driver.api.core.servererrors.CoreWriteType;
23+
import com.datastax.oss.driver.api.core.servererrors.DefaultWriteType;
2424
import com.datastax.oss.driver.api.core.servererrors.ReadFailureException;
2525
import com.datastax.oss.driver.api.core.servererrors.WriteFailureException;
2626
import com.datastax.oss.driver.api.core.servererrors.WriteType;
@@ -84,7 +84,7 @@ public RetryDecision onWriteTimeout(
8484
int received,
8585
int retryCount) {
8686

87-
return (retryCount == 0 && writeType == CoreWriteType.BATCH_LOG)
87+
return (retryCount == 0 && writeType == DefaultWriteType.BATCH_LOG)
8888
? RetryDecision.RETRY_SAME
8989
: RetryDecision.RETHROW;
9090
}

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/CoreWriteType.java renamed to core/src/main/java/com/datastax/oss/driver/api/core/servererrors/DefaultWriteType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.datastax.oss.driver.api.core.servererrors;
1717

1818
/** A default write type supported by the driver out of the box. */
19-
public enum CoreWriteType implements WriteType {
19+
public enum DefaultWriteType implements WriteType {
2020

2121
/** A write to a single partition key. Such writes are guaranteed to be atomic and isolated. */
2222
SIMPLE,

‎core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*
2424
* <p>The only reason to model this as an interface (as opposed to an enum type) is to accommodate
2525
* for custom protocol extensions. If you're connecting to a standard Apache Cassandra cluster, all
26-
* {@code WriteType}s are {@link CoreWriteType} instances.
26+
* {@code WriteType}s are {@link DefaultWriteType} instances.
2727
*/
2828
public interface WriteType {
2929

‎core/src/main/java/com/datastax/oss/driver/internal/core/servererrors/DefaultWriteTypeRegistry.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
*/
1616
package com.datastax.oss.driver.internal.core.servererrors;
1717

18-
import com.datastax.oss.driver.api.core.servererrors.CoreWriteType;
18+
import com.datastax.oss.driver.api.core.servererrors.DefaultWriteType;
1919
import com.datastax.oss.driver.api.core.servererrors.WriteType;
2020
import com.google.common.collect.ImmutableList;
2121

2222
public class DefaultWriteTypeRegistry implements WriteTypeRegistry {
2323

2424
private static final ImmutableList<WriteType> values =
25-
ImmutableList.<WriteType>builder().add(CoreWriteType.values()).build();
25+
ImmutableList.<WriteType>builder().add(DefaultWriteType.values()).build();
2626

2727
@Override
2828
public WriteType fromName(String name) {
29-
return CoreWriteType.valueOf(name);
29+
return DefaultWriteType.valueOf(name);
3030
}
3131

3232
@Override

‎core/src/test/java/com/datastax/oss/driver/api/core/retry/DefaultRetryPolicyTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import static com.datastax.oss.driver.api.core.retry.RetryDecision.RETHROW;
2020
import static com.datastax.oss.driver.api.core.retry.RetryDecision.RETRY_NEXT;
2121
import static com.datastax.oss.driver.api.core.retry.RetryDecision.RETRY_SAME;
22-
import static com.datastax.oss.driver.api.core.servererrors.CoreWriteType.BATCH_LOG;
23-
import static com.datastax.oss.driver.api.core.servererrors.CoreWriteType.SIMPLE;
22+
import static com.datastax.oss.driver.api.core.servererrors.DefaultWriteType.BATCH_LOG;
23+
import static com.datastax.oss.driver.api.core.servererrors.DefaultWriteType.SIMPLE;
2424

2525
import com.datastax.oss.driver.api.core.connection.ClosedConnectionException;
2626
import com.datastax.oss.driver.api.core.connection.HeartbeatException;

‎core/src/test/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandlerRetryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.datastax.oss.driver.api.core.retry.RetryDecision;
3434
import com.datastax.oss.driver.api.core.retry.RetryPolicy;
3535
import com.datastax.oss.driver.api.core.servererrors.BootstrappingException;
36-
import com.datastax.oss.driver.api.core.servererrors.CoreWriteType;
36+
import com.datastax.oss.driver.api.core.servererrors.DefaultWriteType;
3737
import com.datastax.oss.driver.api.core.servererrors.InvalidQueryException;
3838
import com.datastax.oss.driver.api.core.servererrors.ReadTimeoutException;
3939
import com.datastax.oss.driver.api.core.servererrors.ServerError;
@@ -402,7 +402,7 @@ public void mockRetryPolicyDecision(RetryPolicy policy, RetryDecision decision)
402402
policy.onWriteTimeout(
403403
any(SimpleStatement.class),
404404
eq(DefaultConsistencyLevel.LOCAL_ONE),
405-
eq(CoreWriteType.SIMPLE),
405+
eq(DefaultWriteType.SIMPLE),
406406
eq(2),
407407
eq(1),
408408
eq(0)))

‎integration-tests/src/test/java/com/datastax/oss/driver/api/core/retry/DefaultRetryPolicyIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.datastax.oss.driver.api.core.cql.ResultSet;
3434
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
3535
import com.datastax.oss.driver.api.core.metadata.Node;
36-
import com.datastax.oss.driver.api.core.servererrors.CoreWriteType;
36+
import com.datastax.oss.driver.api.core.servererrors.DefaultWriteType;
3737
import com.datastax.oss.driver.api.core.servererrors.ReadTimeoutException;
3838
import com.datastax.oss.driver.api.core.servererrors.ServerError;
3939
import com.datastax.oss.driver.api.core.servererrors.UnavailableException;
@@ -278,7 +278,7 @@ public void should_retry_on_write_timeout_if_write_type_batch_log() {
278278
assertThat(wte.getConsistencyLevel()).isEqualTo(DefaultConsistencyLevel.LOCAL_QUORUM);
279279
assertThat(wte.getReceived()).isEqualTo(1);
280280
assertThat(wte.getBlockFor()).isEqualTo(3);
281-
assertThat(wte.getWriteType()).isEqualTo(CoreWriteType.BATCH_LOG);
281+
assertThat(wte.getWriteType()).isEqualTo(DefaultWriteType.BATCH_LOG);
282282
}
283283

284284
// there should have been a retry, and it should have been executed on the same host.
@@ -342,7 +342,7 @@ public void should_not_retry_on_write_timeout_if_write_type_batch_log_but_non_id
342342
assertThat(wte.getConsistencyLevel()).isEqualTo(DefaultConsistencyLevel.LOCAL_QUORUM);
343343
assertThat(wte.getReceived()).isEqualTo(1);
344344
assertThat(wte.getBlockFor()).isEqualTo(3);
345-
assertThat(wte.getWriteType()).isEqualTo(CoreWriteType.BATCH_LOG);
345+
assertThat(wte.getWriteType()).isEqualTo(DefaultWriteType.BATCH_LOG);
346346
}
347347

348348
// should not have been retried.

0 commit comments

Comments
 (0)