Values in a spring.data.cassandra.config file can't override some defaults defined in CassandraProperties #31238
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
June 1, 2022 17:04
This commit changes two things: 1. Any primitive on CassandraProperties are replaced with object values. This allows distinguishing between defaults values and no-values. Then CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate to ignore those. 2. CassandraProperties no longer populate default values on any property. With that, the defaults can be applied on top of the file spring.data.cassandra.config; i.e. the config file have higher precedence than the defaults, but lower that any spring.data.cassandra.* property. On the test side, the file `override-defaults.conf` is defined to override the values that were non-overridable with values which are different from the default. Closes spring-projectsgh-31025
port, SSL, schema-action are all not defined in the `spring.data.cassandra.config` file, so we can initialize those on the first configuration layer (default `CassandraProperties` field values). This simplifies the case of port configuration: 1. In case `spring.data.cassandra.contact-points` is configured without a port - the value of `spring.data.cassandra.port` (which defaults to 9042) is used. 2. Otherwise, in case `contact-points` on spring.data.cassandra.config file are defined -- then it must be configured with a port (no separate port property). 3. Otherwise, `contact-points` defaults to `127.0.0.1:9042` regardless of `spring.data.cassandra.port` configuration.
spring-projects-issues
added
the
status: waiting-for-triage
philwebb
added
type: bug
philwebb
changed the title
philwebb
changed the title
philwebb
pushed a commit
that referenced
this pull request
Jun 23, 2022
Update `CassandraAutoConfiguration` so that properties in a `spring.data.cassandra.config` file can override the default values defined in `CassandraProperties`. This commit changes two things: 1. Any primitive on `CassandraProperties` are replaced with object values. This allows distinguishing between defaults values and no-values. Then CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate to ignore those. 2. `CassandraProperties` no longer populate default values on any property. With that, the defaults can be applied on top of the file spring.data.cassandra.config; i.e. the config file have higher precedence than the defaults, but lower that any spring.data.cassandra.* property. See gh-31238
philwebb
added a commit
that referenced
this pull request
Jun 23, 2022
|
Thanks very much for this contribution @ittays, it has now been merged into 2.6.x and forwards. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit changes two things:
Most primitives on
CassandraPropertiesare replaced with object values. This allows distinguishing between default-values and no-values. ThenCassandraAutoConfiguration.mapConfig()can usewhenNonNull()predicate to ignore those.CassandraPropertiesno longer populate default values that are overridable byspring.data.cassandra.configfile. This let the defaults to be applied on top of the filespring.data.cassandra.config; i.e. the config file have higher precedence than the defaults, but lower that anyspring.data.cassandra.*property.On the test side, the file
override-defaults.confis defined to override the values that were non-overridable with values which are different from the default.In this proposal, the
spring.data.cassandra.portconfiguration has a bit rough behaviour:In case property
spring.data.cassandra.contact-pointsis configured without a port - the value ofspring.data.cassandra.port(which defaults to 9042) is used.Otherwise, in case
contact-pointsonspring.data.cassandra.configfile are defined -- then the contact-points must be configured with a port (as the conf file provides no separate port property).Otherwise,
contact-pointsdefaults to127.0.0.1:9042regardless ofspring.data.cassandra.portconfiguration.Closes gh-31025