generator-jhipster 8.2.0 → 8.3.0

package/dist/generators/spring-data-relational/support/application-properties.mjs

@@ -1,122 +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 { getDatabaseData } from './database-data.mjs';
-import { getJdbcUrl, getR2dbcUrl } from './database-url.mjs';
-import { databaseTypes } from '../../../jdl/jhipster/index.mjs';
-const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, H2_MEMORY, H2_DISK } = databaseTypes;
-export default function prepareSqlApplicationProperties({ application }) {
-    application.prodDatabaseTypeMariadb = application.prodDatabaseType === MARIADB;
-    application.prodDatabaseTypeMssql = application.prodDatabaseType === MSSQL;
-    application.prodDatabaseTypeMysql = application.prodDatabaseType === MYSQL;
-    application.prodDatabaseTypeOracle = application.prodDatabaseType === ORACLE;
-    application.prodDatabaseTypePostgresql = application.prodDatabaseType === POSTGRESQL;
-    application.devDatabaseTypeH2Disk = application.devDatabaseType === H2_DISK;
-    application.devDatabaseTypeH2Memory = application.devDatabaseType === H2_MEMORY;
-    application.devDatabaseTypeH2Any = application.devDatabaseTypeH2Disk || application.devDatabaseTypeH2Memory;
-    application.devDatabaseTypeMariadb = application.prodDatabaseTypeMariadb && !application.devDatabaseTypeH2Any;
-    application.devDatabaseTypeMssql = application.prodDatabaseTypeMssql && !application.devDatabaseTypeH2Any;
-    application.devDatabaseTypeMysql = application.prodDatabaseTypeMysql && !application.devDatabaseTypeH2Any;
-    application.devDatabaseTypeOracle = application.prodDatabaseTypeOracle && !application.devDatabaseTypeH2Any;
-    application.devDatabaseTypePostgresql = application.prodDatabaseTypePostgresql && !application.devDatabaseTypeH2Any;
-    application.devDatabaseTypePostgres = application.devDatabaseTypePostgresql; // Deprecated
-    if (!application.databaseTypeSql) {
-        return;
-    }
-    const prodDatabaseData = getDatabaseData(application.prodDatabaseType);
-    application.prodHibernateDialect = prodDatabaseData.hibernateDialect;
-    application.prodJdbcDriver = prodDatabaseData.jdbcDriver;
-    application.prodDatabaseUsername = prodDatabaseData.defaultUsername ?? application.baseName;
-    application.prodDatabasePassword = prodDatabaseData.defaultPassword ?? '';
-    application.prodDatabaseName = prodDatabaseData.defaultDatabaseName ?? application.baseName;
-    const prodDatabaseOptions = {
-        databaseName: application.prodDatabaseName,
-        hostname: 'localhost',
-    };
-    application.prodJdbcUrl = getJdbcUrl(application.prodDatabaseType, prodDatabaseOptions);
-    application.prodLiquibaseUrl = getJdbcUrl(application.prodDatabaseType, {
-        ...prodDatabaseOptions,
-        skipExtraOptions: true,
-    });
-    if (application.reactive) {
-        application.prodR2dbcUrl = getR2dbcUrl(application.prodDatabaseType, prodDatabaseOptions);
-    }
-    if (application.devDatabaseTypeH2Any) {
-        try {
-            const devDatabaseData = getDatabaseData(application.devDatabaseType);
-            application.devHibernateDialect = devDatabaseData.hibernateDialect;
-            application.devJdbcDriver = devDatabaseData.jdbcDriver;
-            application.devDatabaseUsername = devDatabaseData.defaultUsername ?? application.baseName;
-            application.devDatabasePassword = devDatabaseData.defaultPassword ?? '';
-            application.devDatabaseName = devDatabaseData.defaultDatabaseName ?? application.baseName;
-            const devDatabaseOptions = {
-                databaseName: application.devDatabaseName,
-            };
-            application.devJdbcUrl = getJdbcUrl(application.devDatabaseType, {
-                ...devDatabaseOptions,
-                buildDirectory: `./${application.temporaryDir}`,
-                prodDatabaseType: application.prodDatabaseType,
-            });
-            let devLiquibaseOptions;
-            if (application.devDatabaseTypeH2Memory) {
-                devLiquibaseOptions = {
-                    protocolSuffix: 'h2:tcp://',
-                    localDirectory: 'localhost:18080/mem:',
-                };
-            }
-            else {
-                devLiquibaseOptions = {
-                    // eslint-disable-next-line no-template-curly-in-string
-                    buildDirectory: application.buildToolGradle ? `./${application.temporaryDir}` : '${project.build.directory}/',
-                };
-            }
-            application.devLiquibaseUrl = getJdbcUrl(application.devDatabaseType, {
-                ...devDatabaseOptions,
-                skipExtraOptions: true,
-                ...devLiquibaseOptions,
-            });
-            if (application.reactive) {
-                application.devR2dbcUrl = getR2dbcUrl(application.devDatabaseType, {
-                    ...devDatabaseOptions,
-                    buildDirectory: `./${application.temporaryDir}`,
-                    prodDatabaseType: application.prodDatabaseType,
-                });
-            }
-        }
-        catch (error) {
-            if (application.backendTypeSpringBoot) {
-                throw error;
-            }
-        }
-    }
-    else {
-        application.devJdbcUrl = application.prodJdbcUrl;
-        application.devLiquibaseUrl = application.prodLiquibaseUrl;
-        application.devR2dbcUrl = application.prodR2dbcUrl;
-        application.devHibernateDialect = application.prodHibernateDialect;
-        application.devJdbcDriver = application.prodJdbcDriver;
-        application.devDatabaseUsername = application.prodDatabaseUsername;
-        application.devDatabasePassword = application.prodDatabasePassword;
-        application.devDatabaseName = application.prodDatabaseName;
-        application.devJdbcUrl = application.prodJdbcUrl;
-        application.devLiquibaseUrl = application.prodLiquibaseUrl;
-        if (application.reactive) {
-            application.devR2dbcUrl = application.prodR2dbcUrl;
-        }
-    }
-}

package/dist/generators/spring-data-relational/support/database-data.mjs

@@ -1,147 +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 { databaseTypes } from '../../../jdl/jhipster/index.mjs';
-const { H2_DISK, H2_MEMORY, MARIADB, MSSQL, MYSQL, ORACLE, POSTGRESQL } = databaseTypes;
-const H2_PROD_DATABASE_MODE = {
-    [MYSQL]: ';MODE=MYSQL',
-    [MARIADB]: ';MODE=LEGACY',
-};
-const h2GetProdDatabaseData = (databaseType, { extraOptions = '' }, { prodDatabaseType, buildDirectory, itests, localDirectory, protocolSuffix }) => {
-    const data = {};
-    if (protocolSuffix) {
-        data.protocolSuffix = protocolSuffix;
-    }
-    if (H2_DISK === databaseType) {
-        if (!localDirectory && !buildDirectory) {
-            throw new Error(`'localDirectory' option should be provided for ${databaseType} databaseType`);
-        }
-        if (localDirectory) {
-            localDirectory = `${localDirectory}/`;
-        }
-        else {
-            localDirectory = `${buildDirectory}h2db/${itests ? 'testdb/' : 'db/'}`;
-        }
-    }
-    if (itests && H2_MEMORY === databaseType) {
-        data.port = ':12344';
-    }
-    const h2ProdDatabaseMode = prodDatabaseType ? H2_PROD_DATABASE_MODE[prodDatabaseType] ?? '' : '';
-    return {
-        ...data,
-        localDirectory,
-        extraOptions: `${extraOptions}${h2ProdDatabaseMode}`,
-    };
-};
-const databaseData = {
-    [MSSQL]: {
-        name: 'SQL Server',
-        protocolSuffix: 'sqlserver://',
-        jdbcDriver: '',
-        hibernateDialect: 'org.hibernate.dialect.SQLServer2012Dialect',
-        port: ':1433;database=',
-        defaultUsername: 'SA',
-        defaultPassword: 'yourStrong(!)Password',
-        jdbc: {
-            extraOptions: ';encrypt=false',
-        },
-        r2dbc: {
-            protocolSuffix: 'mssql://',
-            port: ':1433/',
-        },
-    },
-    [MARIADB]: {
-        name: 'MariaDB',
-        protocolSuffix: 'mariadb://',
-        jdbcDriver: 'org.mariadb.jdbc.Driver',
-        hibernateDialect: 'org.hibernate.dialect.MariaDB103Dialect',
-        port: ':3306/',
-        extraOptions: '?useLegacyDatetimeCode=false',
-        defaultUsername: 'root',
-        constraintNameMaxLength: 64,
-        tableNameMaxLength: 64,
-        r2dbc: {
-            // TODO switch to mariadb if r2dbc-mariadb is reinstated
-            protocolSuffix: 'mysql://',
-        },
-    },
-    [MYSQL]: {
-        name: 'MySQL',
-        protocolSuffix: 'mysql://',
-        jdbcDriver: 'com.mysql.cj.jdbc.Driver',
-        hibernateDialect: 'org.hibernate.dialect.MySQL8Dialect',
-        tableNameMaxLength: 64,
-        constraintNameMaxLength: 64,
-        port: ':3306/',
-        extraOptions: '?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true',
-        defaultUsername: 'root',
-    },
-    [ORACLE]: {
-        name: 'Oracle',
-        protocolSuffix: 'oracle:thin:@',
-        jdbcDriver: 'oracle.jdbc.OracleDriver',
-        hibernateDialect: 'org.hibernate.dialect.Oracle12cDialect',
-        port: ':1521:',
-        defaultUsername: 'system',
-        defaultPassword: 'oracle',
-        defaultDatabaseName: 'xe',
-        constraintNameMaxLength: 128,
-        tableNameMaxLength: 128,
-    },
-    [POSTGRESQL]: {
-        name: 'PostgreSQL',
-        protocolSuffix: 'postgresql://',
-        jdbcDriver: 'org.postgresql.Driver',
-        hibernateDialect: 'org.hibernate.dialect.PostgreSQLDialect',
-        port: ':5432/',
-        constraintNameMaxLength: 63,
-        tableNameMaxLength: 63,
-    },
-    [H2_DISK]: {
-        name: 'H2Disk',
-        protocolSuffix: 'h2:file:',
-        jdbcDriver: 'org.h2.Driver',
-        hibernateDialect: 'org.hibernate.dialect.H2Dialect',
-        getData: options => h2GetProdDatabaseData(H2_DISK, { extraOptions: ';DB_CLOSE_DELAY=-1' }, options),
-        r2dbc: {
-            protocolSuffix: 'h2:file:///',
-        },
-    },
-    [H2_MEMORY]: {
-        name: 'H2Memory',
-        protocolSuffix: 'h2:mem:',
-        jdbcDriver: 'org.h2.Driver',
-        hibernateDialect: 'org.hibernate.dialect.H2Dialect',
-        getData: options => h2GetProdDatabaseData(H2_MEMORY, { extraOptions: ';DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE' }, options),
-        r2dbc: {
-            protocolSuffix: 'h2:mem:///',
-        },
-    },
-};
-export default databaseData;
-export function getDatabaseData(databaseType) {
-    if (databaseData[databaseType] === undefined) {
-        throw new Error(`Database data not found for database ${databaseType}`);
-    }
-    return databaseData[databaseType];
-}
-export const getDBCExtraOption = databaseType => {
-    const databaseDataForType = databaseData[databaseType];
-    const { extraOptions = '' } = databaseDataForType;
-    return extraOptions;
-};

package/dist/generators/spring-data-relational/support/database-url.mjs

@@ -1,78 +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 { databaseTypes } from '../../../jdl/jhipster/index.mjs';
-import databaseData from './database-data.mjs';
-const { ORACLE, MYSQL, POSTGRESQL, MARIADB, MSSQL, H2_DISK, H2_MEMORY } = databaseTypes;
-export default function getDatabaseUrl(databaseType, protocol, options = {}) {
-    if (!protocol) {
-        throw new Error('protocol is required');
-    }
-    const { databaseName, hostname, skipExtraOptions } = options;
-    if (!databaseName) {
-        throw new Error("option 'databaseName' is required");
-    }
-    if ([MYSQL, MARIADB, POSTGRESQL, ORACLE, MSSQL].includes(databaseType) && !hostname) {
-        throw new Error(`option 'hostname' is required for ${databaseType} databaseType`);
-    }
-    else if (![MYSQL, MARIADB, POSTGRESQL, ORACLE, MSSQL, H2_DISK, H2_MEMORY].includes(databaseType)) {
-        throw new Error(`${databaseType} databaseType is not supported`);
-    }
-    let databaseDataForType = databaseData[databaseType];
-    if (databaseDataForType[protocol]) {
-        databaseDataForType = {
-            ...databaseDataForType,
-            ...databaseDataForType[protocol],
-        };
-    }
-    if (databaseDataForType.getData) {
-        databaseDataForType = {
-            ...databaseDataForType,
-            ...(databaseDataForType.getData(options) || {}),
-        };
-    }
-    const { port = '', protocolSuffix = '', extraOptions = '', localDirectory = options.localDirectory } = databaseDataForType;
-    let url = `${protocol}:${protocolSuffix}`;
-    if (hostname || localDirectory) {
-        url = `${url}${localDirectory || hostname + port}${databaseName}`;
-    }
-    else {
-        url = `${url}${databaseName}${port}`;
-    }
-    return `${url}${skipExtraOptions ? '' : extraOptions}`;
-}
-/**
- * Returns the JDBC URL for a databaseType
- *
- * @param databaseType
- * @param options
- * @returns
- */
-export function getJdbcUrl(databaseType, options) {
-    return getDatabaseUrl(databaseType, 'jdbc', options);
-}
-/**
- * Returns the R2DBC URL for a databaseType
- *
- * @param databaseType
- * @param options
- * @returns
- */
-export function getR2dbcUrl(databaseType, options) {
-    return getDatabaseUrl(databaseType, 'r2dbc', options);
-}

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

@@ -1,23 +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 * from './database-data.mjs';
-export { default as databaseData } from './database-data.mjs';
-export * from './database-url.mjs';
-export { default as getDatabaseUrl } from './database-url.mjs';
-export { default as prepareSqlApplicationProperties } from './application-properties.mjs';

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.hibernate_cache.ejs

@@ -1,41 +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.
--%>
-<%#
- This is a fragment file, it will be merged into to root template if available.
- EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
--%>
-<&_ if (fragment.importSection) { -&>
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-<&_ } -&>
-
-<&_ if (fragment.annotationSection) { -&>
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-<&_ } -&>
-
-<%_ for (const relationship of relationships) { _%>
-<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
-  <%_ if (relationship.relationshipOneToMany) { _%>
-    @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-  <%_ } _%>
-  <%_ if (relationship.relationshipManyToMany) { _%>
-    @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-  <%_ } _%>
-<&_ } -&>
-<%_ } -%>

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.jakarta_lifecycle_events.ejs

@@ -1,31 +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.
--%>
-<%#
- This is a fragment file, it will be merged into to root template if available.
- EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
--%>
-<&_ if (fragment.classAdditionalFieldsMethodsSection) { -&>
-
-    @PostLoad
-    @PostPersist
-    public void updateEntityState() {
-        this.setIsPersisted();
-    }
-
- <&_ } -&>

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.jakarta_persistence.ejs

@@ -1,128 +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.
--%>
-<%#
- This is a fragment file, it will be merged into to root template if available.
- EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
--%>
-<&_ if (fragment.importSection) { -&>
-import jakarta.persistence.*;
-<%_ if ((prodDatabaseTypePostgres && anyFieldHasTextContentType) || (anyFieldIsUUID && (prodDatabaseTypeMysql || prodDatabaseTypeMariadb))) { _%>
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;
-<%_ } _%>
-<&_ } -&>
-
-<&_ if (fragment.annotationSection) { -&>
-@Entity
-@Table(name = "<%= entityTableName %>")
-<&_ } -&>
-
-<%_ for (const field of fields) { -%>
-<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
-  <%_ if (field.id) { _%>
-    @Id
-    <%_ if (field.jpaGeneratedValue === 'identity') { _%>
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    <%_ } else if (field.jpaGeneratedValue === 'sequence') { _%>
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator")
-    @SequenceGenerator(name = "sequenceGenerator")
-    <%_ } else if (field.jpaGeneratedValue) { _%>
-    @GeneratedValue
-    <%_ } _%>
-  <%_ } _%>
-  <%_ if (field.fieldIsEnum) { _%>
-    @Enumerated(EnumType.STRING)
-  <%_ } _%>
-  <%_ if (field.fieldTypeBytes) { _%>
-    @Lob
-  <%_ } _%>
-  <%_ if (field.fieldTypeTemporal || field.fieldTypeDuration) { _%>
-    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>"<% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %>)
-  <%_ } else if (field.fieldTypeBigDecimal) { _%>
-    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>", precision = 21, scale = 2<% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %>)
-  <%_ } else if (field.fieldTypeUUID && (prodDatabaseTypeMysql || prodDatabaseTypeMariadb)) { _%>
-    @JdbcTypeCode(SqlTypes.VARCHAR)
-    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>", length = 36<% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %>)
-  <%_ } else { _%>
-    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>"<% if (field.fieldValidate === true) { %><% if (field.fieldValidationMaxLength) { %>, length = <%= field.fieldValidateRulesMaxlength %><% } %><% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %><% } %>)
-  <%_ } _%>
-<&_ } -&>
-<%_ } -%>
-
-<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { -%>
-<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
-    @Column(
-        name = "<%- field.fieldNameAsDatabaseColumn %>_content_type"
-        <%_ if (field.fieldValidationRequired) { %>, nullable = false<% } _%>
-    )
-<&_ } -&>
-<%_ } -%>
-
-<%_ for (const relationship of relationships) { -%>
-<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
-  <%_ if (relationship.relationshipOneToMany) { -%>
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "<%= relationship.otherEntityRelationshipName %>")
-  <%_ } else if (relationship.relationshipManyToOne) { -%>
-    @ManyToOne(<% if (relationship.relationshipRequired) { %>optional = false<% } else { %>fetch = FetchType.LAZY<% } %>)
-      <%_ if (relationship.relationshipValidate && relationship.relationshipRequired) { _%>
-    @NotNull
-      <%_ } _%>
-  <%_ } else if (relationship.relationshipManyToMany) { -%>
-    @ManyToMany(fetch = FetchType.LAZY<% if (!relationship.ownerSide) { %>, mappedBy = "<%= relationship.otherEntityRelationshipNamePlural %>"<% } %>)
-      <%_ if (relationship.ownerSide) { _%>
-        <%_ if (relationship.relationshipValidate && relationship.relationshipRequired) { _%>
-    @NotNull
-        <%_ } _%>
-    @JoinTable(name = "<%= relationship.joinTable.name %>",
-               joinColumns = <%= primaryKey.fields.length > 1 ? '{' : '' %>
-                   <%_ primaryKey.fields.forEach((field, idx) => { _%>
-                   <%= idx === 0 ? '' : ',' %>@JoinColumn(name = "<%= `${entityTableName}_${field.columnName}` %>")
-                   <%_ }); _%>
-               <%= primaryKey.fields.length > 1 ? '}' : '' %>,
-               inverseJoinColumns = <%= relationship.otherEntity.primaryKey.fields.length > 1 ? '{' : '' %>
-                   <%_ relationship.otherEntity.primaryKey.fields.forEach((field, idx) => { _%>
-                   <%= idx === 0 ? '' : ',' %>@JoinColumn(name = "<%= `${relationship.columnName}_${field.columnName}` %>"))
-                   <%_ }); _%>
-               <%= relationship.otherEntity.primaryKey.fields.length > 1 ? '}' : '' %>
-      <%_ } _%>
-  <%_ } else { -%>
-      <%_ if (relationship.ignoreOtherSideProperty) { -%>
-    @JsonIgnoreProperties(value = {
-        <%_ relationship.otherEntity.relationships.forEach(otherRelationship => { _%>
-        "<%= otherRelationship.relationshipReferenceField %>",
-        <%_ }); _%>
-    }, allowSetters = true)
-      <%_ } _%>
-      <%_ if (relationship.ownerSide) { -%>
-    @OneToOne(fetch = FetchType.LAZY<% if (relationship.relationshipRequired) { %>, optional = false<% } %>)
-        <%_ if (relationship.relationshipValidate && relationship.relationshipRequired) { _%>
-    @NotNull
-        <%_ } _%>
-        <%_ if (relationship.id) { %>
-    @MapsId
-    @JoinColumn(name = "<%= relationship.otherEntity.primaryKey.fields[0].columnName %>")
-        <%_ } else { _%>
-    @JoinColumn(unique = true)
-        <%_ } _%>
-      <%_ } else { _%>
-    @OneToOne(fetch = FetchType.LAZY, mappedBy = "<%= relationship.otherEntityRelationshipName %>")
-      <%_ } -%>
-  <%_ } -%>
-<&_ } -&>
-<%_ } -%>

package/dist/generators/spring-data-relational/templates/src/main/java/_package_/domain/_PersistClass_.java.jhi.spring_data_persistable.ejs

@@ -1,61 +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.
--%>
-<%#
- This is a fragment file, it will be merged into to root template if available.
- EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
--%>
-<&_ if (fragment.importSection) { -&>
-import org.springframework.data.domain.Persistable;
-<%_ if (!relationshipsContainOtherSideIgnore) { _%>
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-<%_ } _%>
-<&_ } -&>
-
-<&_ if (fragment.annotationSection) { -&>
-@JsonIgnoreProperties(value = { "new" })
-<&_ } -&>
-
-<&_ if (fragment.additionalInterfacesSection) { -&>
-, Persistable<<%= primaryKey.type %>>
-<&_ } -&>
-
-<&_ if (fragment.classAdditionalFieldsSection) { -&>
-    @Transient
-    private boolean isPersisted;
-<&_ } -&>
-
-<&_ if (fragment.classAdditionalFieldsMethodsSection) { -&>
-<%_ if (primaryKey.name !== 'id') { -%>
-    @Override
-    public <%= primaryKey.type %> getId() {
-        return this.<%= primaryKey.name %>;
-    }
- <%_ } -%>
-
-    @Transient
-    @Override
-    public boolean isNew() {
-        return !this.isPersisted;
-    }
-
-    public <%= persistClass %> setIsPersisted() {
-        this.isPersisted = true;
-        return this;
-    }
- <&_ } -&>