Skip to content

Commit

Permalink
update dependencies and version number
Browse files Browse the repository at this point in the history
  • Loading branch information
agrgr committed May 31, 2024
1 parent 64f325c commit 2188922
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 10 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.2.3</version>
<version>3.3.0</version>
</parent>

<groupId>com.aerospike</groupId>
Expand All @@ -31,7 +31,7 @@
</modules>

<properties>
<revision>0.14.0</revision>
<revision>0.15.0</revision>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand All @@ -40,12 +40,12 @@
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
<flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>

<spring-data-aerospike.version>4.7.1</spring-data-aerospike.version>
<spring-data-aerospike.version>4.8.0</spring-data-aerospike.version>
<aerospike-reactor-client.version>7.1.0</aerospike-reactor-client.version>
<aerospike-client.version>7.2.1</aerospike-client.version>
<embedded-aerospike.version>3.1.5</embedded-aerospike.version>
<embedded-aerospike.version>3.1.6</embedded-aerospike.version>

<spring-cloud-starter.version>4.1.1</spring-cloud-starter.version>
<spring-cloud-starter.version>4.1.2</spring-cloud-starter.version>
</properties>

<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.data.aerospike.config.AerospikeConnectionSettings;
import org.springframework.data.aerospike.config.AerospikeDataSettings;
import org.springframework.data.aerospike.config.AerospikeSettings;
import org.springframework.data.aerospike.convert.AerospikeCustomConversions;
import org.springframework.data.aerospike.convert.AerospikeTypeAliasAccessor;
import org.springframework.data.aerospike.convert.MappingAerospikeConverter;
Expand Down Expand Up @@ -110,6 +111,12 @@ public AerospikeConnectionSettings readAerospikeSettings() {
return new AerospikeConnectionSettings();
}

@Bean
public AerospikeSettings aerospikeSettings(AerospikeDataSettings dataSettings,
AerospikeConnectionSettings connectionSettings) {
return new AerospikeSettings(connectionSettings, dataSettings);
}

private AerospikeDataSettings aerospikeDataSettings(AerospikeDataProperties aerospikeDataProperties,
AerospikeDataSettings dataSettings) {
return configureDataSettings(dataSettings, aerospikeDataProperties);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.aerospike.config.AerospikeDataSettings;
import org.springframework.data.aerospike.config.AerospikeSettings;
import org.springframework.data.aerospike.convert.MappingAerospikeConverter;
import org.springframework.data.aerospike.core.AerospikeExceptionTranslator;
import org.springframework.data.aerospike.core.AerospikeTemplate;
Expand Down Expand Up @@ -71,8 +72,9 @@ public AerospikeTemplate aerospikeTemplate(IAerospikeClient aerospikeClient,
public QueryEngine aerospikeQueryEngine(IAerospikeClient aerospikeClient,
AerospikeDataProperties aerospikeDataProperties,
FilterExpressionsBuilder filterExpressionsBuilder,
StatementBuilder statementBuilder) {
QueryEngine queryEngine = new QueryEngine(aerospikeClient, statementBuilder, filterExpressionsBuilder);
StatementBuilder statementBuilder, AerospikeSettings settings) {
QueryEngine queryEngine = new QueryEngine(aerospikeClient, statementBuilder, filterExpressionsBuilder,
settings.getDataSettings());
queryEngine.setScansEnabled(aerospikeDataProperties.isScansEnabled());
queryEngine.setQueryMaxRecords(aerospikeDataProperties.getQueryMaxRecords());
return queryEngine;
Expand Down Expand Up @@ -118,7 +120,7 @@ private AerospikeDataSettings aerospikeDataSettings(AerospikeDataProperties aero
}

private AerospikeDataSettings configureDataSettings(AerospikeDataSettings dataSettings,
AerospikeDataProperties aerospikeDataProperties) {
AerospikeDataProperties aerospikeDataProperties) {
dataSettings.setScansEnabled(aerospikeDataProperties.isScansEnabled());
dataSettings.setCreateIndexesOnStartup(aerospikeDataProperties.isCreateIndexesOnStartup());
return dataSettings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.aerospike.config.AerospikeSettings;
import org.springframework.data.aerospike.convert.MappingAerospikeConverter;
import org.springframework.data.aerospike.core.AerospikeExceptionTranslator;
import org.springframework.data.aerospike.core.ReactiveAerospikeTemplate;
Expand Down Expand Up @@ -66,9 +67,10 @@ public ReactiveAerospikeTemplate reactiveAerospikeTemplate(MappingAerospikeConve
public ReactorQueryEngine reactiveAerospikeQueryEngine(AerospikeReactorClient aerospikeReactorClient,
AerospikeDataProperties aerospikeDataProperties,
FilterExpressionsBuilder filterExpressionsBuilder,
StatementBuilder statementBuilder) {
StatementBuilder statementBuilder,
AerospikeSettings settings) {
ReactorQueryEngine queryEngine = new ReactorQueryEngine(aerospikeReactorClient, statementBuilder,
filterExpressionsBuilder);
filterExpressionsBuilder, settings.getDataSettings());
queryEngine.setScansEnabled(aerospikeDataProperties.isScansEnabled());
queryEngine.setQueryMaxRecords(aerospikeDataProperties.getQueryMaxRecords());
return queryEngine;
Expand Down

0 comments on commit 2188922

Please sign in to comment.