Skip to content

Commit 5ae220f

Browse files
olim7tolim7t
committed
Rename CoreDriverOption to DefaultDriverOption
1 parent 991b8b0 commit 5ae220f

70 files changed

Lines changed: 371 additions & 327 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/src/main/java/com/datastax/oss/driver/api/core/auth/PlainTextAuthProvider.java‎

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

18-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
18+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
1919
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2020
import com.datastax.oss.driver.api.core.context.DriverContext;
2121
import com.google.common.base.Charsets;
@@ -52,8 +52,8 @@ public PlainTextAuthProvider(DriverContext context) {
5252

5353
@Override
5454
public Authenticator newAuthenticator(SocketAddress host, String serverAuthenticator) {
55-
String username = config.getString(CoreDriverOption.AUTH_PROVIDER_USER_NAME);
56-
String password = config.getString(CoreDriverOption.AUTH_PROVIDER_PASSWORD);
55+
String username = config.getString(DefaultDriverOption.AUTH_PROVIDER_USER_NAME);
56+
String password = config.getString(DefaultDriverOption.AUTH_PROVIDER_PASSWORD);
5757
return new PlainTextAuthenticator(username, password);
5858
}
5959

core/src/main/java/com/datastax/oss/driver/api/core/config/CoreDriverOption.java renamed to core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* <p>Refer to {@code reference.conf} in the driver codebase for a full description of each option.
2222
*/
23-
public enum CoreDriverOption implements DriverOption {
23+
public enum DefaultDriverOption implements DriverOption {
2424
CONTACT_POINTS("contact-points", false),
2525

2626
PROTOCOL_VERSION("protocol.version", false),
@@ -131,7 +131,7 @@ public enum CoreDriverOption implements DriverOption {
131131
private final String path;
132132
private final boolean required;
133133

134-
CoreDriverOption(String path, boolean required) {
134+
DefaultDriverOption(String path, boolean required) {
135135
this.path = path;
136136
this.required = required;
137137
}

‎core/src/main/java/com/datastax/oss/driver/api/core/connection/ExponentialReconnectionPolicy.java‎

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

18-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
18+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
1919
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2020
import com.datastax.oss.driver.api.core.context.DriverContext;
2121
import com.google.common.base.Preconditions;
@@ -35,24 +35,24 @@ public class ExponentialReconnectionPolicy implements ReconnectionPolicy {
3535
public ExponentialReconnectionPolicy(DriverContext context) {
3636
DriverConfigProfile config = context.config().getDefaultProfile();
3737

38-
this.baseDelayMs = config.getDuration(CoreDriverOption.RECONNECTION_BASE_DELAY).toMillis();
39-
this.maxDelayMs = config.getDuration(CoreDriverOption.RECONNECTION_MAX_DELAY).toMillis();
38+
this.baseDelayMs = config.getDuration(DefaultDriverOption.RECONNECTION_BASE_DELAY).toMillis();
39+
this.maxDelayMs = config.getDuration(DefaultDriverOption.RECONNECTION_MAX_DELAY).toMillis();
4040

4141
Preconditions.checkArgument(
4242
baseDelayMs > 0,
4343
"%s must be strictly positive (got %s)",
44-
CoreDriverOption.RECONNECTION_BASE_DELAY.getPath(),
44+
DefaultDriverOption.RECONNECTION_BASE_DELAY.getPath(),
4545
baseDelayMs);
4646
Preconditions.checkArgument(
4747
maxDelayMs >= 0,
4848
"%s must be positive (got %s)",
49-
CoreDriverOption.RECONNECTION_MAX_DELAY.getPath(),
49+
DefaultDriverOption.RECONNECTION_MAX_DELAY.getPath(),
5050
maxDelayMs);
5151
Preconditions.checkArgument(
5252
maxDelayMs >= baseDelayMs,
5353
"%s must be bigger than %s (got %s, %s)",
54-
CoreDriverOption.RECONNECTION_MAX_DELAY.getPath(),
55-
CoreDriverOption.RECONNECTION_BASE_DELAY.getPath(),
54+
DefaultDriverOption.RECONNECTION_MAX_DELAY.getPath(),
55+
DefaultDriverOption.RECONNECTION_BASE_DELAY.getPath(),
5656
maxDelayMs,
5757
baseDelayMs);
5858

‎core/src/main/java/com/datastax/oss/driver/api/core/cql/ExecutionInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.datastax.oss.driver.api.core.cql;
1717

1818
import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
19-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
19+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
2020
import com.datastax.oss.driver.api.core.metadata.Node;
2121
import com.datastax.oss.driver.api.core.session.Request;
2222
import com.datastax.oss.driver.api.core.session.Session;
@@ -113,8 +113,8 @@ public interface ExecutionInfo {
113113
* <p>Schema agreement is only checked for schema-altering queries. For other query types, this
114114
* method will always return {@code true}.
115115
*
116-
* @see CoreDriverOption#CONTROL_CONNECTION_AGREEMENT_INTERVAL
117-
* @see CoreDriverOption#CONTROL_CONNECTION_AGREEMENT_TIMEOUT
116+
* @see DefaultDriverOption#CONTROL_CONNECTION_AGREEMENT_INTERVAL
117+
* @see DefaultDriverOption#CONTROL_CONNECTION_AGREEMENT_TIMEOUT
118118
*/
119119
boolean isSchemaInAgreement();
120120

‎core/src/main/java/com/datastax/oss/driver/api/core/metadata/Metadata.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.datastax.oss.driver.api.core.metadata;
1717

1818
import com.datastax.oss.driver.api.core.CqlIdentifier;
19-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
19+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
2020
import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
2121
import com.datastax.oss.driver.api.core.session.Session;
2222
import java.net.InetSocketAddress;
@@ -46,9 +46,9 @@ public interface Metadata {
4646
* <p>Note that schema metadata can be disabled or restricted to a subset of keyspaces, therefore
4747
* this map might be empty or incomplete.
4848
*
49-
* @see CoreDriverOption#METADATA_SCHEMA_ENABLED
49+
* @see DefaultDriverOption#METADATA_SCHEMA_ENABLED
5050
* @see Session#setSchemaMetadataEnabled(Boolean)
51-
* @see CoreDriverOption#METADATA_SCHEMA_REFRESHED_KEYSPACES
51+
* @see DefaultDriverOption#METADATA_SCHEMA_REFRESHED_KEYSPACES
5252
*/
5353
Map<CqlIdentifier, KeyspaceMetadata> getKeyspaces();
5454

@@ -62,7 +62,7 @@ default KeyspaceMetadata getKeyspace(CqlIdentifier keyspaceId) {
6262
* <p>Note that this property might be absent if token metadata was disabled, or if there was a
6363
* runtime error while computing the map (this would generate a warning log).
6464
*
65-
* @see CoreDriverOption#METADATA_TOKEN_MAP_ENABLED
65+
* @see DefaultDriverOption#METADATA_TOKEN_MAP_ENABLED
6666
*/
6767
Optional<TokenMap> getTokenMap();
6868
}

‎core/src/main/java/com/datastax/oss/driver/api/core/metadata/TokenMap.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.datastax.oss.driver.api.core.CqlIdentifier;
1919
import com.datastax.oss.driver.api.core.ProtocolVersion;
20-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
20+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
2121
import com.datastax.oss.driver.api.core.metadata.token.Token;
2222
import com.datastax.oss.driver.api.core.metadata.token.TokenRange;
2323
import com.datastax.oss.driver.api.core.session.Session;
@@ -33,9 +33,9 @@
3333
* disabled or restricted to a subset of keyspaces; therefore these methods might return empty
3434
* results for some or all of the keyspaces.
3535
*
36-
* @see CoreDriverOption#METADATA_SCHEMA_ENABLED
36+
* @see DefaultDriverOption#METADATA_SCHEMA_ENABLED
3737
* @see Session#setSchemaMetadataEnabled(Boolean)
38-
* @see CoreDriverOption#METADATA_SCHEMA_REFRESHED_KEYSPACES
38+
* @see DefaultDriverOption#METADATA_SCHEMA_REFRESHED_KEYSPACES
3939
*/
4040
public interface TokenMap {
4141

‎core/src/main/java/com/datastax/oss/driver/api/core/session/Request.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.datastax.oss.driver.api.core.CqlIdentifier;
1919
import com.datastax.oss.driver.api.core.DefaultProtocolVersion;
20-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
20+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
2121
import com.datastax.oss.driver.api.core.config.DriverConfig;
2222
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2323
import com.datastax.oss.driver.api.core.metadata.token.Token;
@@ -128,7 +128,7 @@ public interface Request {
128128
* don't retry if there is the slightest chance that the request reached a coordinator).
129129
*
130130
* @return a boolean value, or {@code null} to use the default value defined in the configuration.
131-
* @see CoreDriverOption#REQUEST_DEFAULT_IDEMPOTENCE
131+
* @see DefaultDriverOption#REQUEST_DEFAULT_IDEMPOTENCE
132132
*/
133133
Boolean isIdempotent();
134134

‎core/src/main/java/com/datastax/oss/driver/api/core/session/Session.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.datastax.oss.driver.api.core.CqlIdentifier;
2121
import com.datastax.oss.driver.api.core.CqlSession;
2222
import com.datastax.oss.driver.api.core.CqlSessionBuilder;
23-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
23+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
2424
import com.datastax.oss.driver.api.core.context.DriverContext;
2525
import com.datastax.oss.driver.api.core.metadata.Metadata;
2626
import com.datastax.oss.driver.api.core.metadata.Node;
@@ -65,7 +65,7 @@ static String getCoreDriverVersion() {
6565
/**
6666
* The unique name identifying this client.
6767
*
68-
* @see CoreDriverOption#SESSION_NAME
68+
* @see DefaultDriverOption#SESSION_NAME
6969
*/
7070
String getName();
7171

@@ -102,7 +102,7 @@ static String getCoreDriverVersion() {
102102
*
103103
* @param newValue a boolean value to enable or disable schema metadata programmatically, or
104104
* {@code null} to use the driver's configuration.
105-
* @see CoreDriverOption#METADATA_SCHEMA_ENABLED
105+
* @see DefaultDriverOption#METADATA_SCHEMA_ENABLED
106106
* @return if this call triggered a refresh, a future that will complete when that refresh is
107107
* complete. Otherwise, a completed future with the current metadata.
108108
*/
@@ -148,8 +148,8 @@ default Metadata refreshSchema() {
148148
*
149149
* @return a future that completes with {@code true} if the nodes agree, or {@code false} if the
150150
* timeout fired.
151-
* @see CoreDriverOption#CONTROL_CONNECTION_AGREEMENT_INTERVAL
152-
* @see CoreDriverOption#CONTROL_CONNECTION_AGREEMENT_TIMEOUT
151+
* @see DefaultDriverOption#CONTROL_CONNECTION_AGREEMENT_INTERVAL
152+
* @see DefaultDriverOption#CONTROL_CONNECTION_AGREEMENT_TIMEOUT
153153
*/
154154
CompletionStage<Boolean> checkSchemaAgreementAsync();
155155

‎core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.datastax.oss.driver.api.core.CqlIdentifier;
1919
import com.datastax.oss.driver.api.core.CqlSession;
20-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
20+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
2121
import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
2222
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2323
import com.datastax.oss.driver.api.core.context.DriverContext;
@@ -75,7 +75,7 @@ public abstract class SessionBuilder<SelfT extends SessionBuilder, SessionT> {
7575
* </ul>
7676
* <li>the resulting configuration is expected to contain a {@code datastax-java-driver}
7777
* section.
78-
* <li>that section is validated against the {@link CoreDriverOption core driver options}.
78+
* <li>that section is validated against the {@link DefaultDriverOption core driver options}.
7979
* </ul>
8080
*
8181
* The core driver JAR includes a {@code reference.conf} file with sensible defaults for all
@@ -172,15 +172,16 @@ protected final CompletionStage<CqlSession> buildDefaultSessionAsync() {
172172

173173
DriverConfigProfile defaultConfig = configLoader.getInitialConfig().getDefaultProfile();
174174
List<String> configContactPoints =
175-
defaultConfig.isDefined(CoreDriverOption.CONTACT_POINTS)
176-
? defaultConfig.getStringList(CoreDriverOption.CONTACT_POINTS)
175+
defaultConfig.isDefined(DefaultDriverOption.CONTACT_POINTS)
176+
? defaultConfig.getStringList(DefaultDriverOption.CONTACT_POINTS)
177177
: Collections.emptyList();
178178

179179
Set<InetSocketAddress> contactPoints =
180180
ContactPoints.merge(programmaticContactPoints, configContactPoints);
181181

182-
if (keyspace == null && defaultConfig.isDefined(CoreDriverOption.SESSION_KEYSPACE)) {
183-
keyspace = CqlIdentifier.fromCql(defaultConfig.getString(CoreDriverOption.SESSION_KEYSPACE));
182+
if (keyspace == null && defaultConfig.isDefined(DefaultDriverOption.SESSION_KEYSPACE)) {
183+
keyspace =
184+
CqlIdentifier.fromCql(defaultConfig.getString(DefaultDriverOption.SESSION_KEYSPACE));
184185
}
185186

186187
return DefaultSession.init(

‎core/src/main/java/com/datastax/oss/driver/api/core/specex/ConstantSpeculativeExecutionPolicy.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.datastax.oss.driver.api.core.specex;
1717

1818
import com.datastax.oss.driver.api.core.CqlIdentifier;
19-
import com.datastax.oss.driver.api.core.config.CoreDriverOption;
19+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
2020
import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
2121
import com.datastax.oss.driver.api.core.context.DriverContext;
2222
import com.datastax.oss.driver.api.core.metadata.Node;
@@ -36,12 +36,12 @@ public class ConstantSpeculativeExecutionPolicy implements SpeculativeExecutionP
3636

3737
public ConstantSpeculativeExecutionPolicy(DriverContext context) {
3838
DriverConfigProfile config = context.config().getDefaultProfile();
39-
this.maxExecutions = config.getInt(CoreDriverOption.SPECULATIVE_EXECUTION_MAX);
39+
this.maxExecutions = config.getInt(DefaultDriverOption.SPECULATIVE_EXECUTION_MAX);
4040
if (this.maxExecutions < 1) {
4141
throw new IllegalArgumentException("Max must be at least 1");
4242
}
4343
this.constantDelayMillis =
44-
config.getDuration(CoreDriverOption.SPECULATIVE_EXECUTION_DELAY).toMillis();
44+
config.getDuration(DefaultDriverOption.SPECULATIVE_EXECUTION_DELAY).toMillis();
4545
if (this.constantDelayMillis < 0) {
4646
throw new IllegalArgumentException("Delay must be positive or 0");
4747
}

0 commit comments

Comments
 (0)