Reorganize MongoDb resources (#7158)

jhipster · Aug 11, 2023 · 2179564 · 2179564
1 parent 036c806
commit 2179564
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/...ipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java b/...ipster/lite/generator/server/springboot/database/mongodb/domain/MongoDbModuleFactory.java
@@ -14,6 +14,8 @@
 public class MongoDbModuleFactory {
 
   private static final JHipsterSource SOURCE = from("server/springboot/database/mongodb");
+  private static final JHipsterSource MAIN_SOURCE = SOURCE.append("main");
+  private static final JHipsterSource TEST_SOURCE = SOURCE.append("test");
 
   private static final String MONGO_SECONDARY = "technical/infrastructure/secondary/mongodb";
   private static final String DOCKER_COMPOSE_COMMAND = "docker compose -f src/main/docker/mongodb.yml up -d";
@@ -45,15 +47,15 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
         .and()
       .files()
         .add(SOURCE.template("mongodb.yml"), toSrcMainDocker().append("mongodb.yml"))
-        .batch(SOURCE, toSrcMainJava().append(packagePath).append(MONGO_SECONDARY))
+        .batch(MAIN_SOURCE, toSrcMainJava().append(packagePath).append(MONGO_SECONDARY))
           .addTemplate("MongodbDatabaseConfiguration.java")
           .addTemplate("JSR310DateConverters.java")
           .and()
         .add(
-              SOURCE.template("JSR310DateConvertersTest.java"),
+              TEST_SOURCE.template("JSR310DateConvertersTest.java"),
               toSrcTestJava().append(packagePath).append(MONGO_SECONDARY).append("JSR310DateConvertersTest.java")
             )
-        .add(SOURCE.template("TestMongoDBManager.java"), toSrcTestJava().append(packagePath).append("TestMongoDBManager.java"))
+        .add(TEST_SOURCE.template("TestMongoDBManager.java"), toSrcTestJava().append(packagePath).append("TestMongoDBManager.java"))
         .and()
       .springMainProperties()
         .set(propertyKey("spring.data.mongodb.database"), propertyValue(properties.projectBaseName().get()))

diff --git a/...ongodb/JSR310DateConverters.java.mustache → ...b/main/JSR310DateConverters.java.mustache b/...ongodb/JSR310DateConverters.java.mustache → ...b/main/JSR310DateConverters.java.mustache
diff --git a/...ongodbDatabaseConfiguration.java.mustache → ...ongodbDatabaseConfiguration.java.mustache b/...ongodbDatabaseConfiguration.java.mustache → ...ongodbDatabaseConfiguration.java.mustache
diff --git a/...db/JSR310DateConvertersTest.java.mustache → ...st/JSR310DateConvertersTest.java.mustache b/...db/JSR310DateConvertersTest.java.mustache → ...st/JSR310DateConvertersTest.java.mustache
diff --git a/.../mongodb/TestMongoDBManager.java.mustache → ...odb/test/TestMongoDBManager.java.mustache b/.../mongodb/TestMongoDBManager.java.mustache → ...odb/test/TestMongoDBManager.java.mustache