generator-jhipster 8.2.0 → 8.2.1

package/dist/generators/spring-data-relational/entity-files.mjs

@@ -1,93 +0,0 @@
-/**
- * Copyright 2013-2023 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.
- */
-import { javaMainPackageTemplatesBlock } from '../java/support/index.mjs';
-const sqlFiles = {
-    sqlFiles: [
-        {
-            condition: generator => !generator.reactive,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: ['domain/_persistClass_.java.jhi.jakarta_persistence'],
-        },
-        {
-            condition: generator => !generator.reactive && generator.requiresPersistableImplementation,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: ['domain/_persistClass_.java.jhi.jakarta_lifecycle_events'],
-        },
-        {
-            condition: generator => !generator.reactive && generator.enableHibernateCache,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: ['domain/_persistClass_.java.jhi.hibernate_cache'],
-        },
-        {
-            condition: generator => !generator.reactive && !generator.embedded && generator.containsBagRelationships,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: [
-                'repository/_entityClass_RepositoryWithBagRelationships.java',
-                'repository/_entityClass_RepositoryWithBagRelationshipsImpl.java',
-            ],
-        },
-        {
-            condition: generator => generator.reactive,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: ['domain/_persistClass_.java.jhi.spring_data_reactive'],
-        },
-        {
-            condition: generator => generator.requiresPersistableImplementation,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: ['domain/_persistClass_.java.jhi.spring_data_persistable'],
-        },
-        {
-            condition: generator => generator.reactive && generator.requiresPersistableImplementation,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: ['domain/_persistClass_Callback.java'],
-        },
-        {
-            condition: generator => generator.reactive && !generator.embedded,
-            ...javaMainPackageTemplatesBlock('_entityPackage_'),
-            templates: [
-                'repository/_entityClass_RepositoryInternalImpl_reactive.java',
-                'repository/_entityClass_SqlHelper_reactive.java',
-                'repository/rowmapper/_entityClass_RowMapper_reactive.java',
-            ],
-        },
-    ],
-};
-export function cleanupEntitiesTask() { }
-export default async function writeEntitiesTask({ application, entities }) {
-    for (const entity of entities.filter(entity => !entity.skipServer)) {
-        if (entity.builtInUser) {
-            await this.writeFiles({
-                blocks: [
-                    {
-                        condition: generator => generator.reactive && generator.requiresPersistableImplementation,
-                        ...javaMainPackageTemplatesBlock('_entityPackage_'),
-                        templates: ['domain/_persistClass_Callback.java'],
-                    },
-                ],
-                context: { ...application, ...entity },
-            });
-        }
-        else if (!entity.builtIn) {
-            await this.writeFiles({
-                sections: sqlFiles,
-                context: { ...application, ...entity },
-            });
-        }
-    }
-}

package/dist/generators/spring-data-relational/files.mjs

@@ -1,115 +0,0 @@
-/**
- * Copyright 2013-2023 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.
- */
-import { mergeSections, addSectionsCondition } from '../base/support/index.mjs';
-import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock, javaTestResourceTemplatesBlock, javaMainResourceTemplatesBlock, } from '../java/support/index.mjs';
-export const sqlFiles = {
-    serverFiles: [
-        {
-            ...javaMainPackageTemplatesBlock(),
-            templates: ['config/DatabaseConfiguration.java'],
-        },
-    ],
-    reactiveJavaUserManagement: [
-        {
-            condition: generator => generator.reactive && generator.generateBuiltInUserEntity,
-            ...javaMainPackageTemplatesBlock(),
-            templates: ['repository/UserSqlHelper_reactive.java', 'repository/rowmapper/UserRowMapper_reactive.java'],
-        },
-    ],
-    reactiveCommon: [
-        {
-            condition: generator => generator.reactive,
-            ...javaMainPackageTemplatesBlock(),
-            templates: ['repository/rowmapper/ColumnConverter_reactive.java', 'repository/EntityManager_reactive.java'],
-        },
-    ],
-    hibernate: [
-        {
-            condition: generator => !generator.reactive,
-            ...javaTestPackageTemplatesBlock(),
-            templates: [
-                'config/timezone/HibernateTimeZoneIT.java',
-                'repository/timezone/DateTimeWrapper.java',
-                'repository/timezone/DateTimeWrapperRepository.java',
-            ],
-        },
-    ],
-    testContainers: [
-        {
-            ...javaTestPackageTemplatesBlock(),
-            templates: ['config/EmbeddedSQL.java', 'config/SqlTestContainer.java', 'config/SqlTestContainersSpringContextCustomizerFactory.java'],
-        },
-        {
-            ...javaTestResourceTemplatesBlock(),
-            templates: ['config/application-testdev.yml'],
-        },
-        {
-            condition: generator => !generator.reactive,
-            ...javaTestResourceTemplatesBlock(),
-            templates: ['config/application-testprod.yml'],
-        },
-    ],
-};
-export const h2Files = {
-    serverResource: [
-        {
-            ...javaMainResourceTemplatesBlock(),
-            templates: ['.h2.server.properties'],
-        },
-    ],
-};
-export const mysqlFiles = {
-    serverTestSources: [
-        {
-            ...javaTestPackageTemplatesBlock(),
-            templates: ['config/MysqlTestContainer.java'],
-        },
-    ],
-};
-export const mariadbFiles = {
-    serverTestSources: [
-        {
-            ...javaTestPackageTemplatesBlock(),
-            templates: ['config/MariadbTestContainer.java'],
-        },
-    ],
-};
-export const mssqlFiles = {
-    serverTestSources: [
-        {
-            ...javaTestPackageTemplatesBlock(),
-            templates: ['config/MsSqlTestContainer.java'],
-        },
-    ],
-};
-export const postgresFiles = {
-    serverTestSources: [
-        {
-            ...javaTestPackageTemplatesBlock(),
-            templates: ['config/PostgreSqlTestContainer.java'],
-        },
-    ],
-};
-export const serverFiles = mergeSections(sqlFiles, addSectionsCondition(h2Files, context => context.devDatabaseTypeH2Any), addSectionsCondition(mysqlFiles, context => context.prodDatabaseTypeMysql), addSectionsCondition(mariadbFiles, context => context.prodDatabaseTypeMariadb), addSectionsCondition(mssqlFiles, context => context.prodDatabaseTypeMssql), addSectionsCondition(postgresFiles, context => context.prodDatabaseTypePostgresql));
-export default async function writeSqlFiles({ application }) {
-    await this.writeFiles({
-        sections: serverFiles,
-        context: application,
-    });
-}

package/dist/generators/spring-data-relational/generator.mjs

@@ -1,164 +0,0 @@
-/**
- * Copyright 2013-2023 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.
- */
-import BaseApplicationGenerator from '../base-application/index.mjs';
-import { GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_LIQUIBASE } from '../generator-list.mjs';
-import writeTask from './files.mjs';
-import cleanupTask from './cleanup.mjs';
-import writeEntitiesTask, { cleanupEntitiesTask } from './entity-files.mjs';
-import { isReservedTableName } from '../../jdl/jhipster/reserved-keywords.js';
-import { databaseTypes } from '../../jdl/jhipster/index.mjs';
-import { getDBCExtraOption, getJdbcUrl, getR2dbcUrl } from './support/index.mjs';
-import { getCommonMavenDefinition, getDatabaseDriverForDatabase, getDatabaseTypeMavenDefinition, getH2MavenDefinition, getImperativeMavenDefinition, getReactiveMavenDefinition, } from './internal/dependencies.mjs';
-import command from './command.mjs';
-const { SQL } = databaseTypes;
-export default class SqlGenerator extends BaseApplicationGenerator {
-    async beforeQueue() {
-        if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_SPRING_DATA_RELATIONAL);
-        }
-        if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
-        }
-    }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            loadOptions() {
-                this.parseJHipsterOptions(command.options);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
-    get composing() {
-        return this.asComposingTaskGroup({
-            async composing() {
-                await this.composeWithJHipster(GENERATOR_LIQUIBASE);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.COMPOSING]() {
-        return this.delegateTasksToBlueprint(() => this.composing);
-    }
-    get preparing() {
-        return this.asPreparingTaskGroup({
-            async preparing({ application }) {
-                const anyApp = application;
-                anyApp.devDatabaseExtraOptions = getDBCExtraOption(anyApp.devDatabaseType);
-                anyApp.prodDatabaseExtraOptions = getDBCExtraOption(anyApp.prodDatabaseType);
-                anyApp.prodDatabaseDriver = getDatabaseDriverForDatabase(application.prodDatabaseType);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PREPARING]() {
-        return this.delegateTasksToBlueprint(() => this.preparing);
-    }
-    get preparingEachEntityRelationship() {
-        return this.asPreparingEachEntityRelationshipTaskGroup({
-            prepareRelationship({ application, relationship }) {
-                if (application.reactive) {
-                    relationship.relationshipSqlSafeName = isReservedTableName(relationship.relationshipName, SQL)
-                        ? `e_${relationship.relationshipName}`
-                        : relationship.relationshipName;
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_RELATIONSHIP]() {
-        return this.delegateTasksToBlueprint(() => this.preparingEachEntityRelationship);
-    }
-    get writing() {
-        return this.asWritingTaskGroup({
-            cleanupTask,
-            writeTask,
-        });
-    }
-    get [BaseApplicationGenerator.WRITING]() {
-        return this.delegateTasksToBlueprint(() => this.writing);
-    }
-    get writingEntities() {
-        return {
-            cleanupEntitiesTask,
-            writeEntitiesTask,
-        };
-    }
-    get [BaseApplicationGenerator.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.SqlTestContainersSpringContextCustomizerFactory`,
-                });
-            },
-            addDependencies({ application, source }) {
-                if (application.buildToolMaven) {
-                    const { reactive, javaDependencies, packageFolder } = application;
-                    const applicationAny = application;
-                    const { prodDatabaseType } = applicationAny;
-                    source.addMavenDefinition?.(getCommonMavenDefinition({ javaDependencies }));
-                    if (reactive) {
-                        source.addMavenDefinition?.(getReactiveMavenDefinition({ javaDependencies }));
-                    }
-                    else {
-                        source.addMavenDefinition?.(getImperativeMavenDefinition({ javaDependencies }));
-                    }
-                    const inProfile = applicationAny.devDatabaseTypeH2Any ? 'prod' : undefined;
-                    if (applicationAny.devDatabaseTypeH2Any) {
-                        const h2Definitions = getH2MavenDefinition({ prodDatabaseType, packageFolder });
-                        source.addMavenDefinition?.(h2Definitions.jdbc);
-                        if (reactive) {
-                            source.addMavenDefinition?.(h2Definitions.r2dbc);
-                        }
-                    }
-                    const dbDefinitions = getDatabaseTypeMavenDefinition(prodDatabaseType, { inProfile, javaDependencies });
-                    source.addMavenDefinition?.(dbDefinitions.jdbc);
-                    if (reactive) {
-                        source.addMavenDefinition?.(dbDefinitions.r2dbc);
-                    }
-                }
-            },
-        });
-    }
-    get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
-    }
-    /**
-     * @private
-     * Returns the JDBC URL for a databaseType
-     *
-     * @param {string} databaseType
-     * @param {*} options: databaseName, and required infos that depends of databaseType (hostname, localDirectory, ...)
-     */
-    getJDBCUrl(databaseType, options = {}) {
-        return getJdbcUrl(databaseType, options);
-    }
-    /**
-     * @private
-     * Returns the R2DBC URL for a databaseType
-     *
-     * @param {string} databaseType
-     * @param {*} options: databaseName, and required infos that depends of databaseType (hostname, localDirectory, ...)
-     */
-    getR2DBCUrl(databaseType, options = {}) {
-        return getR2dbcUrl(databaseType, options);
-    }
-}

package/dist/generators/spring-data-relational/index.mjs

@@ -1,20 +0,0 @@
-/**
- * Copyright 2013-2023 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.mjs';
-export { default as command } from './command.mjs';

package/dist/generators/spring-data-relational/internal/dependencies.mjs

@@ -1,174 +0,0 @@
-/**
- * Copyright 2013-2023 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.
- */
-const testcontainerFileForDB = {
-    mariadb: 'MariadbTestContainer.java',
-    mssql: 'MsSqlTestContainer.java',
-    mysql: 'MysqlTestContainer.java',
-    postgresql: 'PostgreSqlTestContainer.java',
-};
-const databaseArtifactForDB = {
-    mariadb: {
-        jdbc: { groupId: 'org.mariadb.jdbc', artifactId: 'mariadb-java-client' },
-        // maria-r2dbc driver is failing.
-        // r2dbc: { groupId: 'org.mariadb', artifactId: 'r2dbc-mariadb' },
-        r2dbc: { groupId: 'io.asyncer', artifactId: 'r2dbc-mysql' },
-    },
-    mssql: {
-        jdbc: { groupId: 'com.microsoft.sqlserver', artifactId: 'mssql-jdbc' },
-        r2dbc: { groupId: 'io.r2dbc', artifactId: 'r2dbc-mssql' },
-    },
-    mysql: {
-        jdbc: { groupId: 'com.mysql', artifactId: 'mysql-connector-j' },
-        r2dbc: { groupId: 'io.asyncer', artifactId: 'r2dbc-mysql' },
-    },
-    postgresql: {
-        jdbc: { groupId: 'org.postgresql', artifactId: 'postgresql' },
-        r2dbc: { groupId: 'org.postgresql', artifactId: 'r2dbc-postgresql' },
-    },
-};
-export const getDatabaseDriverForDatabase = (databaseType) => databaseArtifactForDB[databaseType];
-export const getCommonMavenDefinition = ({ javaDependencies }) => ({
-    properties: [
-        { property: 'jaxb-runtime.version', value: javaDependencies['jaxb-runtime'] },
-        { property: 'validation-api.version', value: javaDependencies['validation-api'] },
-    ],
-    dependencies: [
-        { groupId: 'com.zaxxer', artifactId: 'HikariCP' },
-        { groupId: 'com.fasterxml.jackson.module', artifactId: 'jackson-module-jaxb-annotations' },
-        { groupId: 'org.testcontainers', artifactId: 'jdbc', scope: 'test' },
-    ],
-    annotationProcessors: [
-        // eslint-disable-next-line no-template-curly-in-string
-        { groupId: 'org.glassfish.jaxb', artifactId: 'jaxb-runtime', version: '${jaxb-runtime.version}' },
-    ],
-});
-export const getReactiveMavenDefinition = ({ javaDependencies }) => ({
-    properties: [{ property: 'commons-beanutils.version', value: javaDependencies['commons-beanutils'] }],
-    dependencies: [
-        { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-data-r2dbc' },
-        // eslint-disable-next-line no-template-curly-in-string
-        { groupId: 'commons-beanutils', artifactId: 'commons-beanutils', version: '${commons-beanutils.version}' },
-        { groupId: 'jakarta.persistence', artifactId: 'jakarta.persistence-api' },
-    ],
-});
-export const getImperativeMavenDefinition = ({ javaDependencies }) => ({
-    properties: [{ property: 'hibernate.version', value: javaDependencies.hibernate }],
-    dependencies: [
-        { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-data-jpa' },
-        { groupId: 'com.fasterxml.jackson.datatype', artifactId: 'jackson-datatype-hibernate6' },
-        // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
-        // eslint-disable-next-line no-template-curly-in-string
-        { groupId: 'org.hibernate.orm', artifactId: 'hibernate-core', version: '${hibernate.version}' },
-        { groupId: 'org.hibernate.orm', artifactId: 'hibernate-jpamodelgen', scope: 'provided' },
-        { groupId: 'org.hibernate.validator', artifactId: 'hibernate-validator' },
-        { groupId: 'org.springframework.security', artifactId: 'spring-security-data' },
-        { inProfile: 'IDE', groupId: 'org.hibernate.orm', artifactId: 'hibernate-jpamodelgen' },
-    ],
-    annotationProcessors: [
-        // eslint-disable-next-line no-template-curly-in-string
-        { groupId: 'org.hibernate.orm', artifactId: 'hibernate-jpamodelgen', version: '${hibernate.version}' },
-    ],
-});
-export const getH2MavenDefinition = ({ prodDatabaseType, packageFolder, }) => {
-    const testcontainerFile = testcontainerFileForDB[prodDatabaseType];
-    const excludeContainerPlugin = testcontainerFile
-        ? [
-            {
-                inProfile: 'dev',
-                groupId: 'org.apache.maven.plugins',
-                artifactId: 'maven-compiler-plugin',
-                additionalContent: `
-<configuration>
-  <testExcludes>
-    <testExclude>${packageFolder}config/${testcontainerFile}</testExclude>
-  </testExcludes>
-</configuration>
-`,
-            },
-        ]
-        : [];
-    return {
-        jdbc: {
-            dependencies: [{ inProfile: 'dev', groupId: 'com.h2database', artifactId: 'h2' }],
-            plugins: excludeContainerPlugin,
-        },
-        r2dbc: {
-            dependencies: [{ inProfile: 'dev', groupId: 'io.r2dbc', artifactId: 'r2dbc-h2' }],
-        },
-    };
-};
-// eslint-disable-next-line import/prefer-default-export
-export const getDatabaseTypeMavenDefinition = (databaseType, { inProfile }) => {
-    const dependenciesForType = {
-        mariadb: {
-            jdbc: {
-                dependencies: [
-                    { inProfile, ...databaseArtifactForDB.mariadb.jdbc },
-                    { groupId: 'org.testcontainers', artifactId: 'mariadb', scope: 'test' },
-                ],
-            },
-            r2dbc: {
-                dependencies: [{ inProfile, ...databaseArtifactForDB.mariadb.r2dbc }],
-            },
-        },
-        mssql: {
-            jdbc: {
-                dependencies: [
-                    { inProfile, ...databaseArtifactForDB.mssql.jdbc },
-                    { groupId: 'org.testcontainers', artifactId: 'mssqlserver', scope: 'test' },
-                ],
-            },
-            r2dbc: {
-                dependencies: [{ inProfile, ...databaseArtifactForDB.mssql.r2dbc }],
-            },
-        },
-        mysql: {
-            jdbc: {
-                dependencies: [
-                    { inProfile, ...databaseArtifactForDB.mysql.jdbc },
-                    { groupId: 'org.testcontainers', artifactId: 'mysql', scope: 'test' },
-                ],
-            },
-            r2dbc: {
-                dependencies: [{ inProfile, ...databaseArtifactForDB.mysql.r2dbc }],
-            },
-        },
-        oracle: {
-            jdbc: {
-                dependencies: [
-                    { inProfile, groupId: 'com.oracle.database.jdbc', artifactId: 'ojdbc8' },
-                    { groupId: 'org.testcontainers', artifactId: 'oracle-xe', scope: 'test' },
-                ],
-            },
-            r2dbc: {},
-        },
-        postgresql: {
-            jdbc: {
-                dependencies: [
-                    { inProfile, ...databaseArtifactForDB.postgresql.jdbc },
-                    { groupId: 'org.testcontainers', artifactId: 'postgresql', scope: 'test' },
-                ],
-            },
-            r2dbc: {
-                dependencies: [{ inProfile, ...databaseArtifactForDB.postgresql.r2dbc }],
-            },
-        },
-    };
-    return dependenciesForType[databaseType];
-};