Bump aerospike-reactor-client from 4.4.10 to 5.1.11 (aerospike-commun…

…ity#95) * Bump aerospike-reactor-client from 4.4.10 to 5.1.11 Bumps [aerospike-reactor-client](https://github.com/aerospike/aerospike-client-java-reactive) from 4.4.10 to 5.1.11. - [Release notes](https://github.com/aerospike/aerospike-client-java-reactive/releases) - [Commits](https://github.com/aerospike/aerospike-client-java-reactive/commits/5.1.11) --- updated-dependencies: - dependency-name: com.aerospike:aerospike-reactor-client dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump spring-data-aerospike to 3.3.1 and aerospike-client to 5.1.11 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anastasiia Smirnova <[email protected]>
RomanCht · Mar 30, 2022 · aef3187 · aef3187
1 parent 2a178bd
commit aef3187
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,9 +39,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
 
-        <spring-data-aerospike.version>2.4.2.RELEASE</spring-data-aerospike.version>
-        <aerospike-reactor-client.version>4.4.10</aerospike-reactor-client.version>
-        <aerospike-client.version>4.4.18</aerospike-client.version>
+        <spring-data-aerospike.version>3.3.1</spring-data-aerospike.version>
+        <aerospike-reactor-client.version>5.1.11</aerospike-reactor-client.version>
+        <aerospike-client.version>5.1.11</aerospike-client.version>
 
         <spring-cloud-starter.version>3.0.0</spring-cloud-starter.version>
     </properties>

diff --git a/...g/springframework/boot/autoconfigure/data/aerospike/AerospikeCommonDataConfiguration.java b/...g/springframework/boot/autoconfigure/data/aerospike/AerospikeCommonDataConfiguration.java
@@ -13,6 +13,7 @@
 import org.springframework.data.aerospike.core.DefaultAerospikeExceptionTranslator;
 import org.springframework.data.aerospike.mapping.AerospikeMappingContext;
 import org.springframework.data.aerospike.mapping.Document;
+import org.springframework.data.aerospike.query.FilterExpressionsBuilder;
 import org.springframework.data.aerospike.query.StatementBuilder;
 import org.springframework.data.aerospike.query.cache.IndexesCache;
 import org.springframework.data.aerospike.query.cache.IndexesCacheHolder;
@@ -24,6 +25,12 @@
 @Configuration(proxyBeanMethods = false)
 class AerospikeCommonDataConfiguration {
 
+    @Bean(name = "aerospikeFilterExpressionsBuilder")
+    @ConditionalOnMissingBean(name = "aerospikeFilterExpressionsBuilder")
+    public FilterExpressionsBuilder aerospikeFilterExpressionsBuilder() {
+        return new FilterExpressionsBuilder();
+    }
+
     @Bean(name = "aerospikeStatementBuilder")
     @ConditionalOnMissingBean(name = "aerospikeStatementBuilder")
     public StatementBuilder aerospikeStatementBuilder(IndexesCache indexesCache) {
@@ -69,7 +76,6 @@ public AerospikeMappingContext aerospikeMappingContext(ApplicationContext applic
         if (fieldNamingStrategy != null) {
             context.setFieldNamingStrategy((FieldNamingStrategy) BeanUtils.instantiateClass(fieldNamingStrategy));
         }
-        context.setDefaultNameSpace(aerospikeDataProperties.getNamespace());
         context.setCreateIndexesOnStartup(aerospikeDataProperties.isCreateIndexesOnStartup());
         return context;
     }

diff --git a/...ava/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataConfiguration.java b/...ava/org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataConfiguration.java
@@ -26,6 +26,7 @@
 import org.springframework.data.aerospike.core.AerospikeTemplate;
 import org.springframework.data.aerospike.index.AerospikePersistenceEntityIndexCreator;
 import org.springframework.data.aerospike.mapping.AerospikeMappingContext;
+import org.springframework.data.aerospike.query.FilterExpressionsBuilder;
 import org.springframework.data.aerospike.query.QueryEngine;
 import org.springframework.data.aerospike.query.StatementBuilder;
 import org.springframework.data.aerospike.query.cache.IndexInfoParser;
@@ -61,12 +62,15 @@ public AerospikeTemplate aerospikeTemplate(AerospikeClient aerospikeClient,
     @ConditionalOnMissingBean(name = "aerospikeQueryEngine")
     public QueryEngine aerospikeQueryEngine(AerospikeClient aerospikeClient,
                                             AerospikeDataProperties aerospikeDataProperties,
+                                            FilterExpressionsBuilder filterExpressionsBuilder,
                                             StatementBuilder statementBuilder) {
-        QueryEngine queryEngine = new QueryEngine(aerospikeClient, statementBuilder, aerospikeClient.getQueryPolicyDefault());
+        QueryEngine queryEngine = new QueryEngine(aerospikeClient, statementBuilder, filterExpressionsBuilder, aerospikeClient.getQueryPolicyDefault());
         queryEngine.setScansEnabled(aerospikeDataProperties.isScansEnabled());
         return queryEngine;
     }
 
+
+
     @Bean(name = "aerospikeIndexRefresher")
     @ConditionalOnMissingBean(name = "aerospikeIndexRefresher")
     public IndexRefresher aerospikeIndexRefresher(AerospikeClient aerospikeClient, IndexesCacheUpdater indexesCacheUpdater) {

diff --git a/...springframework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataConfiguration.java b/...springframework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataConfiguration.java
@@ -26,6 +26,7 @@
 import org.springframework.data.aerospike.core.ReactiveAerospikeTemplate;
 import org.springframework.data.aerospike.index.ReactiveAerospikePersistenceEntityIndexCreator;
 import org.springframework.data.aerospike.mapping.AerospikeMappingContext;
+import org.springframework.data.aerospike.query.FilterExpressionsBuilder;
 import org.springframework.data.aerospike.query.ReactorQueryEngine;
 import org.springframework.data.aerospike.query.StatementBuilder;
 import org.springframework.data.aerospike.query.cache.IndexInfoParser;
@@ -58,8 +59,9 @@ public ReactiveAerospikeTemplate reactiveAerospikeTemplate(MappingAerospikeConve
     @ConditionalOnMissingBean(name = "reactiveAerospikeQueryEngine")
     public ReactorQueryEngine reactiveAerospikeQueryEngine(AerospikeReactorClient aerospikeReactorClient,
                                                            AerospikeDataProperties aerospikeDataProperties,
+                                                           FilterExpressionsBuilder filterExpressionsBuilder,
                                                            StatementBuilder statementBuilder) {
-        ReactorQueryEngine queryEngine = new ReactorQueryEngine(aerospikeReactorClient, statementBuilder, aerospikeReactorClient.getQueryPolicyDefault());
+        ReactorQueryEngine queryEngine = new ReactorQueryEngine(aerospikeReactorClient, statementBuilder, filterExpressionsBuilder, aerospikeReactorClient.getQueryPolicyDefault());
         queryEngine.setScansEnabled(aerospikeDataProperties.isScansEnabled());
         return queryEngine;
     }

diff --git a/...ng-boot-starter-data-aerospike-example/reactive/src/main/resources/application.properties b/...ng-boot-starter-data-aerospike-example/reactive/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 spring.aerospike.hosts=${embedded.aerospike.host}:${embedded.aerospike.port}
+spring.aerospike.write.sendKey=true
 spring.data.aerospike.namespace=${embedded.aerospike.namespace}
 spring.data.aerospike.scans-enabled=true
diff --git a/spring-boot-starter-data-aerospike-example/sync/src/main/resources/application.properties b/spring-boot-starter-data-aerospike-example/sync/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 spring.aerospike.hosts=${embedded.aerospike.host}:${embedded.aerospike.port}
+spring.aerospike.write.sendKey=true
 spring.data.aerospike.namespace=${embedded.aerospike.namespace}
 spring.data.aerospike.scans-enabled=true