update configuration

aerospike-community · Sep 25, 2024 · 13a2f22 · 13a2f22
1 parent 6be772c
commit 13a2f22
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 42 deletions.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/aerospike/AerospikeAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/aerospike/AerospikeAutoConfiguration.java
@@ -42,7 +42,7 @@
  * @author Anastasiia Smirnova
  */
 @AutoConfiguration
-@ConditionalOnClass(AerospikeClient.class)
+@ConditionalOnClass(IAerospikeClient.class)
 @ConditionalOnProperty("spring.aerospike.hosts")
 @EnableConfigurationProperties(AerospikeProperties.class)
 public class AerospikeAutoConfiguration {
@@ -85,7 +85,7 @@ public ClientPolicy aerospikeClientPolicy(AerospikeProperties properties,
         return clientPolicy;
     }
 
-    @ConditionalOnClass({AerospikeReactorClient.class, Flux.class})
+    @ConditionalOnClass({IAerospikeReactorClient.class, Flux.class})
     public static class AerospikeReactiveAutoConfiguration {
 
         @Bean(name = "aerospikeReactorClient", destroyMethod = "")

diff --git a/...g/springframework/boot/autoconfigure/data/aerospike/AerospikeCommonDataConfiguration.java b/...g/springframework/boot/autoconfigure/data/aerospike/AerospikeCommonDataConfiguration.java
@@ -8,8 +8,6 @@
 import org.springframework.boot.autoconfigure.domain.EntityScanner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
-import org.springframework.data.aerospike.cache.AerospikeCacheKeyProcessor;
-import org.springframework.data.aerospike.cache.AerospikeCacheKeyProcessorImpl;
 import org.springframework.data.aerospike.config.AerospikeConnectionSettings;
 import org.springframework.data.aerospike.config.AerospikeDataSettings;
 import org.springframework.data.aerospike.config.AerospikeSettings;
@@ -75,11 +73,6 @@ public IndexesCacheHolder aerospikeIndexCache() {
         return new IndexesCacheHolder();
     }
 
-    @Bean(name = "aerospikeCacheKeyProcessor")
-    public AerospikeCacheKeyProcessor cacheKeyProcessor() {
-        return new AerospikeCacheKeyProcessorImpl();
-    }
-
     @Bean(name = "mappingAerospikeConverter")
     @ConditionalOnMissingBean(name = "mappingAerospikeConverter")
     public MappingAerospikeConverter mappingAerospikeConverter(AerospikeMappingContext aerospikeMappingContext,

diff --git a/...org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataAutoConfiguration.java b/...org/springframework/boot/autoconfigure/data/aerospike/AerospikeDataAutoConfiguration.java
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.autoconfigure.data.aerospike;
 
-import com.aerospike.client.AerospikeClient;
 import com.aerospike.client.IAerospikeClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -39,8 +38,8 @@
 @AutoConfiguration
 // match only if we do not have reactive client
 // we want sync context to be loaded when only sync client is on classpath
-@ConditionalOnMissingClass("com.aerospike.client.reactor.AerospikeReactorClient")
-@ConditionalOnClass({AerospikeClient.class, AerospikeRepository.class})
+@ConditionalOnMissingClass("com.aerospike.client.reactor.IAerospikeReactorClient")
+@ConditionalOnClass({IAerospikeClient.class, AerospikeRepository.class})
 @ConditionalOnSingleCandidate(IAerospikeClient.class)
 @ConditionalOnProperty("spring.data.aerospike.namespace")
 @EnableConfigurationProperties(AerospikeDataProperties.class)

diff --git a/...ngframework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataAutoConfiguration.java b/...ngframework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataAutoConfiguration.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.data.aerospike;
 
-import com.aerospike.client.reactor.AerospikeReactorClient;
+import com.aerospike.client.reactor.IAerospikeReactorClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -36,8 +36,8 @@
  * @author Anastasiia Smirnova
  */
 @AutoConfiguration
-@ConditionalOnClass({AerospikeReactorClient.class, ReactiveAerospikeRepository.class, Flux.class})
-@ConditionalOnSingleCandidate(AerospikeReactorClient.class)
+@ConditionalOnClass({IAerospikeReactorClient.class, ReactiveAerospikeRepository.class, Flux.class})
+@ConditionalOnSingleCandidate(IAerospikeReactorClient.class)
 @ConditionalOnProperty("spring.data.aerospike.namespace")
 @AutoConfigureAfter(AerospikeAutoConfiguration.class)
 @EnableConfigurationProperties(AerospikeDataProperties.class)

diff --git a/...springframework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataConfiguration.java b/...springframework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataConfiguration.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.data.aerospike;
 
-import com.aerospike.client.reactor.AerospikeReactorClient;
+import com.aerospike.client.reactor.IAerospikeReactorClient;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -53,7 +53,7 @@ public ReactiveAerospikeTemplate reactiveAerospikeTemplate(MappingAerospikeConve
                                                                AerospikeDataProperties aerospikeDataProperties,
                                                                AerospikeMappingContext aerospikeMappingContext,
                                                                AerospikeExceptionTranslator aerospikeExceptionTranslator,
-                                                               AerospikeReactorClient aerospikeReactorClient,
+                                                               IAerospikeReactorClient aerospikeReactorClient,
                                                                ReactorQueryEngine reactorQueryEngine,
                                                                ReactorIndexRefresher reactorIndexRefresher,
                                                                ServerVersionSupport serverVersionSupport) {
@@ -64,7 +64,7 @@ public ReactiveAerospikeTemplate reactiveAerospikeTemplate(MappingAerospikeConve
 
     @Bean(name = "reactiveAerospikeQueryEngine")
     @ConditionalOnMissingBean(name = "reactiveAerospikeQueryEngine")
-    public ReactorQueryEngine reactiveAerospikeQueryEngine(AerospikeReactorClient aerospikeReactorClient,
+    public ReactorQueryEngine reactiveAerospikeQueryEngine(IAerospikeReactorClient aerospikeReactorClient,
                                                            AerospikeDataProperties aerospikeDataProperties,
                                                            FilterExpressionsBuilder filterExpressionsBuilder,
                                                            StatementBuilder statementBuilder,
@@ -78,7 +78,7 @@ public ReactorQueryEngine reactiveAerospikeQueryEngine(AerospikeReactorClient ae
 
     @Bean(name = "reactiveAerospikeIndexRefresher")
     @ConditionalOnMissingBean(name = "reactiveAerospikeIndexRefresher")
-    public ReactorIndexRefresher reactiveAerospikeIndexRefresher(AerospikeReactorClient aerospikeReactorClient,
+    public ReactorIndexRefresher reactiveAerospikeIndexRefresher(IAerospikeReactorClient aerospikeReactorClient,
                                                                  IndexesCacheUpdater indexesCacheUpdater,
                                                                  ServerVersionSupport serverVersionSupport) {
         ReactorIndexRefresher refresher = new ReactorIndexRefresher(aerospikeReactorClient, aerospikeReactorClient.getInfoPolicyDefault(),

diff --git a/...ork/boot/autoconfigure/data/aerospike/AerospikeReactiveRepositoriesAutoConfiguration.java b/...ork/boot/autoconfigure/data/aerospike/AerospikeReactiveRepositoriesAutoConfiguration.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.data.aerospike;
 
-import com.aerospike.client.reactor.AerospikeReactorClient;
+import com.aerospike.client.reactor.IAerospikeReactorClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -34,7 +34,7 @@
  * @author Igor Ermolenko
  */
 @AutoConfiguration
-@ConditionalOnClass({AerospikeReactorClient.class, ReactiveAerospikeRepository.class, Flux.class})
+@ConditionalOnClass({IAerospikeReactorClient.class, ReactiveAerospikeRepository.class, Flux.class})
 @ConditionalOnRepositoryType(store = "aerospike", type = RepositoryType.REACTIVE)
 @ConditionalOnMissingBean(ReactiveAerospikeRepositoryFactoryBean.class)
 @Import(AerospikeReactiveRepositoriesRegistrar.class)

diff --git a/...ngframework/boot/autoconfigure/data/aerospike/AerospikeRepositoriesAutoConfiguration.java b/...ngframework/boot/autoconfigure/data/aerospike/AerospikeRepositoriesAutoConfiguration.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.data.aerospike;
 
-import com.aerospike.client.AerospikeClient;
+import com.aerospike.client.IAerospikeClient;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -33,7 +33,7 @@
  * @author Igor Ermolenko
  */
 @AutoConfiguration
-@ConditionalOnClass({AerospikeClient.class, ReactiveAerospikeRepository.class})
+@ConditionalOnClass({IAerospikeClient.class, ReactiveAerospikeRepository.class})
 @ConditionalOnRepositoryType(store = "aerospike", type = RepositoryType.IMPERATIVE)
 @ConditionalOnMissingBean(AerospikeRepositoryFactoryBean.class)
 @Import(AerospikeRepositoriesRegistrar.class)

diff --git a/...springframework/boot/autoconfigure/data/aerospike/AerospikeDataAutoConfigurationTest.java b/...springframework/boot/autoconfigure/data/aerospike/AerospikeDataAutoConfigurationTest.java
@@ -17,7 +17,7 @@
 package org.springframework.boot.autoconfigure.data.aerospike;
 
 import com.aerospike.client.AerospikeClient;
-import com.aerospike.client.reactor.AerospikeReactorClient;
+import com.aerospike.client.reactor.IAerospikeReactorClient;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.aerospike.AerospikeAutoConfiguration;
@@ -49,7 +49,7 @@
 public class AerospikeDataAutoConfigurationTest {
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-            .withClassLoader(new FilteredClassLoader(AerospikeReactorClient.class))
+            .withClassLoader(new FilteredClassLoader(IAerospikeReactorClient.class))
             .withConfiguration(AutoConfigurations.of(
                     AerospikeAutoConfiguration.class, AerospikeDataAutoConfiguration.class));
 

diff --git a/...amework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataAutoConfigurationTest.java b/...amework/boot/autoconfigure/data/aerospike/AerospikeReactiveDataAutoConfigurationTest.java
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.data.aerospike;
 
-import com.aerospike.client.AerospikeClient;
+import com.aerospike.client.IAerospikeClient;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.aerospike.AerospikeAutoConfiguration;
@@ -52,7 +52,7 @@ public class AerospikeReactiveDataAutoConfigurationTest {
     @Test
     public void aerospikeTemplateAndClientAreNotSetupWhenNeitherClientNorDataPropertiesConfigured() {
         contextRunner.run(context -> {
-            assertThat(context).doesNotHaveBean(AerospikeClient.class);
+            assertThat(context).doesNotHaveBean(IAerospikeClient.class);
             assertThat(context).doesNotHaveBean(AerospikeTemplate.class);
             assertThat(context).doesNotHaveBean(ReactiveAerospikeTemplate.class);
             assertThat(context).doesNotHaveBean(AerospikeDataProperties.class);

diff --git a/...xample/reactive/src/test/java/com/aerospike/example/reactive/ReactiveIntegrationTest.java b/...xample/reactive/src/test/java/com/aerospike/example/reactive/ReactiveIntegrationTest.java
@@ -61,8 +61,7 @@ void savesAndGets() {
                 .assertThat()
                 .statusCode(200)
                 .body("id", equalTo("andrea"))
-                .body("age", equalTo(61))
-        ;
+                .body("age", equalTo(61));
     }
 
     @Order(2)
@@ -82,7 +81,6 @@ void savesAndFindsByLastName() {
                 .assertThat()
                 .statusCode(200)
                 .body("[0].id", equalTo("andrea"))
-                .body("[0].age", equalTo(61))
-        ;
+                .body("[0].age", equalTo(61));
     }
 }
diff --git a/...-aerospike-example/sync/src/test/java/com/aerospike/example/sync/SyncIntegrationTest.java b/...-aerospike-example/sync/src/test/java/com/aerospike/example/sync/SyncIntegrationTest.java
@@ -2,12 +2,7 @@
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.*;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
 
@@ -66,8 +61,7 @@ void savesAndGets() {
                 .assertThat()
                 .statusCode(200)
                 .body("id", equalTo("andrea"))
-                .body("age", equalTo(61))
-        ;
+                .body("age", equalTo(61));
     }
 
     @Order(2)
@@ -87,8 +81,6 @@ void savesAndFindsByLastName() {
                 .assertThat()
                 .statusCode(200)
                 .body("[0].id", equalTo("andrea"))
-                .body("[0].age", equalTo(61))
-        ;
+                .body("[0].age", equalTo(61));
     }
-
 }