Allow customizing mongo collection name in environment configuration (#3328)

* Allow customizing mongo collection name in environment configuration

* Upgrade core to get netty fix

Author: radovanradic

Diff for: data-mongodb/src/main/java/io/micronaut/data/mongodb/init/AbstractMongoCollectionsCreator.java

@@ -31,6 +31,7 @@
 import io.micronaut.data.model.PersistentProperty;
 import io.micronaut.data.model.naming.NamingStrategy;
 import io.micronaut.data.model.runtime.RuntimeEntityRegistry;
+import io.micronaut.data.mongodb.operations.MongoCollectionNameProvider;
 import io.micronaut.inject.qualifiers.Qualifiers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -80,10 +81,12 @@ protected <M> M getMongoFactory(Class<M> mongoFactoryClass, BeanLocator beanLoca
      * @param runtimeEntityRegistry      The entity registry
      * @param mongoConfigurations        The configuration
      * @param databaseOperationsProvider The database provider
+     * @param mongoCollectionNameProvider The Mongo collection name provider
      */
     protected void initialize(RuntimeEntityRegistry runtimeEntityRegistry,
                               List<AbstractMongoConfiguration> mongoConfigurations,
-                              DatabaseOperationsProvider<Dtbs> databaseOperationsProvider) {
+                              DatabaseOperationsProvider<Dtbs> databaseOperationsProvider,
+                              MongoCollectionNameProvider mongoCollectionNameProvider) {
 
         for (AbstractMongoConfiguration mongoConfiguration : mongoConfigurations) {
             // TODO: different initializer per conf
@@ -99,7 +102,7 @@ protected void initialize(RuntimeEntityRegistry runtimeEntityRegistry,
             for (PersistentEntity entity : entities) {
                 Dtbs database = databaseOperations.find(entity);
                 Set<String> collections = databaseOperations.listCollectionNames(database);
-                String persistedName = entity.getPersistedName();
+                String persistedName = mongoCollectionNameProvider.provide(entity);
                 if (collections.add(persistedName)) {
                     if (LOG.isInfoEnabled()) {
                         LOG.info("Creating collection: {} in database: {}", persistedName, databaseOperations.getDatabaseName(database));

Diff for: data-mongodb/src/main/java/io/micronaut/data/mongodb/init/MongoCollectionsCreator.java

@@ -28,6 +28,7 @@
 import io.micronaut.data.model.runtime.RuntimeEntityRegistry;
 import io.micronaut.data.mongodb.conf.MongoDataConfiguration;
 import io.micronaut.data.mongodb.conf.RequiresSyncMongo;
+import io.micronaut.data.mongodb.operations.MongoCollectionNameProvider;
 import io.micronaut.data.mongodb.operations.MongoDatabaseNameProvider;
 import jakarta.annotation.PostConstruct;
 
@@ -52,7 +53,8 @@ public final class MongoCollectionsCreator extends AbstractMongoCollectionsCreat
     @PostConstruct
     void initialize(BeanLocator beanLocator,
                     RuntimeEntityRegistry runtimeEntityRegistry,
-                    List<AbstractMongoConfiguration> mongoConfigurations) {
+                    List<AbstractMongoConfiguration> mongoConfigurations,
+                    MongoCollectionNameProvider mongoCollectionNameProvider) {
 
         super.initialize(runtimeEntityRegistry, mongoConfigurations, mongoConfiguration -> {
             MongoClient mongoClient = getMongoFactory(MongoClient.class, beanLocator, mongoConfiguration);
@@ -80,7 +82,7 @@ public void createCollection(MongoDatabase database, String collection) {
                     database.createCollection(collection);
                 }
             };
-        });
+        }, mongoCollectionNameProvider);
     }
 
 }

Diff for: data-mongodb/src/main/java/io/micronaut/data/mongodb/init/MongoReactiveCollectionsCreator.java

@@ -27,6 +27,7 @@
 import io.micronaut.data.model.runtime.RuntimeEntityRegistry;
 import io.micronaut.data.mongodb.conf.MongoDataConfiguration;
 import io.micronaut.data.mongodb.conf.RequiresReactiveMongo;
+import io.micronaut.data.mongodb.operations.MongoCollectionNameProvider;
 import io.micronaut.data.mongodb.operations.MongoDatabaseNameProvider;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -53,7 +54,8 @@ public final class MongoReactiveCollectionsCreator extends AbstractMongoCollecti
     @PostConstruct
     void initialize(BeanLocator beanLocator,
                     RuntimeEntityRegistry runtimeEntityRegistry,
-                    List<AbstractMongoConfiguration> mongoConfigurations) {
+                    List<AbstractMongoConfiguration> mongoConfigurations,
+                    MongoCollectionNameProvider mongoCollectionNameProvider) {
 
         super.initialize(runtimeEntityRegistry, mongoConfigurations, mongoConfiguration -> {
             MongoClient mongoClient = getMongoFactory(MongoClient.class, beanLocator, mongoConfiguration);
@@ -81,7 +83,7 @@ public void createCollection(MongoDatabase database, String collection) {
                     Mono.from(database.createCollection(collection)).block();
                 }
             };
-        });
+        }, mongoCollectionNameProvider);
     }
 
 }

Diff for: data-mongodb/src/main/java/io/micronaut/data/mongodb/operations/DefaultMongoCollectionNameProvider.java

@@ -16,7 +16,10 @@
 package io.micronaut.data.mongodb.operations;
 
 import io.micronaut.context.annotation.Requires;
+import io.micronaut.context.env.Environment;
+import io.micronaut.context.env.PropertyPlaceholderResolver;
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.data.model.PersistentEntity;
 import jakarta.inject.Singleton;
 
@@ -31,9 +34,20 @@
 @Internal
 public final class DefaultMongoCollectionNameProvider implements MongoCollectionNameProvider {
 
+    @Nullable
+    private final PropertyPlaceholderResolver propertyPlaceholderResolver;
+
+    DefaultMongoCollectionNameProvider(@Nullable Environment environment) {
+        this.propertyPlaceholderResolver = environment != null ? environment.getPlaceholderResolver() : null;
+    }
+
     @Override
     public String provide(PersistentEntity persistentEntity) {
-        return persistentEntity.getPersistedName();
+        String persistedName = persistentEntity.getPersistedName();
+        if (propertyPlaceholderResolver != null && persistedName.contains(propertyPlaceholderResolver.getPrefix())) {
+            persistedName = propertyPlaceholderResolver.resolveRequiredPlaceholders(persistedName);
+        }
+        return persistedName;
     }
 
 }

Diff for: doc-examples/mongo-example-java/src/main/java/example/Manufacturer.java

@@ -7,7 +7,7 @@
 import io.micronaut.data.annotation.MappedEntity;
 import org.bson.types.ObjectId;
 
-@MappedEntity
+@MappedEntity("${mapping.custom.manufacturer}")
 public class Manufacturer {
     @Id
     @GeneratedValue

Diff for: doc-examples/mongo-example-java/src/main/java/example/Product.java

@@ -8,7 +8,7 @@
 import io.micronaut.data.annotation.Relation;
 import org.bson.types.ObjectId;
 
-@MappedEntity
+@MappedEntity("${mapping.custom.product}")
 public class Product {
 
     @Id

Diff for: doc-examples/mongo-example-java/src/main/resources/application.yml

@@ -4,3 +4,7 @@ micronaut:
   data:
     mongodb:
       create-collections: true
+mapping:
+  custom:
+    product: col_product
+    manufacturer: col_manufacturer

Diff for: gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-micronaut = "4.7.13"
+micronaut = "4.7.14"
 micronaut-platform = "4.7.4"
 micronaut-docs = "2.0.0"
 micronaut-gradle-plugin = "4.4.5"