Skip to content

Commit befdd35

Browse files
olim7tolim7t
committed
Rename default config loader
1 parent 4a066b2 commit befdd35

3 files changed

Lines changed: 18 additions & 20 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
2222
import com.datastax.oss.driver.internal.core.ContactPoints;
2323
import com.datastax.oss.driver.internal.core.DefaultCluster;
24-
import com.datastax.oss.driver.internal.core.config.typesafe.PeriodicTypeSafeDriverConfigLoader;
24+
import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader;
2525
import com.datastax.oss.driver.internal.core.context.DefaultDriverContext;
2626
import com.datastax.oss.driver.internal.core.context.InternalDriverContext;
2727
import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation;
@@ -76,7 +76,7 @@ public ClusterBuilder withConfigLoader(DriverConfigLoader configLoader) {
7676
}
7777

7878
private static DriverConfigLoader defaultConfigLoader() {
79-
return new PeriodicTypeSafeDriverConfigLoader();
79+
return new DefaultDriverConfigLoader();
8080
}
8181

8282
/**

core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/PeriodicTypeSafeDriverConfigLoader.java renamed to core/src/main/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoader.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@
3737
import org.slf4j.Logger;
3838
import org.slf4j.LoggerFactory;
3939

40-
/** A loader that reloads the configuration at a configurable interval. */
41-
public class PeriodicTypeSafeDriverConfigLoader implements DriverConfigLoader {
40+
/** The default loader; it is based on TypeSafe Config and reloads at a configurable interval. */
41+
public class DefaultDriverConfigLoader implements DriverConfigLoader {
4242

43-
private static final Logger LOG =
44-
LoggerFactory.getLogger(PeriodicTypeSafeDriverConfigLoader.class);
43+
private static final Logger LOG = LoggerFactory.getLogger(DefaultDriverConfigLoader.class);
4544

4645
public static final Supplier<Config> DEFAULT_CONFIG_SUPPLIER =
4746
() -> {
@@ -58,16 +57,15 @@ public class PeriodicTypeSafeDriverConfigLoader implements DriverConfigLoader {
5857
* Builds a new instance with the default TypeSafe config loading rules (documented in {@link
5958
* ClusterBuilder#withConfigLoader(DriverConfigLoader)}) and the core driver options.
6059
*/
61-
public PeriodicTypeSafeDriverConfigLoader() {
60+
public DefaultDriverConfigLoader() {
6261
this(DEFAULT_CONFIG_SUPPLIER, CoreDriverOption.values());
6362
}
6463

6564
/**
6665
* Builds an instance with custom arguments, if you want to load the configuration from somewhere
6766
* else or have custom options.
6867
*/
69-
public PeriodicTypeSafeDriverConfigLoader(
70-
Supplier<Config> configSupplier, DriverOption[]... options) {
68+
public DefaultDriverConfigLoader(Supplier<Config> configSupplier, DriverOption[]... options) {
7169
this.configSupplier = configSupplier;
7270
this.driverConfig = new TypeSafeDriverConfig(configSupplier.get(), options);
7371
}

core/src/test/java/com/datastax/oss/driver/internal/core/config/typesafe/PeriodicTypeSafeDriverConfigLoaderTest.java renamed to core/src/test/java/com/datastax/oss/driver/internal/core/config/typesafe/DefaultDriverConfigLoaderTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import static com.datastax.oss.driver.Assertions.assertThat;
4040
import static org.mockito.Mockito.never;
4141

42-
public class PeriodicTypeSafeDriverConfigLoaderTest {
42+
public class DefaultDriverConfigLoaderTest {
4343

4444
@Mock private InternalDriverContext context;
4545
@Mock private NettyOptions nettyOptions;
@@ -77,17 +77,17 @@ public void setup() {
7777

7878
@Test
7979
public void should_build_initial_config() {
80-
PeriodicTypeSafeDriverConfigLoader loader =
81-
new PeriodicTypeSafeDriverConfigLoader(
80+
DefaultDriverConfigLoader loader =
81+
new DefaultDriverConfigLoader(
8282
() -> ConfigFactory.parseString(configSource.get()), MockOptions.values());
8383
DriverConfig initialConfig = loader.getInitialConfig();
8484
assertThat(initialConfig).hasIntOption(MockOptions.REQUIRED_INT, 42);
8585
}
8686

8787
@Test
8888
public void should_schedule_reloading_task() {
89-
PeriodicTypeSafeDriverConfigLoader loader =
90-
new PeriodicTypeSafeDriverConfigLoader(
89+
DefaultDriverConfigLoader loader =
90+
new DefaultDriverConfigLoader(
9191
() -> ConfigFactory.parseString(configSource.get()), MockOptions.values());
9292

9393
loader.onDriverInit(context);
@@ -100,8 +100,8 @@ public void should_schedule_reloading_task() {
100100

101101
@Test
102102
public void should_reload_if_config_has_changed() {
103-
PeriodicTypeSafeDriverConfigLoader loader =
104-
new PeriodicTypeSafeDriverConfigLoader(
103+
DefaultDriverConfigLoader loader =
104+
new DefaultDriverConfigLoader(
105105
() -> ConfigFactory.parseString(configSource.get()), MockOptions.values());
106106
DriverConfig initialConfig = loader.getInitialConfig();
107107
assertThat(initialConfig).hasIntOption(MockOptions.REQUIRED_INT, 42);
@@ -121,8 +121,8 @@ public void should_reload_if_config_has_changed() {
121121

122122
@Test
123123
public void should_reload_if_forced() {
124-
PeriodicTypeSafeDriverConfigLoader loader =
125-
new PeriodicTypeSafeDriverConfigLoader(
124+
DefaultDriverConfigLoader loader =
125+
new DefaultDriverConfigLoader(
126126
() -> ConfigFactory.parseString(configSource.get()), MockOptions.values());
127127
DriverConfig initialConfig = loader.getInitialConfig();
128128
assertThat(initialConfig).hasIntOption(MockOptions.REQUIRED_INT, 42);
@@ -141,8 +141,8 @@ public void should_reload_if_forced() {
141141

142142
@Test
143143
public void should_not_notify_if_config_has_not_changed() {
144-
PeriodicTypeSafeDriverConfigLoader loader =
145-
new PeriodicTypeSafeDriverConfigLoader(
144+
DefaultDriverConfigLoader loader =
145+
new DefaultDriverConfigLoader(
146146
() -> ConfigFactory.parseString(configSource.get()), MockOptions.values());
147147
DriverConfig initialConfig = loader.getInitialConfig();
148148
assertThat(initialConfig).hasIntOption(MockOptions.REQUIRED_INT, 42);

0 commit comments

Comments
 (0)