Skip to content

Commit

Permalink
Create _persistClass_Samples.java.ejs
Browse files Browse the repository at this point in the history
  • Loading branch information
mshima committed Oct 29, 2023
1 parent 0def0e9 commit 6b496fb
Show file tree
Hide file tree
Showing 18 changed files with 786 additions and 18 deletions.
19 changes: 12 additions & 7 deletions generators/base-application/support/prepare-field.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { fieldTypes, validations } from '../../../jdl/jhipster/index.mjs';
import { getTypescriptType, prepareField as prepareClientFieldForTemplates } from '../../client/support/index.mjs';
import { prepareField as prepareServerFieldForTemplates } from '../../server/support/index.mjs';
import { fieldIsEnum } from './field-utils.mjs';
import { mutateData } from '../../base/support/config.mjs';

const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
const {
Expand Down Expand Up @@ -266,14 +267,18 @@ export default function prepareField(entityWithConfig, field, generator) {
}

function prepareCommonFieldForTemplates(entityWithConfig, field, generator) {
_.defaults(field, {
propertyName: field.fieldName,
mutateData(field, {
path: [field.fieldName],
fieldNameCapitalized: _.upperFirst(field.fieldName),
fieldNameUnderscored: _.snakeCase(field.fieldName),
fieldNameHumanized: _.startCase(field.fieldName),
fieldTranslationKey: `${entityWithConfig.i18nKeyPrefix}.${field.fieldName}`,
tsType: getTypescriptType(field.fieldType),
propertyName: field.fieldName,
propertyNameCapitalized: ({ propertyName }) => _.upperFirst(propertyName),
fieldNameCapitalized: ({ fieldName }) => _.upperFirst(fieldName),
fieldNameUnderscored: ({ fieldName }) => _.snakeCase(fieldName),
fieldNameHumanized: ({ fieldName }) => _.startCase(fieldName),
fieldTranslationKey: ({ fieldName }) => `${entityWithConfig.i18nKeyPrefix}.${fieldName}`,
tsType: ({ fieldType }) => getTypescriptType(fieldType),
});

_.defaults(field, {
entity: entityWithConfig,
});
const fieldType = field.fieldType;
Expand Down
4 changes: 3 additions & 1 deletion generators/base-application/support/prepare-relationship.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
import { upperFirstCamelCase } from '../../base/support/string.mjs';
import { getJoinTableName, hibernateSnakeCase } from '../../server/support/index.mjs';
import { stringifyApplicationData } from './debug.mjs';
import { mutateData } from '../../base/support/config.mjs';

const { isReservedTableName } = reservedKeywords;
const { NEO4J, NO: DATABASE_NO } = databaseTypes;
Expand Down Expand Up @@ -160,8 +161,9 @@ export default function prepareRelationship(entityWithConfig, relationship, gene
otherEntityNameCapitalizedPlural: pluralize(relationship.otherEntityNameCapitalized),
});

_.defaults(relationship, {
mutateData(relationship, {
propertyName: relationship.collection ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName,
propertyNameCapitalized: ({ propertyName }) => _.upperFirst(propertyName),
});

if (entityWithConfig.dto === MAPSTRUCT) {
Expand Down
18 changes: 18 additions & 0 deletions generators/bootstrap-application/generator.spec.mts
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@ describe(`generator - ${generator}`, () => {
"generateFakeData": Any<Function>,
"id": true,
"javaFieldType": "UUID",
"javaValueGenerator": "UUID.randomUUID()",
"javaValueSample1": "UUID.fromString("23d8dc04-a48b-45d9-a01d-4b728f0ad4aa")",
"javaValueSample2": "UUID.fromString("ad79f240-3727-46c3-b89f-2cf6ebd74367")",
"jpaGeneratedValue": true,
"jpaGeneratedValueIdentity": false,
"jpaGeneratedValueSequence": false,
Expand Down Expand Up @@ -387,6 +390,9 @@ describe(`generator - ${generator}`, () => {
"filterableField": true,
"generateFakeData": Any<Function>,
"javaFieldType": "String",
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""id1"",
"javaValueSample2": ""id2"",
"loadColumnType": "string",
"nullable": true,
"path": [
Expand Down Expand Up @@ -459,6 +465,9 @@ describe(`generator - ${generator}`, () => {
"filterableField": true,
"generateFakeData": Any<Function>,
"javaFieldType": "String",
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""id1"",
"javaValueSample2": ""id2"",
"loadColumnType": "string",
"nullable": true,
"path": [
Expand Down Expand Up @@ -531,6 +540,9 @@ describe(`generator - ${generator}`, () => {
"filterableField": true,
"generateFakeData": Any<Function>,
"javaFieldType": "String",
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""id1"",
"javaValueSample2": ""id2"",
"loadColumnType": "string",
"nullable": true,
"path": [
Expand Down Expand Up @@ -793,6 +805,9 @@ describe(`generator - ${generator}`, () => {
"generateFakeData": Any<Function>,
"id": true,
"javaFieldType": "UUID",
"javaValueGenerator": "UUID.randomUUID()",
"javaValueSample1": "UUID.fromString("23d8dc04-a48b-45d9-a01d-4b728f0ad4aa")",
"javaValueSample2": "UUID.fromString("ad79f240-3727-46c3-b89f-2cf6ebd74367")",
"jpaGeneratedValue": true,
"jpaGeneratedValueIdentity": false,
"jpaGeneratedValueSequence": false,
Expand Down Expand Up @@ -1112,6 +1127,9 @@ describe(`generator - ${generator}`, () => {
"generateFakeData": Any<Function>,
"id": true,
"javaFieldType": "UUID",
"javaValueGenerator": "UUID.randomUUID()",
"javaValueSample1": "UUID.fromString("23d8dc04-a48b-45d9-a01d-4b728f0ad4aa")",
"javaValueSample2": "UUID.fromString("ad79f240-3727-46c3-b89f-2cf6ebd74367")",
"jpaGeneratedValue": true,
"jpaGeneratedValueIdentity": false,
"jpaGeneratedValueSequence": false,
Expand Down
15 changes: 15 additions & 0 deletions generators/entities/__snapshots__/generator.spec.mts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -278,12 +278,21 @@ exports[`generator - entities regenerating all entities should match snapshot 1`
"src/test/java/com/mycompany/myapp/domain/BarTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/BarTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/SkipTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/SkipTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/web/rest/BarResourceIT.java": {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -565,9 +574,15 @@ exports[`generator - entities regenerating some entities should match snapshot 1
"src/test/java/com/mycompany/myapp/domain/BarTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/BarTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/web/rest/BarResourceIT.java": {
"stateCleared": "modified",
},
Expand Down
6 changes: 6 additions & 0 deletions generators/java/__snapshots__/generator.spec.mts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,14 @@ exports[`generator - java with default config should match files snapshot 1`] =
"src/test/java/com/mycompany/myapp/domain/BarTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/BarTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTestSamples.java": {
"stateCleared": "modified",
},
}
`;
2 changes: 1 addition & 1 deletion generators/java/entity-files.mts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const entityServerFiles: WriteFileSection = {
],
modelTestFiles: [
javaTestPackageTemplatesBlock({
templates: ['_entityPackage_/domain/_persistClass_Test.java'],
templates: ['_entityPackage_/domain/_persistClass_Test.java', '_entityPackage_/domain/_persistClass_TestSamples.java'],
}),
],
server: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
-%>
package <%= entityAbsolutePackage %>.domain;

import static <%= entityAbsolutePackage %>.domain.<%= persistClass %>TestSamples.*;
<%_ for (const otherEntity of otherEntities.filter(otherEntity => !otherEntity.builtIn)) { _%>
import static <%= otherEntity.entityAbsolutePackage %>.domain.<%= otherEntity.persistClass %>TestSamples.*;
<%_ } _%>
<%_ for (const otherEntity of otherEntities.filter(otherEntity => entityPackage !== otherEntity.entityPackage)) { _%>
import <%= otherEntity.entityAbsolutePackage %>.domain.<%= otherEntity.persistClass %>;
<%_ } _%>
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import <%= packageName %>.web.rest.TestUtil;
Expand All @@ -31,15 +38,55 @@ class <%= persistClass %>Test {
void equalsVerifier() throws Exception {
TestUtil.equalsVerifier(<%= persistClass %>.class);
<%_if (!embedded) { _%>
<%= persistClass %> <%= persistInstance %>1 = new <%= persistClass %>();
<%= persistInstance %>1.set<%= primaryKey.nameCapitalized %>(<% if (primaryKey.typeInteger) { %>1<% } else if (primaryKey.typeLong) { %>1L<% } else if (primaryKey.typeString) { %>"id1"<% } else if (primaryKey.typeUUID) { %>UUID.randomUUID()<% } %>);
<%= persistClass %> <%= persistInstance %>1 = get<%= persistClass %>Sample1();
<%= persistClass %> <%= persistInstance %>2 = new <%= persistClass %>();
assertThat(<%= persistInstance %>1).isNotEqualTo(<%= persistInstance %>2);

<%= persistInstance %>2.set<%= primaryKey.nameCapitalized %>(<%= persistInstance %>1.get<%= primaryKey.nameCapitalized %>());
assertThat(<%= persistInstance %>1).isEqualTo(<%= persistInstance %>2);
<%= persistInstance %>2.set<%= primaryKey.nameCapitalized %>(<% if (primaryKey.typeInteger) { %>2<% } else if (primaryKey.typeLong) { %>2L<% } else if (primaryKey.typeString) { %>"id2"<% } else if (primaryKey.typeUUID) { %>UUID.randomUUID()<% } %>);
assertThat(<%= persistInstance %>1).isNotEqualTo(<%= persistInstance %>2);
<%= persistInstance %>1.set<%= primaryKey.nameCapitalized %>(null);

<%= persistInstance %>2 = get<%= persistClass %>Sample2();
assertThat(<%= persistInstance %>1).isNotEqualTo(<%= persistInstance %>2);
<%_} _%>
}
<%_ for (const relationship of relationships.filter(relationship => !relationship.otherEntity.builtIn)) { _%>

@Test
void <%- relationship.relationshipName %>Test() throws Exception {
<%= persistClass %> <%= persistInstance %> = get<%= persistClass %>RandomSampleGenerator();
<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntity.persistInstance %>Back = get<%= relationship.otherEntity.persistClass %>RandomSampleGenerator();
<%_ if (relationship.collection) { _%>

<%= persistInstance %>.add<%- relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistInstance %>Back);
assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).containsOnly(<%= relationship.otherEntity.persistInstance %>Back);
<%_ } else { _%>

<%= persistInstance %>.set<%- relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistInstance %>Back);
assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).isEqualTo(<%= relationship.otherEntity.persistInstance %>Back);
<%_ } _%>
<%_ if (relationship.otherRelationship && !relationship.ownerSide && !relationship.otherEntity.embedded) { _%>
<%_ if (relationship.otherRelationship.collection) { _%>
assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).containsOnly(<%= persistInstance %>);
<%_ } else { _%>
assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).isEqualTo(<%= persistInstance %>);
<%_ } _%>
<%_ } _%>
<%_ if (relationship.collection) { _%>

<%= persistInstance %>.remove<%- relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistInstance %>Back);
assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).doesNotContain(<%= relationship.otherEntity.persistInstance %>Back);
<%_ } else { _%>

<%= persistInstance %>.set<%- relationship.relationshipNameCapitalized %>(null);
assertThat(<%= persistInstance %>.get<%- relationship.propertyNameCapitalized %>()).isNull();
<%_ } _%>
<%_ if (relationship.otherRelationship && !relationship.ownerSide && !relationship.otherEntity.embedded) { _%>
<%_ if (relationship.otherRelationship.collection) { _%>
assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.propertyNameCapitalized %>()).doesNotContain(<%= relationship.otherEntity.persistInstance %>);
<%_ } else { _%>
assertThat(<%= relationship.otherEntity.persistInstance %>Back.get<%- relationship.otherRelationship.propertyNameCapitalized %>()).isNull();
<%_ } _%>
<%_ } _%>
}
<%_ } _%>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<%#
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.
-%>
package <%= entityAbsolutePackage %>.domain;

import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import <%= packageName %>.web.rest.TestUtil;
<%_ if (fields.some(field => field.fieldTypeString) || fields.some(field => field.fieldTypeUUID)) { _%>
import java.util.UUID;
<%_ } _%>
<%_ if (fields.some(field => field.fieldTypeLong || field.fieldTypeInteger)) { _%>
import java.util.Random;
<%_ } _%>
<%_ if (fields.some(field => field.fieldTypeLong)) { _%>
import java.util.concurrent.atomic.AtomicLong;
<%_ } _%>
<%_ if (fields.some(field => field.fieldTypeInteger)) { _%>
import java.util.concurrent.atomic.AtomicInteger;
<%_ } _%>

<%_ const sampleFields = fields.filter(field => !field.mapstructExpression && (field.fieldTypeInteger || field.fieldTypeLong || field.fieldTypeString || field.fieldTypeUUID)); _%>
public class <%= persistClass %>TestSamples {

<%_ if (fields.some(field => field.fieldTypeLong || field.fieldTypeInteger)) { _%>
private static final Random random = new Random();
<%_ } _%>
<%_ if (fields.some(field => field.fieldTypeLong)) { _%>
private static final AtomicLong longCount = new AtomicLong(random.nextInt() + ( 2 * Integer.MAX_VALUE ));
<%_ } _%>
<%_ if (fields.some(field => field.fieldTypeInteger)) { _%>
private static final AtomicInteger intCount = new AtomicInteger(random.nextInt() + ( 2 * Short.MAX_VALUE ));
<%_ } _%>

public static <%= persistClass %> get<%= persistClass %>Sample1() {
<%_ if (fluentMethods) { _%>
return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample1 %>)<% }) %>;
<%_ } else { _%>
<%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
<%_ for (const field of sampleFields) { _%>
<%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueSample1 %>);
<%_ } _%>
return <%= persistInstance %>;
<%_ } _%>
}

public static <%= persistClass %> get<%= persistClass %>Sample2() {
<%_ if (fluentMethods) { _%>
return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample2 %>)<% }) %>;
<%_ } else { _%>
<%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
<%_ for (const field of sampleFields) { _%>
<%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueSample2 %>);
<%_ } _%>
return <%= persistInstance %>;
<%_ } _%>
}

public static <%= persistClass %> get<%= persistClass %>RandomSampleGenerator() {
<%_ if (fluentMethods) { _%>
return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueGenerator %>)<% }) %>;
<%_ } else { _%>
<%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
<%_ for (const field of sampleFields) { _%>
<%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueGenerator %>);
<%_ } _%>
return <%= persistInstance %>;
<%_ } _%>
}
}
6 changes: 6 additions & 0 deletions generators/server/__snapshots__/generator.spec.mjs.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1121,9 +1121,15 @@ exports[`generator - server with entities should match files snapshot 1`] = `
"src/test/java/com/mycompany/myapp/domain/BarTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/BarTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTest.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/domain/FooTestSamples.java": {
"stateCleared": "modified",
},
"src/test/java/com/mycompany/myapp/management/SecurityMetersServiceTests.java": {
"stateCleared": "modified",
},
Expand Down
17 changes: 17 additions & 0 deletions generators/server/support/prepare-field.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ 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;
Expand Down Expand Up @@ -152,5 +153,21 @@ export default function prepareField(entityWithConfig, field, generator) {
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);
}
7 changes: 5 additions & 2 deletions generators/server/support/templates/field-values.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ export const getJavaValueGeneratorForType = (type) => {
if (type === UUID) {
return 'UUID.randomUUID()';
}
if (type === LONG || type === INTEGER) {
return 'count.incrementAndGet()';
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`);
}
Expand Down
Loading

0 comments on commit 6b496fb

Please sign in to comment.