Skip to content

Commit

Permalink
Merge branch '2.6.x' into 2.7.x
Browse files Browse the repository at this point in the history 
Closes gh-31503
  • Loading branch information
@philwebb
philwebb committed Jun 23, 2022
2 parents d64f601 + 9e98f69 commit 28775c2
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 32 deletions.
50 changes: 32 additions & 18 deletions ...ain/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
View file
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.time.Duration;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -63,13 +64,23 @@
* @author Eddú Meléndez
* @author Stephane Nicoll
* @author Steffen F. Qvistgaard
* @author Ittay Stern
* @since 1.3.0
*/
@AutoConfiguration
@ConditionalOnClass({ CqlSession.class })
@EnableConfigurationProperties(CassandraProperties.class)
public class CassandraAutoConfiguration {

private static final Config SPRING_BOOT_DEFAULTS;
static {
CassandraDriverOptions options = new CassandraDriverOptions();
options.add(DefaultDriverOption.CONTACT_POINTS, Collections.singletonList("127.0.0.1:9042"));
options.add(DefaultDriverOption.PROTOCOL_COMPRESSION, "none");
options.add(DefaultDriverOption.CONTROL_CONNECTION_TIMEOUT, (int) Duration.ofSeconds(5).toMillis());
SPRING_BOOT_DEFAULTS = options.build();
}

@Bean
@ConditionalOnMissingBean
@Lazy
Expand Down Expand Up @@ -118,44 +129,43 @@ public DriverConfigLoader cassandraDriverConfigLoader(CassandraProperties proper
}

private Config cassandraConfiguration(CassandraProperties properties) {
Config config = mapConfig(properties);
Resource configFile = properties.getConfig();
return (configFile != null) ? applyDefaultFallback(config.withFallback(loadConfig(configFile)))
: applyDefaultFallback(config);
}

private Config applyDefaultFallback(Config config) {
ConfigFactory.invalidateCaches();
return ConfigFactory.defaultOverrides().withFallback(config).withFallback(ConfigFactory.defaultReference())
.resolve();
Config config = ConfigFactory.defaultOverrides();
config = config.withFallback(mapConfig(properties));
if (properties.getConfig() != null) {
config = config.withFallback(loadConfig(properties.getConfig()));
}
config = config.withFallback(SPRING_BOOT_DEFAULTS);
config = config.withFallback(ConfigFactory.defaultReference());
return config.resolve();
}

private Config loadConfig(Resource config) {
private Config loadConfig(Resource resource) {
try {
return ConfigFactory.parseURL(config.getURL());
return ConfigFactory.parseURL(resource.getURL());
}
catch (IOException ex) {
throw new IllegalStateException("Failed to load cassandra configuration from " + config, ex);
throw new IllegalStateException("Failed to load cassandra configuration from " + resource, ex);
}
}

private Config mapConfig(CassandraProperties properties) {
CassandraDriverOptions options = new CassandraDriverOptions();
PropertyMapper map = PropertyMapper.get();
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
map.from(properties.getSessionName()).whenHasText()
.to((sessionName) -> options.add(DefaultDriverOption.SESSION_NAME, sessionName));
map.from(properties::getUsername).whenNonNull()
map.from(properties::getUsername)
.to((username) -> options.add(DefaultDriverOption.AUTH_PROVIDER_USER_NAME, username)
.add(DefaultDriverOption.AUTH_PROVIDER_PASSWORD, properties.getPassword()));
map.from(properties::getCompression).whenNonNull()
map.from(properties::getCompression)
.to((compression) -> options.add(DefaultDriverOption.PROTOCOL_COMPRESSION, compression));
mapConnectionOptions(properties, options);
mapPoolingOptions(properties, options);
mapRequestOptions(properties, options);
mapControlConnectionOptions(properties, options);
map.from(mapContactPoints(properties))
.to((contactPoints) -> options.add(DefaultDriverOption.CONTACT_POINTS, contactPoints));
map.from(properties.getLocalDatacenter()).to(
map.from(properties.getLocalDatacenter()).whenHasText().to(
(localDatacenter) -> options.add(DefaultDriverOption.LOAD_BALANCING_LOCAL_DATACENTER, localDatacenter));
return options.build();
}
Expand Down Expand Up @@ -210,8 +220,12 @@ private void mapControlConnectionOptions(CassandraProperties properties, Cassand
}

private List<String> mapContactPoints(CassandraProperties properties) {
return properties.getContactPoints().stream()
.map((candidate) -> formatContactPoint(candidate, properties.getPort())).collect(Collectors.toList());
if (properties.getContactPoints() != null) {
return properties.getContactPoints().stream()
.map((candidate) -> formatContactPoint(candidate, properties.getPort()))
.collect(Collectors.toList());
}
return null;
}

private String formatContactPoint(String candidate, int port) {
Expand Down
28 changes: 15 additions & 13 deletions ...e/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java
View file
Expand Up @@ -17,8 +17,6 @@
package org.springframework.boot.autoconfigure.cassandra;

import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import com.datastax.oss.driver.api.core.DefaultConsistencyLevel;
Expand Down Expand Up @@ -57,7 +55,7 @@ public class CassandraProperties {
* Cluster node addresses in the form 'host:port', or a simple 'host' to use the
* configured port.
*/
private final List<String> contactPoints = new ArrayList<>(Collections.singleton("127.0.0.1:9042"));
private List<String> contactPoints;

/**
* Port to use if a contact point does not specify one.
Expand All @@ -83,7 +81,7 @@ public class CassandraProperties {
/**
* Compression supported by the Cassandra binary protocol.
*/
private Compression compression = Compression.NONE;
private Compression compression;

/**
* Schema action to take at startup.
Expand Down Expand Up @@ -143,6 +141,10 @@ public List<String> getContactPoints() {
return this.contactPoints;
}

public void setContactPoints(List<String> contactPoints) {
this.contactPoints = contactPoints;
}

public int getPort() {
return this.port;
}
Expand Down Expand Up @@ -266,7 +268,7 @@ public static class Request {
/**
* How many rows will be retrieved simultaneously in a single network round-trip.
*/
private int pageSize;
private Integer pageSize;

private final Throttler throttler = new Throttler();

Expand Down Expand Up @@ -294,7 +296,7 @@ public void setSerialConsistency(DefaultConsistencyLevel serialConsistency) {
this.serialConsistency = serialConsistency;
}

public int getPageSize() {
public Integer getPageSize() {
return this.pageSize;
}

Expand Down Expand Up @@ -347,7 +349,7 @@ public static class Controlconnection {
/**
* Timeout to use for control queries.
*/
private Duration timeout = Duration.ofSeconds(5);
private Duration timeout;

public Duration getTimeout() {
return this.timeout;
Expand All @@ -370,17 +372,17 @@ public static class Throttler {
* Maximum number of requests that can be enqueued when the throttling threshold
* is exceeded.
*/
private int maxQueueSize;
private Integer maxQueueSize;

/**
* Maximum number of requests that are allowed to execute in parallel.
*/
private int maxConcurrentRequests;
private Integer maxConcurrentRequests;

/**
* Maximum allowed request rate.
*/
private int maxRequestsPerSecond;
private Integer maxRequestsPerSecond;

/**
* How often the throttler attempts to dequeue requests. Set this high enough that
Expand All @@ -397,23 +399,23 @@ public void setType(ThrottlerType type) {
this.type = type;
}

public int getMaxQueueSize() {
public Integer getMaxQueueSize() {
return this.maxQueueSize;
}

public void setMaxQueueSize(int maxQueueSize) {
this.maxQueueSize = maxQueueSize;
}

public int getMaxConcurrentRequests() {
public Integer getMaxConcurrentRequests() {
return this.maxConcurrentRequests;
}

public void setMaxConcurrentRequests(int maxConcurrentRequests) {
this.maxConcurrentRequests = maxConcurrentRequests;
}

public int getMaxRequestsPerSecond() {
public Integer getMaxRequestsPerSecond() {
return this.maxRequestsPerSecond;
}

Expand Down
4 changes: 4 additions & 0 deletions ...t-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file
Expand Up @@ -544,6 +544,10 @@
"name": "spring.data.cassandra.connection.init-query-timeout",
"defaultValue": "5s"
},
{
"name": "spring.data.cassandra.controlconnection.timeout",
"defaultValue": "5s"
},
{
"name": "spring.data.cassandra.contact-points",
"defaultValue": [
Expand Down
26 changes: 25 additions & 1 deletion ...ava/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,6 +17,7 @@
package org.springframework.boot.autoconfigure.cassandra;

import java.time.Duration;
import java.util.Collections;

import com.datastax.oss.driver.api.core.CqlIdentifier;
import com.datastax.oss.driver.api.core.CqlSession;
Expand All @@ -43,6 +44,7 @@
*
* @author Eddú Meléndez
* @author Stephane Nicoll
* @author Ittay Stern
*/
class CassandraAutoConfigurationTests {

Expand Down Expand Up @@ -244,6 +246,28 @@ void driverConfigLoaderWithConfigComplementSettings() {
});
}

@Test // gh-31238
void driverConfigLoaderWithConfigOverridesDefaults() {
String configLocation = "org/springframework/boot/autoconfigure/cassandra/override-defaults.conf";
this.contextRunner.withPropertyValues("spring.data.cassandra.config=" + configLocation).run((context) -> {
DriverExecutionProfile actual = context.getBean(DriverConfigLoader.class).getInitialConfig()
.getDefaultProfile();
assertThat(actual.getString(DefaultDriverOption.SESSION_NAME)).isEqualTo("advanced session");
assertThat(actual.getDuration(DefaultDriverOption.REQUEST_TIMEOUT)).isEqualTo(Duration.ofSeconds(2));
assertThat(actual.getStringList(DefaultDriverOption.CONTACT_POINTS))
.isEqualTo(Collections.singletonList("1.2.3.4:5678"));
assertThat(actual.getBoolean(DefaultDriverOption.RESOLVE_CONTACT_POINTS)).isFalse();
assertThat(actual.getInt(DefaultDriverOption.REQUEST_PAGE_SIZE)).isEqualTo(11);
assertThat(actual.getString(DefaultDriverOption.LOAD_BALANCING_LOCAL_DATACENTER)).isEqualTo("datacenter1");
assertThat(actual.getInt(DefaultDriverOption.REQUEST_THROTTLER_MAX_CONCURRENT_REQUESTS)).isEqualTo(22);
assertThat(actual.getInt(DefaultDriverOption.REQUEST_THROTTLER_MAX_REQUESTS_PER_SECOND)).isEqualTo(33);
assertThat(actual.getInt(DefaultDriverOption.REQUEST_THROTTLER_MAX_QUEUE_SIZE)).isEqualTo(44);
assertThat(actual.getDuration(DefaultDriverOption.CONTROL_CONNECTION_TIMEOUT))
.isEqualTo(Duration.ofMillis(5555));
assertThat(actual.getString(DefaultDriverOption.PROTOCOL_COMPRESSION)).isEqualTo("SNAPPY");
});
}

@Test
void driverConfigLoaderWithConfigCreateProfiles() {
String configLocation = "org/springframework/boot/autoconfigure/cassandra/profiles.conf";
Expand Down
20 changes: 20 additions & 0 deletions ...rc/test/resources/org/springframework/boot/autoconfigure/cassandra/override-defaults.conf
View file
@@ -0,0 +1,20 @@
datastax-java-driver {
basic {
session-name = advanced session
load-balancing-policy {
local-datacenter = datacenter1
}
request.page-size = 11
contact-points = [ "1.2.3.4:5678" ]
}
advanced {
throttler {
max-concurrent-requests = 22
max-requests-per-second = 33
max-queue-size = 44
}
control-connection.timeout = 5555
protocol.compression = SNAPPY
resolve-contact-points = false
}
}

0 comments on commit 28775c2

Please sign in to comment.