Review Cassandra's timeout options

This commit reviews the current timeout options. It creates a connection
and request sub-namespace to separate concerns a bit more.

Closes gh-19673

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java

@@ -39,6 +39,8 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.cassandra.CassandraProperties.Connection;
+import org.springframework.boot.autoconfigure.cassandra.CassandraProperties.Request;
 import org.springframework.boot.autoconfigure.cassandra.CassandraProperties.Throttler;
 import org.springframework.boot.autoconfigure.cassandra.CassandraProperties.ThrottlerType;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -115,10 +117,9 @@ private Config cassandraConfiguration(CassandraProperties properties) {
 						.add(DefaultDriverOption.AUTH_PROVIDER_PASSWORD, properties.getPassword()));
 		map.from(properties::getCompression).whenNonNull()
 				.to((compression) -> options.add(DefaultDriverOption.PROTOCOL_COMPRESSION, compression));
-		mapQueryOptions(properties, options);
-		mapSocketOptions(properties, options);
+		mapConnectionOptions(properties, options);
 		mapPoolingOptions(properties, options);
-		mapThrottlingOptions(properties, options);
+		mapRequestOptions(properties, options);
 		map.from(mapContactPoints(properties))
 				.to((contactPoints) -> options.add(DefaultDriverOption.CONTACT_POINTS, contactPoints));
 		map.from(properties.getLocalDatacenter()).to(
@@ -128,22 +129,13 @@ private Config cassandraConfiguration(CassandraProperties properties) {
 				.withFallback(ConfigFactory.defaultReference()).resolve();
 	}
 
-	private void mapQueryOptions(CassandraProperties properties, CassandraDriverOptions options) {
-		PropertyMapper map = PropertyMapper.get();
-		map.from(properties::getConsistencyLevel).whenNonNull()
-				.to(((consistency) -> options.add(DefaultDriverOption.REQUEST_CONSISTENCY, consistency)));
-		map.from(properties::getSerialConsistencyLevel).whenNonNull().to(
-				(serialConsistency) -> options.add(DefaultDriverOption.REQUEST_SERIAL_CONSISTENCY, serialConsistency));
-		map.from(properties::getPageSize)
-				.to((pageSize) -> options.add(DefaultDriverOption.REQUEST_PAGE_SIZE, pageSize));
-	}
-
-	private void mapSocketOptions(CassandraProperties properties, CassandraDriverOptions options) {
-		PropertyMapper map = PropertyMapper.get();
-		map.from(properties::getConnectTimeout).whenNonNull().asInt(Duration::toMillis)
-				.to((connectTimeout) -> options.add(DefaultDriverOption.CONNECTION_INIT_QUERY_TIMEOUT, connectTimeout));
-		map.from(properties::getReadTimeout).whenNonNull().asInt(Duration::toMillis)
-				.to((readTimeout) -> options.add(DefaultDriverOption.REQUEST_TIMEOUT, readTimeout));
+	private void mapConnectionOptions(CassandraProperties properties, CassandraDriverOptions options) {
+		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
+		Connection connectionProperties = properties.getConnection();
+		map.from(connectionProperties::getConnectTimeout).asInt(Duration::toMillis)
+				.to((connectTimeout) -> options.add(DefaultDriverOption.CONNECTION_CONNECT_TIMEOUT, connectTimeout));
+		map.from(connectionProperties::getInitQueryTimeout).asInt(Duration::toMillis).to(
+				(initQueryTimeout) -> options.add(DefaultDriverOption.CONNECTION_INIT_QUERY_TIMEOUT, initQueryTimeout));
 	}
 
 	private void mapPoolingOptions(CassandraProperties properties, CassandraDriverOptions options) {
@@ -155,9 +147,18 @@ private void mapPoolingOptions(CassandraProperties properties, CassandraDriverOp
 				.to((heartBeatInterval) -> options.add(DefaultDriverOption.HEARTBEAT_INTERVAL, heartBeatInterval));
 	}
 
-	private void mapThrottlingOptions(CassandraProperties properties, CassandraDriverOptions options) {
+	private void mapRequestOptions(CassandraProperties properties, CassandraDriverOptions options) {
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
-		Throttler throttlerProperties = properties.getThrottler();
+		Request requestProperties = properties.getRequest();
+		map.from(requestProperties::getTimeout).asInt(Duration::toMillis)
+				.to(((timeout) -> options.add(DefaultDriverOption.REQUEST_TIMEOUT, timeout)));
+		map.from(requestProperties::getConsistency)
+				.to(((consistency) -> options.add(DefaultDriverOption.REQUEST_CONSISTENCY, consistency)));
+		map.from(requestProperties::getSerialConsistency).to(
+				(serialConsistency) -> options.add(DefaultDriverOption.REQUEST_SERIAL_CONSISTENCY, serialConsistency));
+		map.from(requestProperties::getPageSize)
+				.to((pageSize) -> options.add(DefaultDriverOption.REQUEST_PAGE_SIZE, pageSize));
+		Throttler throttlerProperties = requestProperties.getThrottler();
 		map.from(throttlerProperties::getType).as(ThrottlerType::type)
 				.to((type) -> options.add(DefaultDriverOption.REQUEST_THROTTLER_CLASS, type));
 		map.from(throttlerProperties::getMaxQueueSize)
@@ -168,7 +169,6 @@ private void mapThrottlingOptions(CassandraProperties properties, CassandraDrive
 				.add(DefaultDriverOption.REQUEST_THROTTLER_MAX_REQUESTS_PER_SECOND, maxRequestsPerSecond));
 		map.from(throttlerProperties::getDrainInterval).asInt(Duration::toMillis).to(
 				(drainInterval) -> options.add(DefaultDriverOption.REQUEST_THROTTLER_DRAIN_INTERVAL, drainInterval));
-
 	}
 
 	private List<String> mapContactPoints(CassandraProperties properties) {