spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-09 19:09:03 +00:00
Code Issues Projects Releases Wiki Activity

Improve null-safety of module/spring-boot-cassandra

Browse Source 
See gh-46926
This commit is contained in:
Moritz Halbritter
2025-08-26 14:22:54 +02:00
parent 39a91dda9d
commit 31a9958a06
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfiguration.java
+1 -1
View File
@@ -260,7 +260,7 @@ public final class CassandraAutoConfiguration {
private static final class CassandraDriverOptions {
private final Map<String, String> options = new LinkedHashMap<>();
private final Map<String, @Nullable String> options = new LinkedHashMap<>();
private CassandraDriverOptions add(DriverOption option, @Nullable String value) {
String key = createKeyFor(option);
module/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/docker/compose/CassandraEnvironment.java
+6 -1
View File
@@ -30,7 +30,12 @@ class CassandraEnvironment {
private final String datacenter;
CassandraEnvironment(Map<String, @Nullable String> env) {
this.datacenter = env.getOrDefault("CASSANDRA_DC", env.getOrDefault("CASSANDRA_DATACENTER", "datacenter1"));
this.datacenter = getDatacenter(env);
}
private static String getDatacenter(Map<String, @Nullable String> env) {
String datacenter = env.getOrDefault("CASSANDRA_DC", env.get("CASSANDRA_DATACENTER"));
return (datacenter != null) ? datacenter : "datacenter1";
}
String getDatacenter() {