generator-jhipster 9.0.0-beta.0 → 9.0.0-beta.1

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/generator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { mutateData } from "../../../../lib/utils/index.js";
-import { SpringBootApplicationGenerator } from "../../../spring-boot/generator.js";
+import { SpringBootApplicationGenerator } from "../../generator.js";
 import cleanupElasticsearchFilesTask from "./cleanup.js";
 import writeElasticsearchEntityFilesTask, { cleanupElasticsearchEntityFilesTask } from "./entity-files.js";
 import writeElasticsearchFilesTask from "./files.js";
@@ -43,37 +43,71 @@ export default class ElasticsearchGenerator extends SpringBootApplicationGenerat
         return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
     }
     get writing() {
-        return {
+        return this.asWritingTaskGroup({
+            async cleanup({ application, control }) {
+                await control.cleanupFiles({
+                    '9.0.0-beta.1': [
+                        `${application.javaPackageTestDir}config/TestContainersSpringContextCustomizerFactory.java`,
+                        `${application.javaPackageTestDir}config/EmbeddedElasticsearch.java`,
+                        `${application.srcTestResources}META-INF/spring.factories`,
+                    ],
+                });
+            },
             cleanupElasticsearchFilesTask,
             writeElasticsearchFilesTask,
-        };
+        });
     }
     get [SpringBootApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
     get writingEntities() {
-        return {
+        return this.asWritingEntitiesTaskGroup({
             cleanupElasticsearchEntityFilesTask,
             writeElasticsearchEntityFilesTask,
-        };
+        });
     }
     get [SpringBootApplicationGenerator.WRITING_ENTITIES]() {
         return this.delegateTasksToBlueprint(() => this.writingEntities);
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
-            addTestSpringFactory({ source, application }) {
-                source.addTestSpringFactory({
-                    key: 'org.springframework.test.context.ContextCustomizerFactory',
-                    value: `${application.packageName}.config.TestContainersSpringContextCustomizerFactory`,
+            addAnnotations({ application, source }) {
+                source.editJavaFile(`${application.javaPackageSrcDir}${application.mainClass}.java`, {
+                    annotations: [
+                        {
+                            annotation: `Enable${application.emptyOrReactive}ElasticsearchRepositories`,
+                            package: 'org.springframework.data.elasticsearch.repository.config',
+                            parameters: () => `"${application.packageName}.repository.search"`,
+                        },
+                    ],
+                });
+            },
+            integrationTest({ application, source }) {
+                source.editJavaFile(`${application.javaPackageTestDir}IntegrationTest.java`, {
+                    imports: [
+                        `${application.packageName}.config.ElasticsearchTestContainer`,
+                        `${application.packageName}.config.ElasticsearchTestConfiguration`,
+                    ],
+                    annotations: [
+                        {
+                            package: 'org.springframework.boot.testcontainers.context',
+                            annotation: 'ImportTestcontainers',
+                            parameters: (_, cb) => cb.addKeyValue('value', 'ElasticsearchTestContainer.class'),
+                        },
+                        {
+                            package: 'org.springframework.boot.test.context',
+                            annotation: 'SpringBootTest',
+                            parameters: (_, cb) => cb.addKeyValue('classes', 'ElasticsearchTestConfiguration.class'),
+                        },
+                    ],
                 });
             },
             addDependencies({ source }) {
-                source.addSpringBootModule?.('spring-boot-starter-data-elasticsearch');
+                source.addSpringBootModule?.('spring-boot-starter-data-elasticsearch', 'spring-boot-testcontainers');
                 source.addJavaDependencies?.([
                     { scope: 'test', groupId: 'org.awaitility', artifactId: 'awaitility' },
-                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'elasticsearch' },
-                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
+                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers-elasticsearch' },
+                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers-junit-jupiter' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },
                 ]);
             },

package/dist/generators/{spring-data/generators/cassandra → spring-boot/generators/data-elasticsearch}/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/dist/generators/{spring-data/generators/cassandra → spring-boot/generators/data-elasticsearch}/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.

package/dist/generators/spring-boot/generators/data-elasticsearch/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.elastic_search.ejs

@@ -0,0 +1,62 @@
+<%#
+ Copyright 2013-2026 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into the root template if available.
+ EJS fragments will process % delimiter tags in the template and & delimiter tags during the merge process.
+-%>
+<&_ if (fragment.annotationSection) { -&>
+@org.springframework.data.elasticsearch.annotations.Document(indexName = "<%= entityInstance.toLowerCase() %>")
+<&_ } -&>
+
+<%_ for (const field of fields) { -%>
+  <&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+    <%_ if (field.id && field.fieldName != 'id') { _%>
+    @org.springframework.data.annotation.Id
+    <%_ } _%>
+    <%_ if (field.fieldIsEnum) { _%>
+    @org.springframework.data.elasticsearch.annotations.Field(type = org.springframework.data.elasticsearch.annotations.FieldType.Keyword)
+    <%_ } else if (field.blobContentTypeText || field.fieldTypeString) { _%>
+    @org.springframework.data.elasticsearch.annotations.MultiField(
+        mainField = @org.springframework.data.elasticsearch.annotations.Field(type = org.springframework.data.elasticsearch.annotations.FieldType.Text),
+        otherFields = { 
+            @org.springframework.data.elasticsearch.annotations.InnerField(suffix = "keyword", type = org.springframework.data.elasticsearch.annotations.FieldType.Keyword, ignoreAbove = 256)
+        }
+    )
+    <%_ } else if (field.fieldTypeBoolean) { _%>
+    @org.springframework.data.elasticsearch.annotations.Field(type = org.springframework.data.elasticsearch.annotations.FieldType.Boolean)
+    <%_ } else if (field.fieldTypeInteger) { _%>
+    @org.springframework.data.elasticsearch.annotations.Field(type = org.springframework.data.elasticsearch.annotations.FieldType.Integer)
+    <%_ } else if (field.fieldTypeLong) { _%>
+    @org.springframework.data.elasticsearch.annotations.Field(type = org.springframework.data.elasticsearch.annotations.FieldType.Long)
+    <%_ } else if (field.fieldTypeLocalTime) { _%>
+    @org.springframework.data.elasticsearch.annotations.Field(type = org.springframework.data.elasticsearch.annotations.FieldType.Date, format = org.springframework.data.elasticsearch.annotations.DateFormat.hour_minute_second_millis)
+    <%_ } else if (field.fieldTypeInstant) { _%>
+    @org.springframework.data.elasticsearch.annotations.Field(type = org.springframework.data.elasticsearch.annotations.FieldType.Date, format = org.springframework.data.elasticsearch.annotations.DateFormat.date_time)
+    <%_ } _%>
+  <&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { -%>
+  <&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+    <% // just break the cycle; in the reactive area, we already have the annotation in place
+      if (!relationship.ownerSide && !reactive) { %>
+        @org.springframework.data.annotation.Transient
+    <% } %>
+  <&_ } -&>
+<%_ } -%>

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/templates/src/main/java/_package_/_entityPackage_/repository/search/_entityClass_SearchRepository.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/templates/src/main/java/_package_/config/ElasticsearchConfiguration.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/templates/src/main/java/_package_/repository/search/UserSearchRepository.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/elasticsearch/templates/src/main/java/_package_/web → spring-boot/generators/data-elasticsearch/templates/src/main/java/_package_}/web/rest/errors/ElasticsearchExceptionMapper.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/templates/src/main/java/_package_/web/rest/errors/QuerySyntaxException.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/elasticsearch/templates/src/main/java/_package_ → spring-boot/generators/data-elasticsearch/templates/src/main/java/_package_/web}/web/rest/errors/ElasticsearchExceptionMapper.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/templates/src/main/java/_package_/web/web/rest/errors/QuerySyntaxException.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/templates/src/test/java/_package_/config/ElasticsearchTestConfiguration.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -21,11 +21,11 @@ package <%= packageName %>.config;
 import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.data.elasticsearch.client.elc.<%= reactive ? 'ReactiveElasticsearchTemplate' : 'ElasticsearchTemplate' %>;
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 
-@Configuration
+@TestConfiguration(proxyBeanMethods = false)
 public class ElasticsearchTestConfiguration {
     @Autowired
     <%= reactive ? 'ReactiveElasticsearchTemplate' : 'ElasticsearchTemplate' %> template;

package/dist/generators/spring-boot/generators/data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestContainer.java.ejs

@@ -0,0 +1,43 @@
+<%#
+ Copyright 2013-2026 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.config;
+
+import java.util.Collections;
+
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.utility.DockerImageName;
+
+public interface ElasticsearchTestContainer {
+    @Container
+    ElasticsearchContainer elasticsearchContainer = new ElasticsearchContainer(DockerImageName.parse("<%- dockerContainers.elasticsearchImage %>").withTag("<%- dockerContainers.elasticsearchTag %>"))
+        .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(ElasticsearchTestContainer.class)))
+        .withEnv("xpack.security.enabled", "false")
+        .withReuse(true);
+
+    @DynamicPropertySource
+    static void registerProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.elasticsearch.uris", () -> "http://" + elasticsearchContainer.getHttpHostAddress());
+    }
+}

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-elasticsearch}/templates/src/test/java/_package_/web/rest/errors/ElasticsearchExceptionMapperTest.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/mongodb → spring-boot/generators/data-mongodb}/entity-files.d.ts

@@ -125,6 +125,5 @@ export declare const entityFiles: import("../../../base-core/api.js").WriteFileS
 }, "languages" | "languagesDefinition"> & import("../../../languages/application.ts").LanguagesAddedApplicationProperties & {
     jhiTablePrefix: string;
 }>;
-export declare function cleanupMongodbEntityFilesTask(): void;
 declare const _default: (this: import("../../../index.ts").GeneratorBaseCore<import("../../../base-core/types.js").Config, import("../../../base-core/types.js").Options, import("../../../base-core/types.js").Features>, params: import("../../../base-application/tasks.js").TaskParamWithEntities<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>, import("../../../base-application/types.js").Application<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>>>) => void;
 export default _default;

package/dist/generators/{spring-data/generators/mongodb → spring-boot/generators/data-mongodb}/entity-files.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -41,7 +41,6 @@ export const entityFiles = asWriteFilesSection({
     domainFiles,
     repositoryFiles,
 });
-export function cleanupMongodbEntityFilesTask() { }
 export default asWritingEntitiesTask(async function writeEntityMongodbFiles({ application, entities }) {
     for (const entity of entities.filter(entity => !entity.skipServer)) {
         await this.writeFiles({

package/dist/generators/{spring-data/generators/mongodb → spring-boot/generators/data-mongodb}/files.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -35,7 +35,7 @@ export const mongoDbFiles = asWriteFilesSection({
         {
             path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
-            templates: ['config/MongoDbTestContainer.java', 'config/EmbeddedMongo.java'],
+            templates: ['config/MongoDbTestContainer.java'],
         },
     ],
 });

package/dist/generators/{spring-data/generators/elasticsearch → spring-boot/generators/data-mongodb}/generator.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SpringBootApplicationGenerator } from '../../../spring-boot/generator.ts';
-import { cleanupElasticsearchEntityFilesTask } from './entity-files.ts';
-export default class ElasticsearchGenerator extends SpringBootApplicationGenerator {
-    [SpringBootApplicationGenerator.PREPARING_EACH_ENTITY]: Record<"prepareEntity", import("../../../base-core/types.js").GenericTask<any, import("../../../base-application/tasks.js").PreparingEachEntityTaskParam<import("../../../spring-boot/types.js").Entity<({
+import { SpringBootApplicationGenerator } from '../../generator.ts';
+export default class MongoDBGenerator extends SpringBootApplicationGenerator {
+    [SpringBootApplicationGenerator.WRITING]: Record<"writeMongodbFilesTask" | "cleanupMongodbFilesTask", import("../../../base-core/types.js").GenericTask<any, import("../../../base-simple-application/tasks.js").TaskParamWithApplication<import("../../types.js").Application>>>;
+    [SpringBootApplicationGenerator.WRITING_ENTITIES]: Record<"writeMongodbEntityFilesTask", import("../../../base-core/types.js").GenericTask<any, import("../../../base-application/tasks.js").TaskParamWithEntities<import("../../types.js").Entity<({
         propertyName: string;
         propertyNameCapitalized?: string;
         propertyNameUpperSnakeCase?: string;
@@ -247,22 +247,15 @@ export default class ElasticsearchGenerator extends SpringBootApplicationGenerat
         mapstructExpression?: boolean;
         requiresPersistableImplementation?: boolean;
         fieldNameAsDatabaseColumn?: string;
-    }), import("../../../spring-boot/types.js").Relationship>, import("../../../spring-boot/types.js").Application>>>;
-    [SpringBootApplicationGenerator.WRITING]: {
-        cleanupElasticsearchFilesTask: (this: import("../../../index.ts").GeneratorBaseCore<import("../../../base-core/types.js").Config, import("../../../base-core/types.js").Options, import("../../../base-core/types.js").Features>, params: import("../../../base-simple-application/tasks.js").TaskParamWithApplication<import("../../../base-application/types.js").Application<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>>>) => void;
-        writeElasticsearchFilesTask: (this: import("../../../index.ts").GeneratorBaseCore<import("../../../base-core/types.js").Config, import("../../../base-core/types.js").Options, import("../../../base-core/types.js").Features>, params: import("../../../base-simple-application/tasks.js").TaskParamWithApplication<import("../../../base-application/types.js").Application<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>>>) => void;
-    };
-    [SpringBootApplicationGenerator.WRITING_ENTITIES]: {
-        cleanupElasticsearchEntityFilesTask: typeof cleanupElasticsearchEntityFilesTask;
-        writeElasticsearchEntityFilesTask: (this: import("../../../index.ts").GeneratorBaseCore<import("../../../base-core/types.js").Config, import("../../../base-core/types.js").Options, import("../../../base-core/types.js").Features>, params: import("../../../base-application/tasks.js").TaskParamWithEntities<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>, import("../../../base-application/types.js").Application<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>>>) => void;
-    };
-    [SpringBootApplicationGenerator.POST_WRITING]: Record<"addDependencies" | "addTestSpringFactory", import("../../../base-core/types.js").GenericTask<any, import("../../../base/tasks.js").TaskParamWithControl & {
-        source: import("../relational/types.js").Source;
+    }), import("../../types.js").Relationship>, import("../../types.js").Application>>>;
+    [SpringBootApplicationGenerator.POST_WRITING]: Record<"addDependencies" | "blockhound" | "integrationTest", import("../../../base-core/types.js").GenericTask<any, import("../../../base/tasks.js").TaskParamWithControl & {
+        source: import("../../types.js").Source;
     } & {
-        application: import("../../../spring-boot/types.js").Application;
+        application: import("../../types.js").Application;
     }>>;
     beforeQueue(): Promise<void>;
-    get preparingEachEntity(): Record<"prepareEntity", import("../../../base-core/types.js").GenericTask<any, import("../../../base-application/tasks.js").PreparingEachEntityTaskParam<import("../../../spring-boot/types.js").Entity<({
+    get writing(): Record<"writeMongodbFilesTask" | "cleanupMongodbFilesTask", import("../../../base-core/types.js").GenericTask<any, import("../../../base-simple-application/tasks.js").TaskParamWithApplication<import("../../types.js").Application>>>;
+    get writingEntities(): Record<"writeMongodbEntityFilesTask", import("../../../base-core/types.js").GenericTask<any, import("../../../base-application/tasks.js").TaskParamWithEntities<import("../../types.js").Entity<({
         propertyName: string;
         propertyNameCapitalized?: string;
         propertyNameUpperSnakeCase?: string;
@@ -490,18 +483,10 @@ export default class ElasticsearchGenerator extends SpringBootApplicationGenerat
         mapstructExpression?: boolean;
         requiresPersistableImplementation?: boolean;
         fieldNameAsDatabaseColumn?: string;
-    }), import("../../../spring-boot/types.js").Relationship>, import("../../../spring-boot/types.js").Application>>>;
-    get writing(): {
-        cleanupElasticsearchFilesTask: (this: import("../../../index.ts").GeneratorBaseCore<import("../../../base-core/types.js").Config, import("../../../base-core/types.js").Options, import("../../../base-core/types.js").Features>, params: import("../../../base-simple-application/tasks.js").TaskParamWithApplication<import("../../../base-application/types.js").Application<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>>>) => void;
-        writeElasticsearchFilesTask: (this: import("../../../index.ts").GeneratorBaseCore<import("../../../base-core/types.js").Config, import("../../../base-core/types.js").Options, import("../../../base-core/types.js").Features>, params: import("../../../base-simple-application/tasks.js").TaskParamWithApplication<import("../../../base-application/types.js").Application<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>>>) => void;
-    };
-    get writingEntities(): {
-        cleanupElasticsearchEntityFilesTask: typeof cleanupElasticsearchEntityFilesTask;
-        writeElasticsearchEntityFilesTask: (this: import("../../../index.ts").GeneratorBaseCore<import("../../../base-core/types.js").Config, import("../../../base-core/types.js").Options, import("../../../base-core/types.js").Features>, params: import("../../../base-application/tasks.js").TaskParamWithEntities<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>, import("../../../base-application/types.js").Application<import("../../../base-application/entity.ts").Entity<import("../../../base-application/entity.ts").Field, import("../../../base-application/entity.ts").Relationship>>>) => void;
-    };
-    get postWriting(): Record<"addDependencies" | "addTestSpringFactory", import("../../../base-core/types.js").GenericTask<any, import("../../../base/tasks.js").TaskParamWithControl & {
-        source: import("../relational/types.js").Source;
+    }), import("../../types.js").Relationship>, import("../../types.js").Application>>>;
+    get postWriting(): Record<"addDependencies" | "blockhound" | "integrationTest", import("../../../base-core/types.js").GenericTask<any, import("../../../base/tasks.js").TaskParamWithControl & {
+        source: import("../../types.js").Source;
     } & {
-        application: import("../../../spring-boot/types.js").Application;
+        application: import("../../types.js").Application;
     }>>;
 }

package/dist/generators/{spring-data/generators/mongodb → spring-boot/generators/data-mongodb}/generator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
  *
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
@@ -16,9 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SpringBootApplicationGenerator } from "../../../spring-boot/generator.js";
-import cleanupMongodbFilesTask from "./cleanup.js";
-import writeMongodbEntityFilesTask, { cleanupMongodbEntityFilesTask } from "./entity-files.js";
+import { SpringBootApplicationGenerator } from "../../generator.js";
+import writeMongodbEntityFilesTask from "./entity-files.js";
 import writeMongodbFilesTask from "./files.js";
 export default class MongoDBGenerator extends SpringBootApplicationGenerator {
     async beforeQueue() {
@@ -30,41 +29,47 @@ export default class MongoDBGenerator extends SpringBootApplicationGenerator {
         }
     }
     get writing() {
-        return {
-            cleanupMongodbFilesTask,
+        return this.asWritingTaskGroup({
+            async cleanupMongodbFilesTask({ application, control }) {
+                await control.cleanupFiles({
+                    '3.10.0': [`${application.javaPackageSrcDir}config/CloudMongoDbConfiguration.java`],
+                    '7.7.1': [`${application.javaPackageTestDir}MongoDbTestContainerExtension.java`],
+                    '9.0.0-beta.1': [
+                        `${application.javaPackageTestDir}config/TestContainersSpringContextCustomizerFactory.java`,
+                        `${application.javaPackageTestDir}config/EmbeddedMongo.java`,
+                        `${application.srcTestResources}META-INF/spring.factories`,
+                    ],
+                });
+            },
             writeMongodbFilesTask,
-        };
+        });
     }
     get [SpringBootApplicationGenerator.WRITING]() {
         return this.delegateTasksToBlueprint(() => this.writing);
     }
     get writingEntities() {
-        return {
-            cleanupMongodbEntityFilesTask,
+        return this.asWritingEntitiesTaskGroup({
             writeMongodbEntityFilesTask,
-        };
+        });
     }
     get [SpringBootApplicationGenerator.WRITING_ENTITIES]() {
         return this.delegateTasksToBlueprint(() => this.writingEntities);
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
-            addTestSpringFactory({ source, application }) {
-                source.addTestSpringFactory({
-                    key: 'org.springframework.test.context.ContextCustomizerFactory',
-                    value: `${application.packageName}.config.TestContainersSpringContextCustomizerFactory`,
-                });
-            },
             addDependencies({ application, source }) {
                 const { reactive, javaDependencies } = application;
-                source.addSpringBootModule?.(`spring-boot-starter-data-mongodb${reactive ? '-reactive' : ''}`);
+                source.addSpringBootModule?.(`spring-boot-starter-data-mongodb${reactive ? '-reactive' : ''}`, 'spring-boot-testcontainers');
+                if (application.springBoot4) {
+                    source.addSpringBootModule?.(`spring-boot-starter-data-mongodb${reactive ? '-reactive' : ''}-test`);
+                }
                 source.addJavaDependencies?.([
                     { groupId: 'io.mongock', artifactId: 'mongock-bom', type: 'pom', version: javaDependencies['mongock-bom'], scope: 'import' },
                     { groupId: 'io.mongock', artifactId: 'mongock-springboot-v3' },
                     { groupId: 'io.mongock', artifactId: reactive ? 'mongodb-reactive-driver' : 'mongodb-springdata-v4-driver' },
-                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' },
+                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers-junit-jupiter' },
                     { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },
-                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'mongodb' },
+                    { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers-mongodb' },
                 ]);
                 if (reactive) {
                     // Mongock requires non reactive starter workaround https://github.com/mongock/mongock/issues/613.
@@ -76,6 +81,18 @@ export default class MongoDBGenerator extends SpringBootApplicationGenerator {
                     ]);
                 }
             },
+            integrationTest({ application, source }) {
+                source.editJavaFile(`${application.javaPackageTestDir}IntegrationTest.java`, {
+                    imports: [`${application.packageName}.config.MongoDbTestContainer`],
+                    annotations: [
+                        {
+                            package: 'org.springframework.boot.testcontainers.context',
+                            annotation: 'ImportTestcontainers',
+                            parameters: (_, cb) => cb.addKeyValue('value', 'MongoDbTestContainer.class'),
+                        },
+                    ],
+                });
+            },
             blockhound({ application, source }) {
                 const { reactive } = application;
                 if (reactive) {

package/dist/generators/spring-boot/generators/data-mongodb/index.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './generator.ts';

package/dist/generators/spring-boot/generators/data-mongodb/index.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2026 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from "./generator.js";

package/dist/generators/{spring-data/generators/mongodb → spring-boot/generators/data-mongodb}/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_mongodb.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/mongodb → spring-boot/generators/data-mongodb}/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/dist/generators/{spring-data/generators/mongodb → spring-boot/generators/data-mongodb}/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2025 the original author or authors from the JHipster project.
+ Copyright 2013-2026 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.