Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FMWK-357 Fix setting hosts in configuration #719

Merged
merged 4 commits into from
Mar 19, 2024
Merged

FMWK-357 Fix setting hosts in configuration #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdb325c
update dependencies and version number
agrgr Mar 18, 2024
7b931ac
Merge remote-tracking branch 'origin/main'
agrgr Mar 18, 2024
3998b50
Merge remote-tracking branch 'origin/main'
agrgr Mar 18, 2024
5fddc8d
support setting hosts both via methods and application.properties
agrgr Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...ain/java/org/springframework/data/aerospike/config/AerospikeDataConfigurationSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,18 @@ protected AerospikeSettings aerospikeSettings(AerospikeDataSettings dataSettings
// values set via configureDataSettings() have precedence over the parameters from application.properties
configureDataSettings(dataSettings);

// getHosts() return value has precedence over hosts parameter from application.properties
// getHosts() has precedence over hosts parameter from application.properties
Collection<Host> hosts;
if ((hosts = getHosts()) != null) {
connectionSettings.setHostsArray(hosts.toArray(new Host[0]));
} else if (!StringUtils.hasText(connectionSettings.getHosts())) {
} else if (StringUtils.hasText(connectionSettings.getHosts())) {
connectionSettings.setHostsArray(Host.parseHosts(connectionSettings.getHosts(), getDefaultPort()));
} else {
throw new IllegalStateException("No hosts found, please set hosts parameter in application.properties or " +
"override getHosts() method");
}
connectionSettings.setHostsArray(Host.parseHosts(connectionSettings.getHosts(), getDefaultPort()));

// nameSpace() return value has precedence over namespace parameter from application.properties
// nameSpace() has precedence over namespace parameter from application.properties
String namespace;
if ((namespace = nameSpace()) != null) connectionSettings.setNamespace(namespace);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/springframework/data/aerospike/convert/AerospikeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface AerospikeConverter extends AerospikeReader<Object>, AerospikeWr
/**
* Key that identifies POJO's class.
*/
public static final String CLASS_KEY = "@_class";
String CLASS_KEY = "@_class";

/**
* Access Aerospike-specific conversion service.
Expand Down
Loading