Skip to content

Commit ef161ba

Browse files
tomekl007olim7t
authored andcommitted
OptionsMap - refactor settings that are used multiple times to a variable
1 parent 34b1a5c commit ef161ba

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

core/src/main/java/com/datastax/oss/driver/api/core/config/OptionsMap.java

+20-12
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,18 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
243243

244244
protected static void fillWithDriverDefaults(OptionsMap map) {
245245
Duration initQueryTimeout = Duration.ofSeconds(5);
246+
Duration requestTimeout = Duration.ofSeconds(2);
247+
int requestPageSize = 5000;
248+
int continuousMaxPages = 0;
249+
int continuousMaxPagesPerSecond = 0;
250+
int continuousMaxEnqueuedPages = 4;
246251

247252
// Sorted by order of appearance in reference.conf:
248253

249254
// Skip CONFIG_RELOAD_INTERVAL because the map-based config doesn't need periodic reloading
250-
map.put(TypedDriverOption.REQUEST_TIMEOUT, Duration.ofSeconds(2));
255+
map.put(TypedDriverOption.REQUEST_TIMEOUT, requestTimeout);
251256
map.put(TypedDriverOption.REQUEST_CONSISTENCY, "LOCAL_ONE");
252-
map.put(TypedDriverOption.REQUEST_PAGE_SIZE, 5000);
257+
map.put(TypedDriverOption.REQUEST_PAGE_SIZE, requestPageSize);
253258
map.put(TypedDriverOption.REQUEST_SERIAL_CONSISTENCY, "SERIAL");
254259
map.put(TypedDriverOption.REQUEST_DEFAULT_IDEMPOTENCE, false);
255260
map.put(TypedDriverOption.GRAPH_TRAVERSAL_SOURCE, "g");
@@ -287,15 +292,18 @@ protected static void fillWithDriverDefaults(OptionsMap map) {
287292
map.put(TypedDriverOption.REQUEST_TRACE_CONSISTENCY, "ONE");
288293
map.put(TypedDriverOption.REQUEST_LOG_WARNINGS, true);
289294
map.put(TypedDriverOption.GRAPH_PAGING_ENABLED, "AUTO");
290-
map.put(TypedDriverOption.GRAPH_CONTINUOUS_PAGING_PAGE_SIZE, 5000);
291-
map.put(TypedDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_PAGES, 0);
292-
map.put(TypedDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_PAGES_PER_SECOND, 0);
293-
map.put(TypedDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_ENQUEUED_PAGES, 4);
294-
map.put(TypedDriverOption.CONTINUOUS_PAGING_PAGE_SIZE, 5000);
295+
map.put(TypedDriverOption.GRAPH_CONTINUOUS_PAGING_PAGE_SIZE, requestPageSize);
296+
map.put(TypedDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_PAGES, continuousMaxPages);
297+
map.put(
298+
TypedDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_PAGES_PER_SECOND,
299+
continuousMaxPagesPerSecond);
300+
map.put(
301+
TypedDriverOption.GRAPH_CONTINUOUS_PAGING_MAX_ENQUEUED_PAGES, continuousMaxEnqueuedPages);
302+
map.put(TypedDriverOption.CONTINUOUS_PAGING_PAGE_SIZE, requestPageSize);
295303
map.put(TypedDriverOption.CONTINUOUS_PAGING_PAGE_SIZE_BYTES, false);
296-
map.put(TypedDriverOption.CONTINUOUS_PAGING_MAX_PAGES, 0);
297-
map.put(TypedDriverOption.CONTINUOUS_PAGING_MAX_PAGES_PER_SECOND, 0);
298-
map.put(TypedDriverOption.CONTINUOUS_PAGING_MAX_ENQUEUED_PAGES, 4);
304+
map.put(TypedDriverOption.CONTINUOUS_PAGING_MAX_PAGES, continuousMaxPages);
305+
map.put(TypedDriverOption.CONTINUOUS_PAGING_MAX_PAGES_PER_SECOND, continuousMaxPagesPerSecond);
306+
map.put(TypedDriverOption.CONTINUOUS_PAGING_MAX_ENQUEUED_PAGES, continuousMaxEnqueuedPages);
299307
map.put(TypedDriverOption.CONTINUOUS_PAGING_TIMEOUT_FIRST_PAGE, Duration.ofSeconds(2));
300308
map.put(TypedDriverOption.CONTINUOUS_PAGING_TIMEOUT_OTHER_PAGES, Duration.ofSeconds(1));
301309
map.put(TypedDriverOption.MONITOR_REPORTING_ENABLED, true);
@@ -330,8 +338,8 @@ protected static void fillWithDriverDefaults(OptionsMap map) {
330338
map.put(TypedDriverOption.METADATA_TOPOLOGY_WINDOW, Duration.ofSeconds(1));
331339
map.put(TypedDriverOption.METADATA_TOPOLOGY_MAX_EVENTS, 20);
332340
map.put(TypedDriverOption.METADATA_SCHEMA_ENABLED, true);
333-
map.put(TypedDriverOption.METADATA_SCHEMA_REQUEST_TIMEOUT, Duration.ofSeconds(2));
334-
map.put(TypedDriverOption.METADATA_SCHEMA_REQUEST_PAGE_SIZE, 5000);
341+
map.put(TypedDriverOption.METADATA_SCHEMA_REQUEST_TIMEOUT, requestTimeout);
342+
map.put(TypedDriverOption.METADATA_SCHEMA_REQUEST_PAGE_SIZE, requestPageSize);
335343
map.put(TypedDriverOption.METADATA_SCHEMA_WINDOW, Duration.ofSeconds(1));
336344
map.put(TypedDriverOption.METADATA_SCHEMA_MAX_EVENTS, 20);
337345
map.put(TypedDriverOption.METADATA_TOKEN_MAP_ENABLED, true);

0 commit comments

Comments
 (0)