generator-jhipster 8.2.0 → 8.3.0

package/dist/generators/server/support/prepare-entity.mjs

@@ -1,117 +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 path from 'path';
-import { databaseTypes, searchEngineTypes } from '../../../jdl/jhipster/index.mjs';
-import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js';
-import { mutateData, normalizePathEnd } from '../../base/support/index.mjs';
-import { hibernateSnakeCase } from './string.mjs';
-import { getDatabaseTypeData } from './database.mjs';
-import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
-const { ELASTICSEARCH } = searchEngineTypes;
-const NO_SEARCH_ENGINE = searchEngineTypes.NO;
-const { POSTGRESQL, MYSQL, MARIADB, COUCHBASE, SQL } = databaseTypes;
-export default function prepareEntity(entity) {
-    const { entityPackage, packageName, packageFolder, persistClass } = entity;
-    let { entityAbsolutePackage = packageName, entityAbsoluteFolder = packageFolder, entityJavaPackageFolder } = entity;
-    if (entityPackage) {
-        entityJavaPackageFolder = `${entityPackage.replace(/\./g, '/')}/`;
-        entityAbsolutePackage = [packageName, entityPackage].join('.');
-        entityAbsoluteFolder = path.join(packageFolder, entityJavaPackageFolder);
-    }
-    entityAbsoluteFolder = normalizePathEnd(entityAbsoluteFolder);
-    entity.entityJavaPackageFolder = entityJavaPackageFolder ?? '';
-    entity.entityAbsolutePackage = entityAbsolutePackage;
-    entity.entityAbsoluteFolder = entityAbsoluteFolder;
-    entity.entityAbsoluteClass = `${entityAbsolutePackage}.domain.${persistClass}`;
-    mutateData(entity, {
-        entityJavadoc: ({ documentation }) => (documentation ? formatDocAsJavaDoc(documentation) : documentation),
-        entityApiDescription: ({ documentation }) => (documentation ? formatDocAsApiDescription(documentation) : documentation),
-    });
-    if (isReservedTableName(entity.entityInstance, entity.prodDatabaseType ?? entity.databaseType) && entity.jhiPrefix) {
-        entity.entityInstanceDbSafe = `${entity.jhiPrefix}${entity.entityClass}`;
-    }
-    else {
-        entity.entityInstanceDbSafe = entity.entityInstance;
-    }
-}
-export function loadRequiredConfigDerivedProperties(entity) {
-    entity.jhiTablePrefix = hibernateSnakeCase(entity.jhiPrefix);
-    entity.searchEngineCouchbase = entity.searchEngine === COUCHBASE;
-    entity.searchEngineElasticsearch = entity.searchEngine === ELASTICSEARCH;
-    entity.searchEngineAny = entity.searchEngine && entity.searchEngine !== NO_SEARCH_ENGINE;
-    entity.searchEngineNo = !entity.searchEngineAny;
-}
-export function preparePostEntityServerDerivedProperties(entity) {
-    const { databaseType, reactive } = entity;
-    entity.officialDatabaseType = getDatabaseTypeData(databaseType).name;
-    let springDataDatabase;
-    if (entity.databaseType !== SQL) {
-        springDataDatabase = entity.officialDatabaseType;
-        if (reactive) {
-            springDataDatabase += ' reactive';
-        }
-    }
-    else {
-        springDataDatabase = reactive ? 'R2DBC' : 'JPA';
-    }
-    entity.springDataDescription = `Spring Data ${springDataDatabase}`;
-    // Blueprints may disable cypress relationships by setting to false.
-    entity.cypressBootstrapEntities = true;
-    // Reactive with some r2dbc databases doesn't allow insertion without data.
-    entity.workaroundEntityCannotBeEmpty = entity.reactive && [POSTGRESQL, MYSQL, MARIADB].includes(entity.prodDatabaseType);
-    // Reactive with MariaDB doesn't allow null value at Instant fields.
-    entity.workaroundInstantReactiveMariaDB = entity.reactive && entity.prodDatabaseType === MARIADB;
-    entity.relationships
-        .filter(relationship => relationship.ignoreOtherSideProperty === undefined)
-        .forEach(relationship => {
-        relationship.ignoreOtherSideProperty =
-            entity.databaseType !== 'neo4j' &&
-                !relationship.embedded &&
-                !!relationship.otherEntity &&
-                relationship.otherEntity.relationships.length > 0;
-    });
-    entity.relationshipsContainOtherSideIgnore = entity.relationships.some(relationship => relationship.ignoreOtherSideProperty);
-    entity.importApiModelProperty =
-        entity.relationships.some(relationship => relationship.documentation) || entity.fields.some(field => field.documentation);
-    entity.uniqueEnums = {};
-    entity.fields.forEach(field => {
-        if (field.fieldIsEnum &&
-            (!entity.uniqueEnums[field.fieldType] || (entity.uniqueEnums[field.fieldType] && field.fieldValues.length !== 0))) {
-            entity.uniqueEnums[field.fieldType] = field.fieldType;
-        }
-    });
-    if (entity.primaryKey && entity.primaryKey.derived) {
-        entity.isUsingMapsId = true;
-        entity.mapsIdAssoc = entity.relationships.find(rel => rel.id);
-    }
-    else {
-        entity.isUsingMapsId = false;
-        entity.mapsIdAssoc = null;
-    }
-    entity.reactiveOtherEntities = new Set(entity.reactiveEagerRelations.map(rel => rel.otherEntity));
-    entity.reactiveUniqueEntityTypes = new Set(entity.reactiveEagerRelations.map(rel => rel.otherEntityNameCapitalized));
-    entity.reactiveUniqueEntityTypes.add(entity.entityClass);
-    if (entity.databaseType === 'sql') {
-        for (const relationship of entity.relationships) {
-            if (!relationship.otherEntity.embedded) {
-                relationship.joinColumnNames = relationship.otherEntity.primaryKey.fields.map(otherField => `${relationship.columnNamePrefix}${otherField.columnName}`);
-            }
-        }
-    }
-}

package/dist/generators/server/support/prepare-field.mjs

@@ -1,163 +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 assert from 'assert';
-import * as _ from 'lodash-es';
-import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../jdl/jhipster/index.mjs';
-import { getUXConstraintName } from './database.mjs';
-import { hibernateSnakeCase } from './string.mjs';
-import { getJavaValueGeneratorForType } from './templates/field-values.mjs';
-import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
-const TYPE_BYTES = fieldTypes.RelationalOnlyDBTypes.BYTES;
-const TYPE_BYTE_BUFFER = fieldTypes.RelationalOnlyDBTypes.BYTE_BUFFER;
-const { isReservedTableName } = reservedKeywords;
-const { CommonDBTypes } = fieldTypes;
-const { MYSQL, SQL } = databaseTypes;
-const { MapperTypes } = entityOptions;
-const { MAPSTRUCT } = MapperTypes;
-const { INTEGER, LONG, UUID } = CommonDBTypes;
-const { snakeCase, upperFirst } = _;
-export default function prepareField(entityWithConfig, field, generator) {
-    if (field.mapstructExpression) {
-        assert.equal(entityWithConfig.dto, MAPSTRUCT, `@MapstructExpression requires an Entity with mapstruct dto [${entityWithConfig.name}.${field.fieldName}].`);
-        // Remove from Entity.java and liquibase.
-        field.transient = true;
-        // Disable update form.
-        field.readonly = true;
-    }
-    if (field.documentation) {
-        field.fieldJavadoc = formatDocAsJavaDoc(field.documentation, 4);
-        field.fieldApiDescription = formatDocAsApiDescription(field.documentation);
-    }
-    if (field.id && entityWithConfig.primaryKey) {
-        if (field.autoGenerate === undefined) {
-            field.autoGenerate = !entityWithConfig.primaryKey.composite && [INTEGER, LONG, UUID].includes(field.fieldType);
-        }
-        if (!field.autoGenerate) {
-            field.liquibaseAutoIncrement = false;
-            field.jpaGeneratedValue = false;
-            field.autoGenerateByService = false;
-            field.autoGenerateByRepository = false;
-            field.requiresPersistableImplementation = true;
-        }
-        else if (entityWithConfig.databaseType !== SQL) {
-            field.liquibaseAutoIncrement = false;
-            field.jpaGeneratedValue = false;
-            field.autoGenerateByService = field.fieldType === UUID;
-            field.autoGenerateByRepository = !field.autoGenerateByService;
-            field.requiresPersistableImplementation = false;
-            field.readonly = true;
-        }
-        else if (entityWithConfig.reactive) {
-            field.liquibaseAutoIncrement = field.fieldType === LONG;
-            field.jpaGeneratedValue = false;
-            field.autoGenerateByService = !field.liquibaseAutoIncrement;
-            field.autoGenerateByRepository = !field.autoGenerateByService;
-            field.requiresPersistableImplementation = !field.liquibaseAutoIncrement;
-            field.readonly = true;
-        }
-        else {
-            const defaultGenerationType = entityWithConfig.prodDatabaseType === MYSQL ? 'identity' : 'sequence';
-            field.jpaGeneratedValue = field.jpaGeneratedValue || [INTEGER, LONG].includes(field.fieldType) ? defaultGenerationType : true;
-            field.jpaGeneratedValueSequence = field.jpaGeneratedValue === 'sequence';
-            field.jpaGeneratedValueIdentity = field.jpaGeneratedValue === 'identity';
-            field.autoGenerateByService = false;
-            field.autoGenerateByRepository = true;
-            field.requiresPersistableImplementation = false;
-            field.readonly = true;
-            if (field.jpaGeneratedValueIdentity) {
-                field.liquibaseAutoIncrement = true;
-            }
-            else if (field.jpaGeneratedValueSequence) {
-                field.jpaSequenceGeneratorName = field.sequenceGeneratorName ?? 'sequenceGenerator';
-                field.liquibaseSequenceGeneratorName = snakeCase(field.jpaSequenceGeneratorName);
-                field.liquibaseCustomSequenceGenerator = field.liquibaseSequenceGeneratorName !== 'sequence_generator';
-            }
-        }
-    }
-    if (field.fieldNameAsDatabaseColumn === undefined) {
-        const fieldNameUnderscored = snakeCase(field.fieldName);
-        const jhiFieldNamePrefix = hibernateSnakeCase(entityWithConfig.jhiPrefix);
-        if (isReservedTableName(fieldNameUnderscored, entityWithConfig.prodDatabaseType ?? entityWithConfig.databaseType)) {
-            if (!jhiFieldNamePrefix) {
-                generator.log.warn(`The field name '${fieldNameUnderscored}' is regarded as a reserved keyword, but you have defined an empty jhiPrefix. This might lead to a non-working application.`);
-                field.fieldNameAsDatabaseColumn = fieldNameUnderscored;
-            }
-            else {
-                field.fieldNameAsDatabaseColumn = `${jhiFieldNamePrefix}_${fieldNameUnderscored}`;
-            }
-        }
-        else {
-            field.fieldNameAsDatabaseColumn = fieldNameUnderscored;
-        }
-    }
-    field.columnName = field.fieldNameAsDatabaseColumn;
-    if (field.unique) {
-        field.uniqueConstraintName = getUXConstraintName(entityWithConfig.entityTableName, field.columnName, {
-            prodDatabaseType: entityWithConfig.prodDatabaseType,
-        }).value;
-    }
-    if (field.fieldInJavaBeanMethod === undefined) {
-        // Handle the specific case when the second letter is capitalized
-        // See http://stackoverflow.com/questions/2948083/naming-convention-for-getters-setters-in-java
-        if (field.fieldName.length > 1) {
-            const firstLetter = field.fieldName.charAt(0);
-            const secondLetter = field.fieldName.charAt(1);
-            if (firstLetter === firstLetter.toLowerCase() && secondLetter === secondLetter.toUpperCase()) {
-                field.fieldInJavaBeanMethod = firstLetter.toLowerCase() + field.fieldName.slice(1);
-            }
-            else {
-                field.fieldInJavaBeanMethod = upperFirst(field.fieldName);
-            }
-        }
-        else {
-            field.fieldInJavaBeanMethod = upperFirst(field.fieldName);
-        }
-    }
-    if (field.fieldValidateRulesPatternJava === undefined) {
-        field.fieldValidateRulesPatternJava = field.fieldValidateRulesPattern
-            ? field.fieldValidateRulesPattern.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
-            : field.fieldValidateRulesPattern;
-    }
-    if (field.blobContentTypeText) {
-        field.javaFieldType = 'String';
-    }
-    else {
-        field.javaFieldType = field.fieldType;
-    }
-    if (field.fieldTypeInteger || field.fieldTypeLong || field.fieldTypeString || field.fieldTypeUUID) {
-        if (field.fieldTypeInteger) {
-            field.javaValueSample1 = '1';
-            field.javaValueSample2 = '2';
-        }
-        else if (field.fieldTypeLong) {
-            field.javaValueSample1 = '1L';
-            field.javaValueSample2 = '2L';
-        }
-        else if (field.fieldTypeString) {
-            field.javaValueSample1 = `"${field.fieldName}1"`;
-            field.javaValueSample2 = `"${field.fieldName}2"`;
-        }
-        else if (field.fieldTypeUUID) {
-            field.javaValueSample1 = 'UUID.fromString("23d8dc04-a48b-45d9-a01d-4b728f0ad4aa")';
-            field.javaValueSample2 = 'UUID.fromString("ad79f240-3727-46c3-b89f-2cf6ebd74367")';
-        }
-        field.javaValueGenerator = getJavaValueGeneratorForType(field.javaFieldType);
-    }
-    field.filterableField = ![TYPE_BYTES, TYPE_BYTE_BUFFER].includes(field.fieldType);
-}

package/dist/generators/server/support/prepare-relationship.mjs

@@ -1,7 +0,0 @@
-import { formatDocAsApiDescription, formatDocAsJavaDoc } from './doc.mjs';
-export function prepareRelationship({ relationship }) {
-    if (relationship.documentation) {
-        relationship.relationshipJavadoc = formatDocAsJavaDoc(relationship.documentation, 4);
-        relationship.relationshipApiDescription = formatDocAsApiDescription(relationship.documentation);
-    }
-}

package/dist/generators/server/support/relationship.mjs

@@ -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.
- */
-import { addOtherRelationship } from '../../base-application/support/index.mjs';
-// eslint-disable-next-line import/prefer-default-export
-export const addEntitiesOtherRelationships = (entities) => {
-    const result = { warning: [] };
-    for (const entity of entities) {
-        for (const relationship of entity.relationships ?? []) {
-            if (!relationship.otherRelationship &&
-                (relationship.otherEntityRelationshipName ||
-                    relationship.relationshipType === 'many-to-many' ||
-                    // OneToOne back reference is required due to filtering
-                    (relationship.relationshipType === 'one-to-one' && entity.databaseType === 'sql') ||
-                    (relationship.relationshipType === 'one-to-many' && entity.databaseType !== 'neo4j' && entity.databaseType !== 'no'))) {
-                if (relationship.otherEntity.builtIn) {
-                    result.warning.push(`Ignoring '${entity.name}' definitions as it is using a built-in Entity '${relationship.otherEntityName}': 'otherEntityRelationshipName' is set with value '${relationship.otherEntityRelationshipName}' at relationship '${relationship.relationshipName}' but no back-reference was found`);
-                }
-                else {
-                    relationship.otherRelationship = addOtherRelationship(entity, relationship.otherEntity, relationship);
-                }
-            }
-        }
-    }
-    return result;
-};

package/dist/generators/server/support/spring-factories.mjs

@@ -1,12 +0,0 @@
-import properties from 'dot-properties';
-// eslint-disable-next-line import/prefer-default-export
-export const addSpringFactory = ({ key, value }) => content => {
-    const obj = properties.parse(content ?? '');
-    const oldContent = obj[key];
-    const factories = (oldContent?.split(',') ?? []).map(val => val.trim());
-    if (factories.includes(value)) {
-        return content;
-    }
-    obj[key] = [...factories, value].join(',');
-    return properties.stringify(obj);
-};

package/dist/generators/server/support/string.mjs

@@ -1,46 +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.
- */
-/**
- * get hibernate SnakeCase in JHipster preferred style.
- *
- * @param {string} value - table column name or table name string
- * @see org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy
- * @returns hibernate SnakeCase in JHipster preferred style
- */
-// eslint-disable-next-line import/prefer-default-export
-export function hibernateSnakeCase(value) {
-    let res = '';
-    if (value) {
-        value = value.replace('.', '_');
-        res = value[0];
-        for (let i = 1, len = value.length - 1; i < len; i++) {
-            if (value[i - 1] !== value[i - 1].toUpperCase() &&
-                value[i] !== value[i].toLowerCase() &&
-                value[i + 1] !== value[i + 1].toUpperCase()) {
-                res += `_${value[i]}`;
-            }
-            else {
-                res += value[i];
-            }
-        }
-        res += value[value.length - 1];
-        res = res.toLowerCase();
-    }
-    return res;
-}

package/dist/generators/server/support/templates/field-values.mjs

@@ -1,68 +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 { fieldTypes, databaseTypes } from '../../../../jdl/jhipster/index.mjs';
-const dbTypes = fieldTypes;
-const { STRING, UUID, LONG, INTEGER } = dbTypes.CommonDBTypes;
-const { SQL } = databaseTypes;
-/**
- * @private
- */
-// eslint-disable-next-line import/prefer-default-export
-export const getJavaValueGeneratorForType = (type) => {
-    if (type === STRING) {
-        return 'UUID.randomUUID().toString()';
-    }
-    if (type === UUID) {
-        return 'UUID.randomUUID()';
-    }
-    if (type === INTEGER) {
-        return 'intCount.incrementAndGet()';
-    }
-    if (type === LONG) {
-        return 'longCount.incrementAndGet()';
-    }
-    throw new Error(`Java type ${type} does not have a random generator implemented`);
-};
-/**
- * @private
- * Returns the primary key value based on the primary key type, DB and default value
- *
- * @param {string} primaryKey - the primary key type
- * @param {string} databaseType - the database type
- * @param {string} defaultValue - default value
- * @returns {string} java primary key value
- */
-export const getPrimaryKeyValue = (primaryKey, databaseType, defaultValue = 1) => {
-    if (typeof primaryKey === 'object' && primaryKey.composite) {
-        return `new ${primaryKey.type}(${primaryKey.references
-            .map(ref => getPrimaryKeyValue(ref.type, databaseType, defaultValue))
-            .join(', ')})`;
-    }
-    const primaryKeyType = typeof primaryKey === 'string' ? primaryKey : primaryKey.type;
-    if (primaryKeyType === STRING) {
-        if (databaseType === SQL && defaultValue === 0) {
-            return getJavaValueGeneratorForType(primaryKeyType);
-        }
-        return `"id${defaultValue}"`;
-    }
-    if (primaryKeyType === UUID) {
-        return getJavaValueGeneratorForType(primaryKeyType);
-    }
-    return `${defaultValue}L`;
-};

package/dist/generators/server/support/update-languages.mjs

@@ -1,36 +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.
- */
-/**
- * Update Languages In MailServiceIT
- *
- * @param application
- */
-export function updateLanguagesInMailServiceITTask({ application, control }) {
-    const { javaPackageTestDir, languagesDefinition } = application;
-    const { ignoreNeedlesError: ignoreNonExisting } = control;
-    let newContent = 'private static final String[] languages = {\n';
-    languagesDefinition?.forEach((language, i) => {
-        newContent += `        "${language.languageTag}"${i !== languagesDefinition.length - 1 ? ',' : ''}\n`;
-    });
-    newContent += '        // jhipster-needle-i18n-language-constant - JHipster will add/remove languages in this array\n    };';
-    this.editFile(`${javaPackageTestDir}/service/MailServiceIT.java`, { ignoreNonExisting }, content => content.replace(/private.*static.*String.*languages.*\{([^}]*jhipster-needle-i18n-language-constant[^}]*)\};/g, newContent));
-}
-export default function updateLanguagesTask(taskParam) {
-    updateLanguagesInMailServiceITTask.call(this, taskParam);
-}

package/dist/generators/server/templates/_global_partials_entity_/it_patch_update.partial.java.ejs

@@ -1,74 +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.
--%>
-int databaseSizeBeforeUpdate = <%= entityInstance %>Repository.findAll()<%= callListBlock %>.size();
-
-// Update the <%= entityInstance %> using partial update
-<%= persistClass %> partialUpdated<%= persistClass %> = new <%= persistClass %>();
-partialUpdated<%= persistClass %>.set<%= primaryKey.nameCapitalized %>(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>());
-<%_ fieldsToUpdate = fields.filter(field => field.includeField) %>
-<%_ if (fluentMethods && fieldsToUpdate.length > 0) { _%>
-    partialUpdated<%= persistClass %><% for (field of fieldsToUpdate) { %>
-        .<%= field.fieldName %>(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>)<% if (field.fieldWithContentType) { %>
-            .<%= field.fieldName %>ContentType(<%= 'UPDATED_' + field.fieldNameUnderscored.toUpperCase() %>_CONTENT_TYPE)<% } %><% } %>;
-<%_ } else { _%>
-  <%_ for (field of fieldsToUpdate) { _%>
-    <%_ if (field.includeField) { %>
-    partialUpdated<%= persistClass %>.set<%= field.fieldInJavaBeanMethod %>(<%= field.updateWithValue %>);
-      <%_ if (field.fieldWithContentType) { _%>
-        partialUpdated<%= persistClass %>.set<%= field.fieldInJavaBeanMethod %>ContentType(<%= field.updateWithValue %>_CONTENT_TYPE);
-      <%_ } _%>
-    <%_ } _%>
-  <%_ } _%>
-<%_ } _%>
-
-<%_ if (reactive) { _%>
-webTestClient
-.patch()
-.uri(ENTITY_API_URL_ID, partialUpdated<%= persistClass %>.get<%= primaryKey.nameCapitalized %>())
-.contentType(MediaType.valueOf("application/merge-patch+json"))
-.bodyValue(TestUtil.convertObjectToJsonBytes(<%= 'partialUpdated' + persistClass %>))
-.exchange()
-.expectStatus()
-.isOk();
-<%_ } else { _%>
-rest<%= entityClass %>MockMvc.perform(patch(ENTITY_API_URL_ID, partialUpdated<%= persistClass %>.get<%= primaryKey.nameCapitalized %>())<% if (authenticationUsesCsrf) { %>.with(csrf())<% }%>
-.contentType("application/merge-patch+json")
-.content(TestUtil.convertObjectToJsonBytes(<%= 'partialUpdated' + persistClass %>)))
-.andExpect(status().isOk());
-<%_ } _%>
-
-// Validate the <%= entityClass %> in the database
-<%_ if (databaseTypeCouchbase) { _%>
-SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
-<%_ } _%>
-List<<%= persistClass %>> <%= entityInstance %>List = <%= entityInstance %>Repository.findAll()<%= callListBlock %>;
-assertThat(<%= entityInstance %>List).hasSize(databaseSizeBeforeUpdate);
-<%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(<%= entityInstance %>List.size() - 1);
-<%_ for (field of fields) { _%>
-  <%_ if (field.fieldTypeZonedDateTime) { _%>
-    assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>()).isEqualTo(<%= field.testWithConstant %>);
-  <%_ } else if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
-    assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>()).isEqualTo(<%= field.testWithConstant %>);
-    assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>ContentType()).isEqualTo(<%= field.testWithConstant %>_CONTENT_TYPE);
-  <%_ } else if (field.fieldTypeBigDecimal) { _%>
-    assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>()).isEqualByComparingTo(<%= field.testWithConstant %>);
-  <%_ } else { _%>
-    assertThat(test<%= entityClass %>.get<%= field.fieldInJavaBeanMethod %>()).isEqualTo(<%= field.testWithConstant %>);
-  <%_ } _%>
-<%_ } _%>

package/dist/generators/server/templates/_global_partials_entity_/save_template.ejs

@@ -1,71 +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 instanceType = restClass;
-const instanceName = restInstance;
-const mapper = entityInstance  + 'Mapper';
-const dtoToEntity = mapper + '.' + 'toEntity';
-const entityToDto = mapper + '.' + 'toDto';
-const entityToDtoReference = mapper + '::' + 'toDto';
-const returnPrefix = (returnDirectly && !searchEngineElasticsearch) ? 'return' : instanceType + ' result =';
-let resultEntity;
-let mapsIdEntityInstance;
-let mapsIdRepoInstance;
-let otherEntityName;
-
-if (isUsingMapsId) {
-    mapsIdEntityInstance = mapsIdAssoc.otherEntityNameCapitalized.charAt(0).toLowerCase() + mapsIdAssoc.otherEntityNameCapitalized.slice(1);
-    mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`;
-    otherEntityName = mapsIdAssoc.otherEntityName;
-  if (isController) { _%>
-        if (Objects.isNull(<%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>())) {
-            throw new BadRequestAlertException("Invalid association value provided", ENTITY_NAME, "null");
-        }
-  <%_ } _%>
-<%_ } _%>
-<%_ if (!viaService) { _%>
-  <%_ if (dtoMapstruct) { _%>
-    <%_ resultEntity = persistInstance; _%>
-        <%= persistClass %> <%= persistInstance %> = <%= dtoToEntity %>(<%= instanceName %>);
-    <%_ if (isUsingMapsId) { _%>
-        <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>();
-        <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= persistInstance %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= mapsIdAssoc.relationshipName %><%_ } _%>);
-    <%_ } _%>
-        <%= persistInstance %> = <%= entityInstance %>Repository.save(<%= persistInstance %>);
-        <%= returnPrefix %> <%= entityToDto %>(<%= persistInstance %>);
-  <%_ } else {
-      resultEntity = 'result'; _%>
-    <%_ if (isUsingMapsId) { _%>
-        <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>();
-        <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= instanceName %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= otherEntityName %><%_ } _%>);
-    <%_ } _%>
-        <%= returnPrefix %> <%= entityInstance %>Repository.save(<%= persistInstance %>);
-  <%_ } _%>
-  <%_ if (searchEngineElasticsearch) { _%>
-        <%= entityInstance %>SearchRepository.index(<%= resultEntity %>);
-    <%_ if (returnDirectly) { _%>
-        return result;
-    <%_ } _%>
-  <%_ } _%>
-<%_ } else { _%>
-  <%_ if (isUsingMapsId && !isController) { _%>
-        <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= entityInstance %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>();
-        <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= entityInstance %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= otherEntityName %><%_ } _%>);
-  <%_ } _%>
-        <%= returnPrefix %> <%= entityInstance %>Service.save(<%= instanceName %>);
-<%_ } _%>