FMWK-454 Update dependencies and version number (#245)

pom.xml

@@ -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>
@@ -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>
@@ -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>

spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeCommonDataConfiguration.java

@@ -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;
@@ -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);

spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataConfiguration.java

@@ -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;
@@ -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;
@@ -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;

spring-boot-autoconfigure-data-aerospike/src/main/java/org/springframework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataConfiguration.java

@@ -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;
@@ -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;