[NAE-2371] Automatic collection creation after drop

application-engine/src/main/java/com/netgrif/application/engine/configuration/MongoIndexesConfigurator.java → application-engine/src/main/java/com/netgrif/application/engine/configuration/MongoCollectionConfigurator.java

@@ -1,6 +1,6 @@
 package com.netgrif.application.engine.configuration;
 
-import com.netgrif.application.engine.adapter.spring.configuration.AbstractMongoIndexesConfigurator;
+import com.netgrif.application.engine.adapter.spring.configuration.AbstractMongoCollectionConfigurator;
 import com.netgrif.application.engine.configuration.properties.DataConfigurationProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -11,12 +11,12 @@
 
 @Slf4j
 @Component
-public class MongoIndexesConfigurator extends AbstractMongoIndexesConfigurator {
+public class MongoCollectionConfigurator extends AbstractMongoCollectionConfigurator {
 
     private final DataConfigurationProperties.MongoProperties mongoProperties;
 
-    public MongoIndexesConfigurator(MongoTemplate mongoTemplate,
-                                    DataConfigurationProperties.MongoProperties mongoProperties) {
+    public MongoCollectionConfigurator(MongoTemplate mongoTemplate,
+                                       DataConfigurationProperties.MongoProperties mongoProperties) {
         super(mongoTemplate);
         this.mongoProperties = mongoProperties;
     }

application-engine/src/main/java/com/netgrif/application/engine/startup/runner/MongoDbRunner.java

@@ -1,6 +1,6 @@
 package com.netgrif.application.engine.startup.runner;
 
-import com.netgrif.application.engine.configuration.MongoIndexesConfigurator;
+import com.netgrif.application.engine.configuration.MongoCollectionConfigurator;
 import com.netgrif.application.engine.configuration.properties.DataConfigurationProperties;
 import com.netgrif.application.engine.startup.ApplicationEngineStartupRunner;
 import com.netgrif.application.engine.startup.annotation.RunnerOrder;
@@ -22,19 +22,21 @@ public class MongoDbRunner implements ApplicationEngineStartupRunner {
 
     private final MongoTemplate mongoTemplate;
 
-    private final MongoIndexesConfigurator mongoIndexesConfigurator;
+    private final MongoCollectionConfigurator mongoCollectionConfigurator;
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
         if (mongoProperties.getDrop()) {
-            if (mongoProperties.getHost() != null && mongoProperties.getPort() != null)
+            if (mongoProperties.getHost() != null && mongoProperties.getPort() != null) {
                 log.info("Dropping Mongo database {}:{}/{}", mongoProperties.getHost(), mongoProperties.getPort(), mongoProperties.getDatabase());
-            else if (mongoProperties.getUri() != null)
+            } else if (mongoProperties.getUri() != null) {
                 log.info("Dropping Mongo database {}", mongoProperties.getUri());
+            }
             mongoTemplate.getDb().drop();
+            mongoCollectionConfigurator.resolveCollections();
         }
         if (mongoProperties.getRunnerEnsureIndex()) {
-            mongoIndexesConfigurator.resolveIndexes();
+            mongoCollectionConfigurator.resolveIndexes();
         }
     }
 

nae-object-library/src/main/java/com/netgrif/application/engine/objects/annotations/Indexable.java → nae-object-library/src/main/java/com/netgrif/application/engine/objects/annotations/EnsureCollection.java

@@ -5,5 +5,5 @@
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
-public @interface Indexable {
+public @interface EnsureCollection {
 }

nae-object-library/src/main/java/com/netgrif/application/engine/objects/petrinet/domain/PetriNet.java

@@ -1,6 +1,6 @@
 package com.netgrif.application.engine.objects.petrinet.domain;
 
-import com.netgrif.application.engine.objects.annotations.Indexable;
+import com.netgrif.application.engine.objects.annotations.EnsureCollection;
 import com.netgrif.application.engine.objects.annotations.Indexed;
 import com.netgrif.application.engine.objects.auth.domain.ActorRef;
 import com.netgrif.application.engine.objects.petrinet.domain.arcs.Arc;
@@ -26,7 +26,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Indexable
+@EnsureCollection
 @QueryEntity
 public abstract class PetriNet extends PetriNetObject {
 

nae-object-library/src/main/java/com/netgrif/application/engine/objects/petrinet/domain/roles/ProcessRole.java

@@ -1,5 +1,7 @@
 package com.netgrif.application.engine.objects.petrinet.domain.roles;
 
+import com.netgrif.application.engine.objects.annotations.EnsureCollection;
+import com.netgrif.application.engine.objects.annotations.Indexed;
 import com.netgrif.application.engine.objects.petrinet.domain.I18nString;
 import com.netgrif.application.engine.objects.petrinet.domain.Imported;
 import com.netgrif.application.engine.objects.petrinet.domain.dataset.logic.action.Action;
@@ -19,6 +21,7 @@
 import java.util.Map;
 
 @Getter
+@EnsureCollection
 @QueryEntity
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
 public abstract class ProcessRole extends Imported {
@@ -30,6 +33,7 @@ public abstract class ProcessRole extends Imported {
     public static final String GLOBAL = "global_";
 
     @Setter
+    @Indexed
     private boolean global;
 
     @Getter
@@ -39,9 +43,11 @@ public abstract class ProcessRole extends Imported {
     private I18nString name;
 
     @Setter
+    @Indexed
     private String processId;
 
     @Setter
+    @Indexed
     private String processIdentifier;
 
     @Setter

nae-object-library/src/main/java/com/netgrif/application/engine/objects/workflow/domain/Case.java

@@ -1,7 +1,7 @@
 package com.netgrif.application.engine.objects.workflow.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.netgrif.application.engine.objects.annotations.Indexable;
+import com.netgrif.application.engine.objects.annotations.EnsureCollection;
 import com.netgrif.application.engine.objects.auth.domain.ActorRef;
 import com.netgrif.application.engine.objects.annotations.Indexed;
 import com.netgrif.application.engine.objects.petrinet.domain.I18nString;
@@ -24,7 +24,7 @@
 import java.util.stream.Collectors;
 
 @Getter
-@Indexable
+@EnsureCollection
 @QueryEntity
 public abstract class Case implements Serializable {
 

nae-object-library/src/main/java/com/netgrif/application/engine/objects/workflow/domain/Task.java

@@ -1,7 +1,7 @@
 package com.netgrif.application.engine.objects.workflow.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.netgrif.application.engine.objects.annotations.Indexable;
+import com.netgrif.application.engine.objects.annotations.EnsureCollection;
 import com.netgrif.application.engine.objects.annotations.Indexed;
 import com.netgrif.application.engine.objects.auth.domain.AbstractUser;
 import com.netgrif.application.engine.objects.petrinet.domain.I18nString;
@@ -26,7 +26,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 @QueryEntity
-@Indexable
+@EnsureCollection
 @AllArgsConstructor
 public abstract class Task implements Serializable {
 

nae-spring-core-adapter/src/main/java/com/netgrif/application/engine/adapter/spring/configuration/AbstractMongoIndexesConfigurator.java → nae-spring-core-adapter/src/main/java/com/netgrif/application/engine/adapter/spring/configuration/AbstractMongoCollectionConfigurator.java

@@ -1,6 +1,6 @@
 package com.netgrif.application.engine.adapter.spring.configuration;
 
-import com.netgrif.application.engine.objects.annotations.Indexable;
+import com.netgrif.application.engine.objects.annotations.EnsureCollection;
 import com.netgrif.application.engine.objects.annotations.Indexed;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.reflect.FieldUtils;
@@ -19,13 +19,13 @@
 import java.util.stream.StreamSupport;
 
 @Slf4j
-public abstract class AbstractMongoIndexesConfigurator {
+public abstract class AbstractMongoCollectionConfigurator {
 
     private final MongoTemplate mongoTemplate;
     private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
     private final IndexResolver resolver;
 
-    public AbstractMongoIndexesConfigurator(MongoTemplate mongoTemplate) {
+    public AbstractMongoCollectionConfigurator(MongoTemplate mongoTemplate) {
         this.mongoTemplate = mongoTemplate;
         this.mappingContext = mongoTemplate.getConverter().getMappingContext();
         this.resolver = new MongoPersistentEntityIndexResolver(mappingContext);
@@ -34,10 +34,21 @@ public AbstractMongoIndexesConfigurator(MongoTemplate mongoTemplate) {
     public abstract MultiValueMap<Class<?>, String> getIndexes();
     public abstract List<Class<?>> getEntityIndexBlacklist();
 
+    public void resolveCollections() {
+        mappingContext.getPersistentEntities()
+                .stream()
+                .filter(it -> it.isAnnotationPresent(EnsureCollection.class) && !getEntityIndexBlacklist().contains(it.getType()))
+                .forEach(mongoPersistentEntity -> {
+                    if (!mongoTemplate.collectionExists(mongoPersistentEntity.getCollection())) {
+                        mongoTemplate.createCollection(mongoPersistentEntity.getCollection());
+                    }
+                });
+    }
+
     public void resolveIndexes() {
         mappingContext.getPersistentEntities()
                 .stream()
-                .filter(it -> it.isAnnotationPresent(Indexable.class) && !getEntityIndexBlacklist().contains(it.getType()))
+                .filter(it -> it.isAnnotationPresent(EnsureCollection.class) && !getEntityIndexBlacklist().contains(it.getType()))
                 .forEach(mongoPersistentEntity -> resolveIndexes(mongoPersistentEntity.getCollection(), mongoPersistentEntity.getType()));
     }
 

nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/RealmServiceImpl.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.netgrif.application.engine.adapter.spring.configuration.AbstractMongoIndexesConfigurator;
+import com.netgrif.application.engine.adapter.spring.configuration.AbstractMongoCollectionConfigurator;
 import com.netgrif.application.engine.auth.provider.AbstractAuthConfig;
 import com.netgrif.application.engine.auth.provider.AuthMethodProvider;
 import com.netgrif.application.engine.auth.provider.CollectionNameProvider;
@@ -44,13 +44,13 @@ public class RealmServiceImpl implements RealmService {
     @Autowired
     private AnonymousUserRefService anonymousUserRefService;
 
-    private AbstractMongoIndexesConfigurator mongoIndexesConfigurator;
+    private AbstractMongoCollectionConfigurator mongoCollectionConfigurator;
 
     private CollectionNameProvider collectionNameProvider;
 
     @Autowired
-    public void setMongoIndexesConfigurator(AbstractMongoIndexesConfigurator mongoIndexesConfigurator) {
-        this.mongoIndexesConfigurator = mongoIndexesConfigurator;
+    public void setMongoCollectionConfigurator(AbstractMongoCollectionConfigurator mongoCollectionConfigurator) {
+        this.mongoCollectionConfigurator = mongoCollectionConfigurator;
     }
 
     @Lazy
@@ -78,7 +78,7 @@ public Realm createRealm(Realm createRequest) {
         if (!mongoTemplate.collectionExists(collectionName)) {
             try {
                 mongoTemplate.createCollection(collectionName);
-                mongoIndexesConfigurator.resolveIndexes(collectionName, User.class);
+                mongoCollectionConfigurator.resolveIndexes(collectionName, User.class);
             } catch (Exception e) {
                 log.error("Error occurred while creating collection for realm {}", realm.getName(), e);
                 realmRepository.delete(realm);