Add support for Executables in DatabaseShardedMongoTemplate (#52)

* Fix some examples * Add support to Executables for DatabaseShardedMongoTemplate * Fix some Javadocs * Fix existing Unittests * Fix NPEs
shashankrnr32 · Apr 18, 2023 · 2756660 · 2756660
1 parent 7cd5fb5
commit 2756660
Show file tree

Hide file tree

Showing 29 changed files with 693 additions and 96 deletions.
diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
         <lombok.version>1.18.26</lombok.version>
         <apache.commons.lang3.version>3.12.0</apache.commons.lang3.version>
         <apache.commons.collection.version>3.2.2</apache.commons.collection.version>
-        <spring.data.mongodb.version>3.3.10</spring.data.mongodb.version>
+        <spring.data.mongodb.version>3.4.10</spring.data.mongodb.version>
         <mongodb.driver.version>4.8.2</mongodb.driver.version>
         <reactor.core.version>3.5.4</reactor.core.version>
         <mockito.inline.version>3.12.4</mockito.inline.version>

diff --git a/...g-example/src/main/java/com/alpha/mongodb/sharding/example/api/ShardingOperationsAPI.java b/...g-example/src/main/java/com/alpha/mongodb/sharding/example/api/ShardingOperationsAPI.java
@@ -52,8 +52,27 @@ public ResponseEntity<?> insert(@RequestBody EntityDTO testShardedEntity,
                                     @RequestParam ShardingType shardingType,
                                     @RequestParam DataSourceType dataSourceType,
                                     @RequestParam boolean reactive) {
-        serviceFactory.get(shardingType, dataSourceType, reactive).insert(testShardedEntity);
-        return ResponseEntity.noContent().build();
+        EntityDTO persistedEntityDTO = serviceFactory.get(shardingType, dataSourceType, reactive).insert(testShardedEntity);
+        return ResponseEntity.ok(persistedEntityDTO.getId());
+    }
+
+    @GetMapping(path = "/find/indexed/{value}")
+    public ResponseEntity<?> findByIndexedField(@PathVariable String value,
+                                                @RequestParam @Nullable String collectionShardHint,
+                                                @RequestParam @Nullable String databaseShardHint,
+                                                @RequestParam ShardingType shardingType,
+                                                @RequestParam DataSourceType dataSourceType,
+                                                @RequestParam boolean reactive) {
+        if (StringUtils.isNotBlank(collectionShardHint)) {
+            ShardingHintManager.setCollectionHint(collectionShardHint);
+            ShardingHintManager.setDatabaseHint(databaseShardHint);
+        }
+        Optional<?> entityOptional = serviceFactory.get(shardingType, dataSourceType, reactive).findByIndexedField(value);
+        if (entityOptional.isPresent()) {
+            return ResponseEntity.ok(entityOptional);
+        } else {
+            return ResponseEntity.notFound().build();
+        }
     }
 
 }
diff --git a/sharding-example/src/main/java/com/alpha/mongodb/sharding/example/api/models/EntityDTO.java b/sharding-example/src/main/java/com/alpha/mongodb/sharding/example/api/models/EntityDTO.java
@@ -5,6 +5,7 @@
 
 @Data
 public class EntityDTO {
+    private String id;
     private String indexedField;
 
     public TestShardedEntity toEntity() {

diff --git a/...ng-example/src/main/java/com/alpha/mongodb/sharding/example/entity/TestShardedEntity.java b/...ng-example/src/main/java/com/alpha/mongodb/sharding/example/entity/TestShardedEntity.java
@@ -34,6 +34,7 @@ public String resolveDatabaseHint() {
     public EntityDTO toDTO() {
         EntityDTO entityDTO = new EntityDTO();
         entityDTO.setIndexedField(indexedField);
+        entityDTO.setId(id);
         return entityDTO;
     }
 }
diff --git a/...ing/example/repository/collection/reactive/CollectionShardedEntityReactiveRepository.java b/...ing/example/repository/collection/reactive/CollectionShardedEntityReactiveRepository.java
@@ -5,11 +5,9 @@
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Mono;
 
-import java.util.Optional;
-
 @Repository
 public interface CollectionShardedEntityReactiveRepository extends ReactiveMongoRepository<TestShardedEntity, String> {
 
-    Mono<Optional<TestShardedEntity>> findByIndexedField(String indexedField);
+    Mono<TestShardedEntity> findByIndexedField(String indexedField);
 
 }
diff --git a/...godb/sharding/example/repository/database/executable/DatabaseShardedEntityRepository.java b/...godb/sharding/example/repository/database/executable/DatabaseShardedEntityRepository.java
@@ -9,6 +9,6 @@
 @Repository
 public interface DatabaseShardedEntityRepository extends MongoRepository<TestShardedEntity, String> {
 
-    Optional<TestShardedEntity> findByIndexedField(String indexedField);
+    Optional<TestShardedEntity> findOneByIndexedField(String indexedField);
 
 }
diff --git a/...harding/example/repository/database/reactive/DatabaseShardedEntityReactiveRepository.java b/...harding/example/repository/database/reactive/DatabaseShardedEntityReactiveRepository.java
@@ -5,11 +5,9 @@
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Mono;
 
-import java.util.Optional;
-
 @Repository
 public interface DatabaseShardedEntityReactiveRepository extends ReactiveMongoRepository<TestShardedEntity, String> {
 
-    Mono<Optional<TestShardedEntity>> findByIndexedField(String indexedField);
+    Mono<TestShardedEntity> findByIndexedField(String indexedField);
 
 }
diff --git a/...le/src/main/java/com/alpha/mongodb/sharding/example/service/ShardedOperationsService.java b/...le/src/main/java/com/alpha/mongodb/sharding/example/service/ShardedOperationsService.java
@@ -10,5 +10,5 @@ public interface ShardedOperationsService {
 
     Optional<EntityDTO> findByIndexedField(String indexedFieldValue);
 
-    void insert(EntityDTO entity);
+    EntityDTO insert(EntityDTO entity);
 }
diff --git a/.../example/service/impl/repository/ReactiveRepositoryCollectionShardedOperationService.java b/.../example/service/impl/repository/ReactiveRepositoryCollectionShardedOperationService.java
@@ -25,11 +25,12 @@ public Optional<EntityDTO> findById(String id) {
     public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
         return collectionShardedEntityReactiveRepository
                 .findByIndexedField(indexedFieldValue)
-                .map(entityOptional -> entityOptional.map(TestShardedEntity::toDTO)).block();
+                .map(entity -> Optional.ofNullable(entity.toDTO()))
+                .onErrorReturn(Optional.empty()).block();
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        collectionShardedEntityReactiveRepository.insert(entity.toEntity()).block();
+    public EntityDTO insert(EntityDTO entity) {
+        return collectionShardedEntityReactiveRepository.insert(entity.toEntity()).map(TestShardedEntity::toDTO).block();
     }
 }
diff --git a/...ng/example/service/impl/repository/ReactiveRepositoryDatabaseShardedOperationService.java b/...ng/example/service/impl/repository/ReactiveRepositoryDatabaseShardedOperationService.java
@@ -25,11 +25,12 @@ public Optional<EntityDTO> findById(String id) {
     public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
         return databaseShardedEntityReactiveRepository
                 .findByIndexedField(indexedFieldValue)
-                .map(entityOptional -> entityOptional.map(TestShardedEntity::toDTO)).block();
+                .map(entity -> Optional.ofNullable(entity.toDTO()))
+                .onErrorReturn(Optional.empty()).block();
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        databaseShardedEntityReactiveRepository.insert(entity.toEntity()).block();
+    public EntityDTO insert(EntityDTO entity) {
+        return databaseShardedEntityReactiveRepository.insert(entity.toEntity()).map(TestShardedEntity::toDTO).block();
     }
 }
diff --git a/...sharding/example/service/impl/repository/RepositoryCollectionShardedOperationService.java b/...sharding/example/service/impl/repository/RepositoryCollectionShardedOperationService.java
@@ -26,7 +26,7 @@ public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        collectionShardedEntityRepository.insert(entity.toEntity());
+    public EntityDTO insert(EntityDTO entity) {
+        return collectionShardedEntityRepository.insert(entity.toEntity()).toDTO();
     }
 }
diff --git a/...b/sharding/example/service/impl/repository/RepositoryDatabaseShardedOperationService.java b/...b/sharding/example/service/impl/repository/RepositoryDatabaseShardedOperationService.java
@@ -22,11 +22,11 @@ public Optional<EntityDTO> findById(String id) {
 
     @Override
     public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
-        return databaseShardedEntityRepository.findByIndexedField(indexedFieldValue).map(TestShardedEntity::toDTO);
+        return databaseShardedEntityRepository.findOneByIndexedField(indexedFieldValue).map(TestShardedEntity::toDTO);
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        databaseShardedEntityRepository.insert(entity.toEntity());
+    public EntityDTO insert(EntityDTO entity) {
+        return databaseShardedEntityRepository.insert(entity.toEntity()).toDTO();
     }
 }
diff --git a/...ding/example/service/impl/template/ReactiveTemplateCollectionShardedOperationService.java b/...ding/example/service/impl/template/ReactiveTemplateCollectionShardedOperationService.java
@@ -32,7 +32,7 @@ public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        collectionShardedEntityReactiveMongoTemplate.insert(entity.toEntity()).block();
+    public EntityDTO insert(EntityDTO entity) {
+        return collectionShardedEntityReactiveMongoTemplate.insert(entity.toEntity()).map(TestShardedEntity::toDTO).block();
     }
 }
diff --git a/...arding/example/service/impl/template/ReactiveTemplateDatabaseShardedOperationService.java b/...arding/example/service/impl/template/ReactiveTemplateDatabaseShardedOperationService.java
@@ -32,7 +32,7 @@ public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        databaseShardedEntityReactiveMongoTemplate.insert(entity.toEntity()).block();
+    public EntityDTO insert(EntityDTO entity) {
+        return databaseShardedEntityReactiveMongoTemplate.insert(entity.toEntity()).map(TestShardedEntity::toDTO).block();
     }
 }
diff --git a/...odb/sharding/example/service/impl/template/TemplateCollectionShardedOperationService.java b/...odb/sharding/example/service/impl/template/TemplateCollectionShardedOperationService.java
@@ -32,7 +32,7 @@ public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        collectionShardedEntityMongoTemplate.insert(entity.toEntity());
+    public EntityDTO insert(EntityDTO entity) {
+        return collectionShardedEntityMongoTemplate.insert(entity.toEntity()).toDTO();
     }
 }
diff --git a/...ngodb/sharding/example/service/impl/template/TemplateDatabaseShardedOperationService.java b/...ngodb/sharding/example/service/impl/template/TemplateDatabaseShardedOperationService.java
@@ -32,7 +32,7 @@ public Optional<EntityDTO> findByIndexedField(String indexedFieldValue) {
     }
 
     @Override
-    public void insert(EntityDTO entity) {
-        databaseShardedEntityMongoTemplate.insert(entity.toEntity());
+    public EntityDTO insert(EntityDTO entity) {
+        return databaseShardedEntityMongoTemplate.insert(entity.toEntity()).toDTO();
     }
 }