diff --git a/README.md b/README.md index 49e8a1db..011b059f 100644 --- a/README.md +++ b/README.md @@ -1 +1,38 @@ # spring-integration + +## TODO + +### Search + +- [ ] Implement findByXXXX methods for RediSearch indexed models +- [ ] Handle model return values for Query and Aggregations (add more tests) + +### Probabilistic Data Structures + +- [ ] Implement Bloom methods for Repositories +- [ ] Review other PDS use cases + +### Rate Limiting + +- [ ] Design Rate Limiting Annotation for Controller? +- [ ] Determine 3rd party dependencies for Rate Limiting + +### Session Management + +- [ ] Research if this is already in Spring @Session + +### Graph + +- [ ] Basic annotations + +### Time Series Research + +- [ ] Research APIs - Databases + +### AI Use Cases + +- [ ] Research use cases + +### Leaderboards + +- [ ] See https://github.com/agoragames/leaderboard diff --git a/redis-spring-modules/pom.xml b/redis-spring-modules/pom.xml index f3720c86..4fef7ae0 100644 --- a/redis-spring-modules/pom.xml +++ b/redis-spring-modules/pom.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.redislabs.spring + com.redis.spring redis-spring-modules 1.0-SNAPSHOT jar diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/RedisJSONKeyValueAdapter.java b/redis-spring-modules/src/main/java/com/redis/spring/RedisJSONKeyValueAdapter.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/RedisJSONKeyValueAdapter.java rename to redis-spring-modules/src/main/java/com/redis/spring/RedisJSONKeyValueAdapter.java index c17a9f40..4a238e6e 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/RedisJSONKeyValueAdapter.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/RedisJSONKeyValueAdapter.java @@ -1,4 +1,4 @@ -package com.redislabs.spring; +package com.redis.spring; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisKeyValueAdapter; @@ -7,7 +7,7 @@ import org.springframework.data.redis.core.mapping.RedisMappingContext; import org.springframework.lang.Nullable; -import com.redislabs.spring.ops.json.JSONOperations; +import com.redis.spring.ops.json.JSONOperations; public class RedisJSONKeyValueAdapter extends RedisKeyValueAdapter { private JSONOperations redisJSONOperations; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/RedisModulesConfiguration.java b/redis-spring-modules/src/main/java/com/redis/spring/RedisModulesConfiguration.java similarity index 90% rename from redis-spring-modules/src/main/java/com/redislabs/spring/RedisModulesConfiguration.java rename to redis-spring-modules/src/main/java/com/redis/spring/RedisModulesConfiguration.java index 9371c33b..7c74025d 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/RedisModulesConfiguration.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/RedisModulesConfiguration.java @@ -1,4 +1,4 @@ -package com.redislabs.spring; +package com.redis.spring; import java.util.ArrayList; import java.util.List; @@ -25,15 +25,15 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.mapping.RedisMappingContext; -import com.redislabs.spring.annotations.Bloom; -import com.redislabs.spring.annotations.Document; -import com.redislabs.spring.annotations.TagIndexed; -import com.redislabs.spring.annotations.TextIndexed; -import com.redislabs.spring.client.RedisModulesClient; -import com.redislabs.spring.ops.RedisModulesOperations; -import com.redislabs.spring.ops.json.JSONOperations; -import com.redislabs.spring.ops.pds.BloomOperations; -import com.redislabs.spring.ops.search.SearchOperations; +import com.redis.spring.annotations.Bloom; +import com.redis.spring.annotations.Document; +import com.redis.spring.annotations.TagIndexed; +import com.redis.spring.annotations.TextIndexed; +import com.redis.spring.client.RedisModulesClient; +import com.redis.spring.ops.RedisModulesOperations; +import com.redis.spring.ops.json.JSONOperations; +import com.redis.spring.ops.pds.BloomOperations; +import com.redis.spring.ops.search.SearchOperations; import io.redisearch.FieldName; import io.redisearch.Schema; @@ -46,7 +46,7 @@ @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(RedisProperties.class) @EnableAspectJAutoProxy -@ComponentScan("com.redislabs.spring.bloom") +@ComponentScan("com.redis.spring.bloom") public class RedisModulesConfiguration extends CachingConfigurerSupport { @Bean(name = "redisModulesClient") @@ -63,7 +63,7 @@ RedisModulesClient redisModulesClient(JedisConnectionFactory jedisConnectionFact JSONOperations redisJSONOperations(RedisModulesOperations redisModulesOperations) { return redisModulesOperations.opsForJSON(); } - + @Bean(name = "redisBloomOperations") BloomOperations redisBloomOperations(RedisModulesOperations redisModulesOperations) { return redisModulesOperations.opsForBloom(); @@ -94,7 +94,7 @@ public RedisKeyValueTemplate getRedisJSONKeyValueTemplate(RedisOperations @EventListener(ContextRefreshedEvent.class) public void ensureIndexesAreCreated(ContextRefreshedEvent cre) { System.out.println(">>>> On ContextRefreshedEvent ... Creating Indexes......"); - + ApplicationContext ac = cre.getApplicationContext(); @SuppressWarnings("unchecked") RedisModulesOperations rmo = (RedisModulesOperations) ac.getBean("redisModulesOperations"); @@ -102,13 +102,13 @@ public void ensureIndexesAreCreated(ContextRefreshedEvent cre) { ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AnnotationTypeFilter(Document.class)); for (BeanDefinition beanDef : provider - .findCandidateComponents("com.redislabs.spring.annotations.document.fixtures")) { + .findCandidateComponents("com.redis.spring.annotations.document.fixtures")) { try { Class cl = Class.forName(beanDef.getBeanClassName()); //Document document = cl.getAnnotation(Document.class); System.out.printf(">>>> Found @Document annotated class: %s\n", cl.getSimpleName()); - - + + List fields = new ArrayList(); for (java.lang.reflect.Field field : cl.getDeclaredFields()) { System.out.println(">>>> Inspecting field " + field.getName()); @@ -116,31 +116,31 @@ public void ensureIndexesAreCreated(ContextRefreshedEvent cre) { if (field.isAnnotationPresent(TextIndexed.class)) { System.out.println(">>>>>> FOUND TextIndexed on " + field.getName()); TextIndexed ti = field.getAnnotation(TextIndexed.class); - + FieldName fieldName = FieldName.of("$." + field.getName()); if (!ObjectUtils.isEmpty(ti.alias())) { fieldName = fieldName.as(ti.alias()); } String phonetic = ObjectUtils.isEmpty(ti.phonetic()) ? null : ti.phonetic(); TextField tf = new TextField(fieldName, ti.weight(), ti.sortable(), ti.nostem(), ti.noindex(), phonetic); - + fields.add(tf); } // Tag if (field.isAnnotationPresent(TagIndexed.class)) { System.out.println(">>>>>> FOUND TagIndexed on " + field.getName()); TagIndexed ti = field.getAnnotation(TagIndexed.class); - + FieldName fieldName = FieldName.of("$." + field.getName() + "[*]"); if (!ObjectUtils.isEmpty(ti.alias())) { fieldName = fieldName.as(ti.alias()); } Field tf = new Field(fieldName, FieldType.Tag, ti.sortable(), ti.noindex()); - + fields.add(tf); } } - + if (!fields.isEmpty()) { Schema schema = new Schema(); SearchOperations opsForSearch = rmo.opsForSearch(cl.getSimpleName() + "Idx"); @@ -157,7 +157,7 @@ public void ensureIndexesAreCreated(ContextRefreshedEvent cre) { } } - + @EventListener(ContextRefreshedEvent.class) public void processBloom(ContextRefreshedEvent cre) { System.out.println(">>>> On ContextRefreshedEvent ... Processing Bloom annotations......"); @@ -169,7 +169,7 @@ public void processBloom(ContextRefreshedEvent cre) { provider.addIncludeFilter(new AnnotationTypeFilter(Document.class)); provider.addIncludeFilter(new AnnotationTypeFilter(RedisHash.class)); for (BeanDefinition beanDef : provider - .findCandidateComponents("com.redislabs.spring.annotations.bloom.fixtures")) { + .findCandidateComponents("com.redis.spring.annotations.bloom.fixtures")) { try { Class cl = Class.forName(beanDef.getBeanClassName()); System.out.printf(">>>> Found @RedisHash / @Document annotated class: %s\n", cl.getSimpleName()); @@ -190,5 +190,5 @@ public void processBloom(ContextRefreshedEvent cre) { } } } - + } diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Aggregation.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Aggregation.java similarity index 90% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Aggregation.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/Aggregation.java index 43705ef2..26f12fc0 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Aggregation.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Aggregation.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Bloom.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Bloom.java similarity index 90% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Bloom.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/Bloom.java index 7b66852d..127630b2 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Bloom.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Bloom.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Document.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Document.java similarity index 92% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Document.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/Document.java index 5ab63442..63e39ac3 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Document.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Document.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/EnableRedisDocumentRepositories.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/EnableRedisDocumentRepositories.java similarity index 94% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/EnableRedisDocumentRepositories.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/EnableRedisDocumentRepositories.java index 294287c2..79963b3d 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/EnableRedisDocumentRepositories.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/EnableRedisDocumentRepositories.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -24,10 +24,10 @@ import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.data.repository.query.QueryLookupStrategy.Key; -import com.redislabs.spring.repository.configuration.RedisJSONRepositoriesRegistrar; -import com.redislabs.spring.repository.query.RediSearchQuery; -import com.redislabs.spring.repository.query.RediSearchQueryCreator; -import com.redislabs.spring.repository.support.RedisDocumentRepositoryFactoryBean; +import com.redis.spring.repository.configuration.RedisJSONRepositoriesRegistrar; +import com.redis.spring.repository.query.RediSearchQuery; +import com.redis.spring.repository.query.RediSearchQueryCreator; +import com.redis.spring.repository.support.RedisDocumentRepositoryFactoryBean; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/GeoIndexed.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/GeoIndexed.java similarity index 93% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/GeoIndexed.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/GeoIndexed.java index acb6e4a6..84442092 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/GeoIndexed.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/GeoIndexed.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/NumericIndexed.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/NumericIndexed.java similarity index 93% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/NumericIndexed.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/NumericIndexed.java index 30fba801..bcec803d 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/NumericIndexed.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/NumericIndexed.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Query.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Query.java similarity index 94% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Query.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/Query.java index 43382d37..3fbc4bd0 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/Query.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/Query.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/TagIndexed.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/TagIndexed.java similarity index 93% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/TagIndexed.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/TagIndexed.java index 965a887b..58a2f566 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/TagIndexed.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/TagIndexed.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/TextIndexed.java b/redis-spring-modules/src/main/java/com/redis/spring/annotations/TextIndexed.java similarity index 94% rename from redis-spring-modules/src/main/java/com/redislabs/spring/annotations/TextIndexed.java rename to redis-spring-modules/src/main/java/com/redis/spring/annotations/TextIndexed.java index e1bc56e4..2b6bda6b 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/annotations/TextIndexed.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/annotations/TextIndexed.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations; +package com.redis.spring.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/bloom/BloomAspect.java b/redis-spring-modules/src/main/java/com/redis/spring/bloom/BloomAspect.java similarity index 81% rename from redis-spring-modules/src/main/java/com/redislabs/spring/bloom/BloomAspect.java rename to redis-spring-modules/src/main/java/com/redis/spring/bloom/BloomAspect.java index 50289512..897aa945 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/bloom/BloomAspect.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/bloom/BloomAspect.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.bloom; +package com.redis.spring.bloom; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; @@ -14,8 +14,8 @@ import org.springframework.core.Ordered; import org.springframework.stereotype.Component; -import com.redislabs.spring.annotations.Bloom; -import com.redislabs.spring.ops.pds.BloomOperations; +import com.redis.spring.annotations.Bloom; +import com.redis.spring.ops.pds.BloomOperations; @Aspect @Component @@ -24,55 +24,51 @@ public class BloomAspect implements Ordered { public BloomAspect(BloomOperations ops) { this.ops = ops; - System.out.println(">>>> IN BloomAspect constructor..."); } @Pointcut("execution(public * org.springframework.data.repository.CrudRepository+.save(..))") public void inCrudRepositorySave() {} - @Pointcut("execution(public * com.redislabs.spring.repository.RedisDocumentRepository+.save(..))") + @Pointcut("execution(public * com.redis.spring.repository.RedisDocumentRepository+.save(..))") public void inRedisDocumentRepositorySave() {} @Pointcut("inCrudRepositorySave() || inRedisDocumentRepositorySave()") private void inSaveOperation() {} @AfterReturning("inSaveOperation() && args(entity,..)") - public void addToBloom(JoinPoint jp, Object entity) { - System.out.println(">>>> IN addToBloom"); + public void addToBloom(JoinPoint jp, Object entity) { for (Field field : entity.getClass().getDeclaredFields()) { if (field.isAnnotationPresent(Bloom.class)) { Bloom bloom = field.getAnnotation(Bloom.class); String filterName = !ObjectUtils.isEmpty(bloom.name()) ? bloom.name() : String.format("bf:%s:%s", entity.getClass().getSimpleName(), field.getName()); try { - PropertyDescriptor pd = new PropertyDescriptor(field.getName(), entity.getClass()); + PropertyDescriptor pd = new PropertyDescriptor(field.getName(), entity.getClass()); ops.add(filterName, pd.getReadMethod().invoke(entity).toString()); } catch (IllegalArgumentException | IllegalAccessException | IntrospectionException | InvocationTargetException e) { e.printStackTrace(); } - } } } - + @Pointcut("execution(public * org.springframework.data.repository.CrudRepository+.saveAll(..))") public void inCrudRepositorySaveAll() {} - @Pointcut("execution(public * com.redislabs.spring.repository.RedisDocumentRepository+.saveAll(..))") + @Pointcut("execution(public * com.redis.spring.repository.RedisDocumentRepository+.saveAll(..))") public void inRedisDocumentRepositorySaveAll() {} @Pointcut("inCrudRepositorySaveAll() || inRedisDocumentRepositorySaveAll()") private void inSaveAllOperation() {} - + @AfterReturning("inSaveAllOperation() && args(entities,..)") public void addAllToBloom(JoinPoint jp, List entities) { - System.out.println(">>>> IN addAllToBloom"); for (Object entity : entities) { for (Field field : entity.getClass().getDeclaredFields()) { if (field.isAnnotationPresent(Bloom.class)) { Bloom bloom = field.getAnnotation(Bloom.class); String filterName = !ObjectUtils.isEmpty(bloom.name()) ? bloom.name() : String.format("bf:%s:%s", entity.getClass().getSimpleName(), field.getName()); try { - PropertyDescriptor pd = new PropertyDescriptor(field.getName(), entity.getClass()); + PropertyDescriptor pd = new PropertyDescriptor(field.getName(), entity.getClass()); ops.add(filterName, pd.getReadMethod().invoke(entity).toString()); } catch (IllegalArgumentException | IllegalAccessException | IntrospectionException | InvocationTargetException e) { e.printStackTrace(); diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/client/RedisModulesClient.java b/redis-spring-modules/src/main/java/com/redis/spring/client/RedisModulesClient.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/client/RedisModulesClient.java rename to redis-spring-modules/src/main/java/com/redis/spring/client/RedisModulesClient.java index 18b12fde..118552ea 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/client/RedisModulesClient.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/client/RedisModulesClient.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.client; +package com.redis.spring.client; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; diff --git a/redis-spring-modules/src/main/java/com/redis/spring/ops/RedisModulesOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/RedisModulesOperations.java new file mode 100644 index 00000000..901db025 --- /dev/null +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/RedisModulesOperations.java @@ -0,0 +1,67 @@ +package com.redis.spring.ops; + +import com.redis.spring.client.RedisModulesClient; +import com.redis.spring.ops.ai.AIOperations; +import com.redis.spring.ops.ai.AIOperationsImpl; +import com.redis.spring.ops.graph.GraphOperations; +import com.redis.spring.ops.graph.GraphOperationsImpl; +import com.redis.spring.ops.json.JSONOperations; +import com.redis.spring.ops.json.JSONOperationsImpl; +import com.redis.spring.ops.pds.BloomOperations; +import com.redis.spring.ops.pds.BloomOperationsImpl; +import com.redis.spring.ops.pds.CountMinSketchOperations; +import com.redis.spring.ops.pds.CountMinSketchOperationsImpl; +import com.redis.spring.ops.pds.CuckooFilterOperations; +import com.redis.spring.ops.pds.CuckooFilterOperationsImpl; +import com.redis.spring.ops.pds.TopKOperations; +import com.redis.spring.ops.pds.TopKOperationsImpl; +import com.redis.spring.ops.search.SearchOperations; +import com.redis.spring.ops.search.SearchOperationsImpl; +import com.redis.spring.ops.timeseries.TimeSeriesOperations; +import com.redis.spring.ops.timeseries.TimeSeriesOperationsImpl; + +public class RedisModulesOperations { + + private RedisModulesClient client; + + public RedisModulesOperations(RedisModulesClient client) { + this.client = client; + } + + public JSONOperations opsForJSON() { + return new JSONOperationsImpl<>(client); + } + + public GraphOperations opsForGraph() { + return new GraphOperationsImpl<>(client); + } + + public SearchOperations opsForSearch(K index) { + return new SearchOperationsImpl<>(index, client); + } + + public TimeSeriesOperations opsForTimeSeries() { + return new TimeSeriesOperationsImpl<>(client); + } + + public BloomOperations opsForBloom() { + return new BloomOperationsImpl<>(client); + } + + public CountMinSketchOperations opsForCountMinSketch() { + return new CountMinSketchOperationsImpl<>(client); + } + + public CuckooFilterOperations opsForCuckoFilter() { + return new CuckooFilterOperationsImpl<>(client); + } + + public TopKOperations opsForTopK() { + return new TopKOperationsImpl<>(client); + } + + public AIOperations opsForAI() { + return new AIOperationsImpl<>(client); + } + +} diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/ai/AIOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/ai/AIOperations.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/ai/AIOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/ai/AIOperations.java index e935b858..1fc8c45f 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/ai/AIOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/ai/AIOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.ai; +package com.redis.spring.ops.ai; import java.util.List; import java.util.Map; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/ai/AIOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/ai/AIOperationsImpl.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/ai/AIOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/ai/AIOperationsImpl.java index 6858798d..9173af54 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/ai/AIOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/ai/AIOperationsImpl.java @@ -1,15 +1,15 @@ -package com.redislabs.spring.ops.ai; +package com.redis.spring.ops.ai; import java.util.List; import java.util.Map; +import com.redis.spring.client.RedisModulesClient; import com.redislabs.redisai.Backend; import com.redislabs.redisai.Dag; import com.redislabs.redisai.Device; import com.redislabs.redisai.Model; import com.redislabs.redisai.Script; import com.redislabs.redisai.Tensor; -import com.redislabs.spring.client.RedisModulesClient; public class AIOperationsImpl implements AIOperations { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/graph/GraphOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/graph/GraphOperations.java similarity index 95% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/graph/GraphOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/graph/GraphOperations.java index e5910835..54f809d0 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/graph/GraphOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/graph/GraphOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.graph; +package com.redis.spring.ops.graph; import java.util.List; import java.util.Map; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/graph/GraphOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/graph/GraphOperationsImpl.java similarity index 96% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/graph/GraphOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/graph/GraphOperationsImpl.java index 8d38e324..282b997c 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/graph/GraphOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/graph/GraphOperationsImpl.java @@ -1,10 +1,10 @@ -package com.redislabs.spring.ops.graph; +package com.redis.spring.ops.graph; import java.util.List; import java.util.Map; +import com.redis.spring.client.RedisModulesClient; import com.redislabs.redisgraph.ResultSet; -import com.redislabs.spring.client.RedisModulesClient; public class GraphOperationsImpl implements GraphOperations { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/json/JSONOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/json/JSONOperations.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/json/JSONOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/json/JSONOperations.java index bbb96b81..ed111172 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/json/JSONOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/json/JSONOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.json; +package com.redis.spring.ops.json; import java.util.List; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/json/JSONOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/json/JSONOperationsImpl.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/json/JSONOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/json/JSONOperationsImpl.java index e97c9bdf..07647af2 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/json/JSONOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/json/JSONOperationsImpl.java @@ -1,10 +1,10 @@ -package com.redislabs.spring.ops.json; +package com.redis.spring.ops.json; import java.util.Arrays; import java.util.List; import com.redislabs.modules.rejson.JReJSON.ExistenceModifier; -import com.redislabs.spring.client.RedisModulesClient; +import com.redis.spring.client.RedisModulesClient; import com.redislabs.modules.rejson.Path; public class JSONOperationsImpl implements JSONOperations { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/BloomOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/BloomOperations.java similarity index 98% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/BloomOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/BloomOperations.java index b1845f6d..aaf723ca 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/BloomOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/BloomOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; import java.util.Map; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/BloomOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/BloomOperationsImpl.java similarity index 95% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/BloomOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/BloomOperationsImpl.java index 912d2271..cec16018 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/BloomOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/BloomOperationsImpl.java @@ -1,8 +1,8 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; import java.util.Map; -import com.redislabs.spring.client.RedisModulesClient; +import com.redis.spring.client.RedisModulesClient; import io.rebloom.client.InsertOptions; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CountMinSketchOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CountMinSketchOperations.java similarity index 98% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CountMinSketchOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CountMinSketchOperations.java index d684d7cb..c79b7781 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CountMinSketchOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CountMinSketchOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; import java.util.List; import java.util.Map; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CountMinSketchOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CountMinSketchOperationsImpl.java similarity index 95% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CountMinSketchOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CountMinSketchOperationsImpl.java index 606201d3..3fa445b1 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CountMinSketchOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CountMinSketchOperationsImpl.java @@ -1,11 +1,11 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.redislabs.spring.client.RedisModulesClient; +import com.redis.spring.client.RedisModulesClient; public class CountMinSketchOperationsImpl implements CountMinSketchOperations { RedisModulesClient client; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CuckooFilterOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CuckooFilterOperations.java similarity index 56% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CuckooFilterOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CuckooFilterOperations.java index 355b85a2..8ec20a4a 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CuckooFilterOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CuckooFilterOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; public interface CuckooFilterOperations { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CuckooFilterOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CuckooFilterOperationsImpl.java similarity index 69% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CuckooFilterOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CuckooFilterOperationsImpl.java index 0f66fddd..f5d5669b 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/CuckooFilterOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/CuckooFilterOperationsImpl.java @@ -1,6 +1,6 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; -import com.redislabs.spring.client.RedisModulesClient; +import com.redis.spring.client.RedisModulesClient; public class CuckooFilterOperationsImpl implements CuckooFilterOperations { RedisModulesClient client; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/TopKOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/TopKOperations.java similarity index 51% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/TopKOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/TopKOperations.java index 3bebc547..f89e0852 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/TopKOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/TopKOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; public interface TopKOperations { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/TopKOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/TopKOperationsImpl.java similarity index 66% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/TopKOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/pds/TopKOperationsImpl.java index 388a546c..5656be39 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/pds/TopKOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/pds/TopKOperationsImpl.java @@ -1,6 +1,6 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; -import com.redislabs.spring.client.RedisModulesClient; +import com.redis.spring.client.RedisModulesClient; public class TopKOperationsImpl implements TopKOperations { RedisModulesClient client; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/search/SearchOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/search/SearchOperations.java similarity index 98% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/search/SearchOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/search/SearchOperations.java index 2e078d25..8efd53ea 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/search/SearchOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/search/SearchOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.search; +package com.redis.spring.ops.search; import java.util.List; import java.util.Map; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/search/SearchOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/search/SearchOperationsImpl.java similarity index 98% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/search/SearchOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/search/SearchOperationsImpl.java index 75ac06c8..93c89aae 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/search/SearchOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/search/SearchOperationsImpl.java @@ -1,9 +1,9 @@ -package com.redislabs.spring.ops.search; +package com.redis.spring.ops.search; import java.util.List; import java.util.Map; -import com.redislabs.spring.client.RedisModulesClient; +import com.redis.spring.client.RedisModulesClient; import io.redisearch.AggregationResult; import io.redisearch.Client; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/timeseries/TimeSeriesOperations.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/timeseries/TimeSeriesOperations.java similarity index 98% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/timeseries/TimeSeriesOperations.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/timeseries/TimeSeriesOperations.java index d6342926..879f79db 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/timeseries/TimeSeriesOperations.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/timeseries/TimeSeriesOperations.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.timeseries; +package com.redis.spring.ops.timeseries; import java.util.List; import java.util.Map; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/timeseries/TimeSeriesOperationsImpl.java b/redis-spring-modules/src/main/java/com/redis/spring/ops/timeseries/TimeSeriesOperationsImpl.java similarity index 98% rename from redis-spring-modules/src/main/java/com/redislabs/spring/ops/timeseries/TimeSeriesOperationsImpl.java rename to redis-spring-modules/src/main/java/com/redis/spring/ops/timeseries/TimeSeriesOperationsImpl.java index 674e2896..cb2ea3d3 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/timeseries/TimeSeriesOperationsImpl.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/ops/timeseries/TimeSeriesOperationsImpl.java @@ -1,15 +1,15 @@ -package com.redislabs.spring.ops.timeseries; +package com.redis.spring.ops.timeseries; import java.util.List; import java.util.Map; +import com.redis.spring.client.RedisModulesClient; import com.redislabs.redistimeseries.Aggregation; import com.redislabs.redistimeseries.DuplicatePolicy; import com.redislabs.redistimeseries.Measurement; import com.redislabs.redistimeseries.Range; import com.redislabs.redistimeseries.Value; import com.redislabs.redistimeseries.information.Info; -import com.redislabs.spring.client.RedisModulesClient; public class TimeSeriesOperationsImpl implements TimeSeriesOperations { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/RedisDocumentRepository.java b/redis-spring-modules/src/main/java/com/redis/spring/repository/RedisDocumentRepository.java similarity index 85% rename from redis-spring-modules/src/main/java/com/redislabs/spring/repository/RedisDocumentRepository.java rename to redis-spring-modules/src/main/java/com/redis/spring/repository/RedisDocumentRepository.java index ae803fef..69798dea 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/RedisDocumentRepository.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/repository/RedisDocumentRepository.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.repository; +package com.redis.spring.repository; import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.PagingAndSortingRepository; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/configuration/RedisJSONRepositoriesRegistrar.java b/redis-spring-modules/src/main/java/com/redis/spring/repository/configuration/RedisJSONRepositoriesRegistrar.java similarity index 96% rename from redis-spring-modules/src/main/java/com/redislabs/spring/repository/configuration/RedisJSONRepositoriesRegistrar.java rename to redis-spring-modules/src/main/java/com/redis/spring/repository/configuration/RedisJSONRepositoriesRegistrar.java index 42829a16..be370da8 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/configuration/RedisJSONRepositoriesRegistrar.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/repository/configuration/RedisJSONRepositoriesRegistrar.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.repository.configuration; +package com.redis.spring.repository.configuration; import java.lang.annotation.Annotation; @@ -15,7 +15,7 @@ import org.springframework.lang.NonNull; import org.springframework.util.Assert; -import com.redislabs.spring.annotations.EnableRedisDocumentRepositories; +import com.redis.spring.annotations.EnableRedisDocumentRepositories; public class RedisJSONRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/configuration/RedisJSONRepositoryConfigurationExtension.java b/redis-spring-modules/src/main/java/com/redis/spring/repository/configuration/RedisJSONRepositoryConfigurationExtension.java similarity index 93% rename from redis-spring-modules/src/main/java/com/redislabs/spring/repository/configuration/RedisJSONRepositoryConfigurationExtension.java rename to redis-spring-modules/src/main/java/com/redis/spring/repository/configuration/RedisJSONRepositoryConfigurationExtension.java index 54fa1603..c07b917b 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/configuration/RedisJSONRepositoryConfigurationExtension.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/repository/configuration/RedisJSONRepositoryConfigurationExtension.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.repository.configuration; +package com.redis.spring.repository.configuration; import java.lang.annotation.Annotation; import java.util.Collection; @@ -10,8 +10,8 @@ import org.springframework.data.redis.repository.configuration.RedisRepositoryConfigurationExtension; import org.springframework.data.repository.config.RepositoryConfigurationSource; -import com.redislabs.spring.annotations.Document; -import com.redislabs.spring.repository.RedisDocumentRepository; +import com.redis.spring.annotations.Document; +import com.redis.spring.repository.RedisDocumentRepository; public class RedisJSONRepositoryConfigurationExtension extends RedisRepositoryConfigurationExtension { private static final String REDIS_ADAPTER_BEAN_NAME = "redisJSONKeyValueAdapter"; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/query/RediSearchQuery.java b/redis-spring-modules/src/main/java/com/redis/spring/repository/query/RediSearchQuery.java similarity index 90% rename from redis-spring-modules/src/main/java/com/redislabs/spring/repository/query/RediSearchQuery.java rename to redis-spring-modules/src/main/java/com/redis/spring/repository/query/RediSearchQuery.java index 68f4f93b..1e911e73 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/query/RediSearchQuery.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/repository/query/RediSearchQuery.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.repository.query; +package com.redis.spring.repository.query; import java.util.Arrays; @@ -16,9 +16,9 @@ import org.springframework.data.repository.query.parser.AbstractQueryCreator; import com.google.gson.Gson; -import com.redislabs.spring.annotations.Aggregation; -import com.redislabs.spring.ops.RedisModulesOperations; -import com.redislabs.spring.ops.search.SearchOperations; +import com.redis.spring.annotations.Aggregation; +import com.redis.spring.ops.RedisModulesOperations; +import com.redis.spring.ops.search.SearchOperations; import io.redisearch.AggregationResult; import io.redisearch.Query; @@ -55,12 +55,12 @@ public RediSearchQuery(QueryMethod queryMethod, RepositoryMetadata metadata, Que Class[] params = queryMethod.getParameters().stream().map(p -> p.getType()).toArray(Class[]::new); try { java.lang.reflect.Method method = repoClass.getDeclaredMethod(queryMethod.getName(), params); - if (method.isAnnotationPresent(com.redislabs.spring.annotations.Query.class)) { - com.redislabs.spring.annotations.Query queryAnnotation = method.getAnnotation(com.redislabs.spring.annotations.Query.class); + if (method.isAnnotationPresent(com.redis.spring.annotations.Query.class)) { + com.redis.spring.annotations.Query queryAnnotation = method.getAnnotation(com.redis.spring.annotations.Query.class); this.type = RediSearchQueryType.QUERY; this.value = queryAnnotation.value(); this.returnFields = queryAnnotation.returnFields(); - } else if (method.isAnnotationPresent(com.redislabs.spring.annotations.Aggregation.class)) { + } else if (method.isAnnotationPresent(com.redis.spring.annotations.Aggregation.class)) { Aggregation aggregation = method.getAnnotation(Aggregation.class); this.type = RediSearchQueryType.AGGREGATION; this.value = aggregation.value(); diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/query/RediSearchQueryCreator.java b/redis-spring-modules/src/main/java/com/redis/spring/repository/query/RediSearchQueryCreator.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/repository/query/RediSearchQueryCreator.java rename to redis-spring-modules/src/main/java/com/redis/spring/repository/query/RediSearchQueryCreator.java index 0b3424be..ed6b6266 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/query/RediSearchQueryCreator.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/repository/query/RediSearchQueryCreator.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.repository.query; +package com.redis.spring.repository.query; import java.util.Iterator; diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/support/RedisDocumentRepositoryFactory.java b/redis-spring-modules/src/main/java/com/redis/spring/repository/support/RedisDocumentRepositoryFactory.java similarity index 98% rename from redis-spring-modules/src/main/java/com/redislabs/spring/repository/support/RedisDocumentRepositoryFactory.java rename to redis-spring-modules/src/main/java/com/redis/spring/repository/support/RedisDocumentRepositoryFactory.java index d0236ea4..1744684e 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/support/RedisDocumentRepositoryFactory.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/repository/support/RedisDocumentRepositoryFactory.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.repository.support; +package com.redis.spring.repository.support; import static org.springframework.data.querydsl.QuerydslUtils.QUERY_DSL_PRESENT; @@ -33,8 +33,8 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import com.redislabs.spring.ops.RedisModulesOperations; -import com.redislabs.spring.repository.query.RediSearchQuery; +import com.redis.spring.ops.RedisModulesOperations; +import com.redis.spring.repository.query.RediSearchQuery; public class RedisDocumentRepositoryFactory extends RepositoryFactorySupport { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/support/RedisDocumentRepositoryFactoryBean.java b/redis-spring-modules/src/main/java/com/redis/spring/repository/support/RedisDocumentRepositoryFactoryBean.java similarity index 97% rename from redis-spring-modules/src/main/java/com/redislabs/spring/repository/support/RedisDocumentRepositoryFactoryBean.java rename to redis-spring-modules/src/main/java/com/redis/spring/repository/support/RedisDocumentRepositoryFactoryBean.java index f0c94b9e..9dd9dcb9 100644 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/repository/support/RedisDocumentRepositoryFactoryBean.java +++ b/redis-spring-modules/src/main/java/com/redis/spring/repository/support/RedisDocumentRepositoryFactoryBean.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.repository.support; +package com.redis.spring.repository.support; import org.springframework.data.keyvalue.core.KeyValueOperations; import org.springframework.data.keyvalue.repository.config.QueryCreatorType; @@ -11,7 +11,7 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; -import com.redislabs.spring.ops.RedisModulesOperations; +import com.redis.spring.ops.RedisModulesOperations; public class RedisDocumentRepositoryFactoryBean, S, ID> extends RepositoryFactoryBeanSupport { diff --git a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/RedisModulesOperations.java b/redis-spring-modules/src/main/java/com/redislabs/spring/ops/RedisModulesOperations.java deleted file mode 100644 index ec8b4e37..00000000 --- a/redis-spring-modules/src/main/java/com/redislabs/spring/ops/RedisModulesOperations.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.redislabs.spring.ops; - -import com.redislabs.spring.client.RedisModulesClient; -import com.redislabs.spring.ops.ai.AIOperations; -import com.redislabs.spring.ops.ai.AIOperationsImpl; -import com.redislabs.spring.ops.graph.GraphOperations; -import com.redislabs.spring.ops.graph.GraphOperationsImpl; -import com.redislabs.spring.ops.json.JSONOperations; -import com.redislabs.spring.ops.json.JSONOperationsImpl; -import com.redislabs.spring.ops.pds.BloomOperations; -import com.redislabs.spring.ops.pds.BloomOperationsImpl; -import com.redislabs.spring.ops.pds.CountMinSketchOperations; -import com.redislabs.spring.ops.pds.CountMinSketchOperationsImpl; -import com.redislabs.spring.ops.pds.CuckooFilterOperations; -import com.redislabs.spring.ops.pds.CuckooFilterOperationsImpl; -import com.redislabs.spring.ops.pds.TopKOperations; -import com.redislabs.spring.ops.pds.TopKOperationsImpl; -import com.redislabs.spring.ops.search.SearchOperations; -import com.redislabs.spring.ops.search.SearchOperationsImpl; -import com.redislabs.spring.ops.timeseries.TimeSeriesOperations; -import com.redislabs.spring.ops.timeseries.TimeSeriesOperationsImpl; - -public class RedisModulesOperations { - - private RedisModulesClient client; - - public RedisModulesOperations(RedisModulesClient client) { - this.client = client; - } - - public JSONOperations opsForJSON() { - return new JSONOperationsImpl<>(client); - } - - public GraphOperations opsForGraph() { - return new GraphOperationsImpl<>(client); - } - - public SearchOperations opsForSearch(K index) { - return new SearchOperationsImpl<>(index, client); - } - - public TimeSeriesOperations opsForTimeSeries() { - return new TimeSeriesOperationsImpl<>(client); - } - - public BloomOperations opsForBloom() { - return new BloomOperationsImpl<>(client); - } - - public CountMinSketchOperations opsForCountMinSketch() { - return new CountMinSketchOperationsImpl<>(client); - } - - public CuckooFilterOperations opsForCuckoFilter() { - return new CuckooFilterOperationsImpl<>(client); - } - - public TopKOperations opsForTopK() { - return new TopKOperationsImpl<>(client); - } - - public AIOperations opsForAI() { - return new AIOperationsImpl<>(client); - } - -} diff --git a/redis-spring-modules/src/main/resources/META-INF/spring.factories b/redis-spring-modules/src/main/resources/META-INF/spring.factories index f614bf83..2d1e8139 100644 --- a/redis-spring-modules/src/main/resources/META-INF/spring.factories +++ b/redis-spring-modules/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.redislabs.spring.RedisModulesConfiguration +com.redis.spring.RedisModulesConfiguration #,\ #org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration \ No newline at end of file diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/AbstractBaseTest.java b/redis-spring-modules/src/test/java/com/redis/spring/AbstractBaseTest.java similarity index 88% rename from redis-spring-modules/src/test/java/com/redislabs/spring/AbstractBaseTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/AbstractBaseTest.java index 31568ce9..560026aa 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/AbstractBaseTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/AbstractBaseTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring; +package com.redis.spring; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; @@ -11,8 +11,8 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import com.redis.spring.annotations.EnableRedisDocumentRepositories; import com.redis.testcontainers.RedisModulesContainer; -import com.redislabs.spring.annotations.EnableRedisDocumentRepositories; @Testcontainers @SpringBootTest(classes = AbstractBaseTest.Config.class, properties = {"spring.main.allow-bean-definition-overriding=true"}) @@ -22,7 +22,7 @@ public abstract class AbstractBaseTest { @SpringBootApplication @Configuration - @EnableRedisDocumentRepositories(basePackages = "com.redislabs.spring.annotations.document.fixtures") + @EnableRedisDocumentRepositories(basePackages = "com.redis.spring.annotations.document.fixtures") static class Config { @Bean public JedisConnectionFactory jedisConnectionFactory() { diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/JSONSearchTest.java b/redis-spring-modules/src/test/java/com/redis/spring/JSONSearchTest.java similarity index 96% rename from redis-spring-modules/src/test/java/com/redislabs/spring/JSONSearchTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/JSONSearchTest.java index 093f7e0f..d597e6cf 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/JSONSearchTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/JSONSearchTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring; +package com.redis.spring; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -15,9 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; -import com.redislabs.spring.ops.RedisModulesOperations; -import com.redislabs.spring.ops.json.JSONOperations; -import com.redislabs.spring.ops.search.SearchOperations; +import com.redis.spring.ops.RedisModulesOperations; +import com.redis.spring.ops.json.JSONOperations; +import com.redis.spring.ops.search.SearchOperations; import io.redisearch.AggregationResult; import io.redisearch.Document; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/BloomTest.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/BloomTest.java similarity index 88% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/BloomTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/BloomTest.java index 2b86ff92..7e7bf0d1 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/BloomTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/BloomTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations.bloom; +package com.redis.spring.annotations.bloom; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -8,9 +8,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.annotations.bloom.fixtures.Person; -import com.redislabs.spring.annotations.bloom.fixtures.PersonRepository; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.annotations.bloom.fixtures.Person; +import com.redis.spring.annotations.bloom.fixtures.PersonRepository; public class BloomTest extends AbstractBaseTest { diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/EmailTaken.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/EmailTaken.java similarity index 55% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/EmailTaken.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/EmailTaken.java index d56cd51e..bbeb5d46 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/EmailTaken.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/EmailTaken.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations.bloom.fixtures; +package com.redis.spring.annotations.bloom.fixtures; public interface EmailTaken { boolean isEmailTaken(String email); diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/EmailTakenImpl.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/EmailTakenImpl.java similarity index 69% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/EmailTakenImpl.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/EmailTakenImpl.java index 90c73b4c..6309c370 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/EmailTakenImpl.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/EmailTakenImpl.java @@ -1,9 +1,9 @@ -package com.redislabs.spring.annotations.bloom.fixtures; +package com.redis.spring.annotations.bloom.fixtures; import org.springframework.beans.factory.annotation.Autowired; -import com.redislabs.spring.ops.RedisModulesOperations; -import com.redislabs.spring.ops.pds.BloomOperations; +import com.redis.spring.ops.RedisModulesOperations; +import com.redis.spring.ops.pds.BloomOperations; public class EmailTakenImpl implements EmailTaken { diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/Person.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/Person.java similarity index 84% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/Person.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/Person.java index d7a9388d..ae5af4e6 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/Person.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/Person.java @@ -1,9 +1,9 @@ -package com.redislabs.spring.annotations.bloom.fixtures; +package com.redis.spring.annotations.bloom.fixtures; import org.springframework.data.annotation.Id; import org.springframework.data.redis.core.RedisHash; -import com.redislabs.spring.annotations.Bloom; +import com.redis.spring.annotations.Bloom; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/PersonRepository.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/PersonRepository.java similarity index 78% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/PersonRepository.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/PersonRepository.java index 24ddcc43..7024fe41 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/bloom/fixtures/PersonRepository.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/bloom/fixtures/PersonRepository.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations.bloom.fixtures; +package com.redis.spring.annotations.bloom.fixtures; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/BasicRedisDocumentMappingTest.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/BasicRedisDocumentMappingTest.java similarity index 79% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/BasicRedisDocumentMappingTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/BasicRedisDocumentMappingTest.java index 95d9e0a4..61f9a4c2 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/BasicRedisDocumentMappingTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/BasicRedisDocumentMappingTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations.document; +package com.redis.spring.annotations.document; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -8,9 +8,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.annotations.document.fixtures.Company; -import com.redislabs.spring.annotations.document.fixtures.CompanyRepository; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.annotations.document.fixtures.Company; +import com.redis.spring.annotations.document.fixtures.CompanyRepository; public class BasicRedisDocumentMappingTest extends AbstractBaseTest { @Autowired diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/RedisDocumentSearchTest.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/RedisDocumentSearchTest.java similarity index 91% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/RedisDocumentSearchTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/RedisDocumentSearchTest.java index ecb3e994..14c985d2 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/RedisDocumentSearchTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/RedisDocumentSearchTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations.document; +package com.redis.spring.annotations.document; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -17,9 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.annotations.document.fixtures.MyDoc; -import com.redislabs.spring.annotations.document.fixtures.MyDocRepository; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.annotations.document.fixtures.MyDoc; +import com.redis.spring.annotations.document.fixtures.MyDocRepository; import io.redisearch.AggregationResult; import io.redisearch.Document; @@ -53,7 +53,7 @@ public void cleanUp() { public void testBasicCrudOperations() { assertEquals(1, repository.count()); - Set keys = template.opsForSet().members("com.redislabs.spring.annotations.document.fixtures.MyDoc"); + Set keys = template.opsForSet().members(MyDoc.class.getName()); String id = keys.iterator().next(); diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/Company.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/Company.java similarity index 73% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/Company.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/Company.java index 3543aced..2e571afe 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/Company.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/Company.java @@ -1,9 +1,9 @@ -package com.redislabs.spring.annotations.document.fixtures; +package com.redis.spring.annotations.document.fixtures; import org.springframework.data.annotation.Id; -import com.redislabs.spring.annotations.Document; -import com.redislabs.spring.annotations.TextIndexed; +import com.redis.spring.annotations.Document; +import com.redis.spring.annotations.TextIndexed; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/CompanyRepository.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/CompanyRepository.java similarity index 56% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/CompanyRepository.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/CompanyRepository.java index 5de7e359..487fd44b 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/CompanyRepository.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/CompanyRepository.java @@ -1,8 +1,8 @@ -package com.redislabs.spring.annotations.document.fixtures; +package com.redis.spring.annotations.document.fixtures; import java.util.List; -import com.redislabs.spring.repository.RedisDocumentRepository; +import com.redis.spring.repository.RedisDocumentRepository; public interface CompanyRepository extends RedisDocumentRepository { List findByName(String companyName); diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDoc.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDoc.java similarity index 72% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDoc.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDoc.java index 75da08a7..c3659161 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDoc.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDoc.java @@ -1,13 +1,13 @@ -package com.redislabs.spring.annotations.document.fixtures; +package com.redis.spring.annotations.document.fixtures; import java.util.HashSet; import java.util.Set; import org.springframework.data.annotation.Id; -import com.redislabs.spring.annotations.Document; -import com.redislabs.spring.annotations.TagIndexed; -import com.redislabs.spring.annotations.TextIndexed; +import com.redis.spring.annotations.Document; +import com.redis.spring.annotations.TagIndexed; +import com.redis.spring.annotations.TextIndexed; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocQueries.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocQueries.java similarity index 64% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocQueries.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocQueries.java index 67ff9673..641d0d25 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocQueries.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocQueries.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations.document.fixtures; +package com.redis.spring.annotations.document.fixtures; import java.util.Optional; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocQueriesImpl.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocQueriesImpl.java similarity index 82% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocQueriesImpl.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocQueriesImpl.java index 6d71ab77..5a82de20 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocQueriesImpl.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocQueriesImpl.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.annotations.document.fixtures; +package com.redis.spring.annotations.document.fixtures; import java.util.Optional; @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.gson.Gson; -import com.redislabs.spring.ops.RedisModulesOperations; -import com.redislabs.spring.ops.search.SearchOperations; +import com.redis.spring.ops.RedisModulesOperations; +import com.redis.spring.ops.search.SearchOperations; import io.redisearch.Document; import io.redisearch.Query; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocRepository.java b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocRepository.java similarity index 82% rename from redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocRepository.java rename to redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocRepository.java index f5050655..de4188c1 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/annotations/document/fixtures/MyDocRepository.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/annotations/document/fixtures/MyDocRepository.java @@ -1,12 +1,12 @@ -package com.redislabs.spring.annotations.document.fixtures; +package com.redis.spring.annotations.document.fixtures; import java.util.Set; import org.springframework.data.repository.query.Param; -import com.redislabs.spring.annotations.Aggregation; -import com.redislabs.spring.annotations.Query; -import com.redislabs.spring.repository.RedisDocumentRepository; +import com.redis.spring.annotations.Aggregation; +import com.redis.spring.annotations.Query; +import com.redis.spring.repository.RedisDocumentRepository; import io.redisearch.AggregationResult; import io.redisearch.SearchResult; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/client/RedisModulesClientTest.java b/redis-spring-modules/src/test/java/com/redis/spring/client/RedisModulesClientTest.java similarity index 95% rename from redis-spring-modules/src/test/java/com/redislabs/spring/client/RedisModulesClientTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/client/RedisModulesClientTest.java index 5aed74c7..98eecc84 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/client/RedisModulesClientTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/client/RedisModulesClientTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.client; +package com.redis.spring.client; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,11 +7,11 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.gson.Gson; +import com.redis.spring.AbstractBaseTest; import com.redislabs.modules.rejson.JReJSON; import com.redislabs.redisai.RedisAI; import com.redislabs.redisgraph.impl.api.RedisGraph; import com.redislabs.redistimeseries.RedisTimeSeries; -import com.redislabs.spring.AbstractBaseTest; import io.redisearch.Client; diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/ai/OpsForAITest.java b/redis-spring-modules/src/test/java/com/redis/spring/ops/ai/OpsForAITest.java similarity index 94% rename from redis-spring-modules/src/test/java/com/redislabs/spring/ops/ai/OpsForAITest.java rename to redis-spring-modules/src/test/java/com/redis/spring/ops/ai/OpsForAITest.java index bf60c4a8..542c136a 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/ai/OpsForAITest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/ops/ai/OpsForAITest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.ai; +package com.redis.spring.ops.ai; import java.io.File; @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.ops.RedisModulesOperations; import com.redislabs.redisai.Backend; import com.redislabs.redisai.Device; import com.redislabs.redisai.Tensor; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.ops.RedisModulesOperations; public class OpsForAITest extends AbstractBaseTest { @Autowired diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/graph/OpsForGraphTest.java b/redis-spring-modules/src/test/java/com/redis/spring/ops/graph/OpsForGraphTest.java similarity index 94% rename from redis-spring-modules/src/test/java/com/redislabs/spring/ops/graph/OpsForGraphTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/ops/graph/OpsForGraphTest.java index 2b872c9f..097ebfa2 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/graph/OpsForGraphTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/ops/graph/OpsForGraphTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.graph; +package com.redis.spring.ops.graph; import java.util.List; @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.ops.RedisModulesOperations; import com.redislabs.redisgraph.Header; import com.redislabs.redisgraph.ResultSet; import com.redislabs.redisgraph.Statistics.Label; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.ops.RedisModulesOperations; public class OpsForGraphTest extends AbstractBaseTest { @Autowired diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/json/OpsForJSONTest.java b/redis-spring-modules/src/test/java/com/redis/spring/ops/json/OpsForJSONTest.java similarity index 86% rename from redis-spring-modules/src/test/java/com/redislabs/spring/ops/json/OpsForJSONTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/ops/json/OpsForJSONTest.java index 44712f6a..c85d9832 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/json/OpsForJSONTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/ops/json/OpsForJSONTest.java @@ -1,12 +1,12 @@ -package com.redislabs.spring.ops.json; +package com.redis.spring.ops.json; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.ops.RedisModulesOperations; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.ops.RedisModulesOperations; public class OpsForJSONTest extends AbstractBaseTest { diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/pds/OpsForPDSesTest.java b/redis-spring-modules/src/test/java/com/redis/spring/ops/pds/OpsForPDSesTest.java similarity index 86% rename from redis-spring-modules/src/test/java/com/redislabs/spring/ops/pds/OpsForPDSesTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/ops/pds/OpsForPDSesTest.java index 239b7ac1..70de8622 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/pds/OpsForPDSesTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/ops/pds/OpsForPDSesTest.java @@ -1,12 +1,12 @@ -package com.redislabs.spring.ops.pds; +package com.redis.spring.ops.pds; import static org.junit.jupiter.api.Assertions.assertNotNull; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.ops.RedisModulesOperations; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.ops.RedisModulesOperations; public class OpsForPDSesTest extends AbstractBaseTest { @Autowired diff --git a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/search/OpsForSearchTest.java b/redis-spring-modules/src/test/java/com/redis/spring/ops/search/OpsForSearchTest.java similarity index 94% rename from redis-spring-modules/src/test/java/com/redislabs/spring/ops/search/OpsForSearchTest.java rename to redis-spring-modules/src/test/java/com/redis/spring/ops/search/OpsForSearchTest.java index 592453a9..ec0498fa 100644 --- a/redis-spring-modules/src/test/java/com/redislabs/spring/ops/search/OpsForSearchTest.java +++ b/redis-spring-modules/src/test/java/com/redis/spring/ops/search/OpsForSearchTest.java @@ -1,4 +1,4 @@ -package com.redislabs.spring.ops.search; +package com.redis.spring.ops.search; import static org.junit.Assert.assertEquals; @@ -11,8 +11,8 @@ import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; -import com.redislabs.spring.AbstractBaseTest; -import com.redislabs.spring.ops.RedisModulesOperations; +import com.redis.spring.AbstractBaseTest; +import com.redis.spring.ops.RedisModulesOperations; import io.redisearch.Query; import io.redisearch.Schema;