Skip to content

Commit f9087af

Browse files
committed
Fixed issue of failing duplicate line ending removal
and therefore failing jhipster jdl command. Also avoid prettier formatting to cause producing duplicate entries in the class f
1 parent f07e7f1 commit f9087af

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

generators/spring-boot-javers/generator.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ export default class extends BaseApplicationGenerator {
2222
},
2323
async addNeedle({ application, source }) {
2424
source.addEntityToAuditedEntityEnum = ({ entityAuditEnumValue, entityAbsoluteClass, entityAuditEventType }) => {
25-
const enumValueDeclaration = `${entityAuditEnumValue}(${entityAbsoluteClass}.class, "${entityAuditEventType}")`;
25+
const enumValueDeclarationContent = `${entityAuditEnumValue}(${entityAbsoluteClass}.class, "${entityAuditEventType}")`;
26+
const enumValueDeclarationRegex = new RegExp(
27+
`${entityAuditEnumValue}[\\s\r\n]*\\([\\s\r\n]*${entityAbsoluteClass}\\.class[\\s\r\n]*,[\\s\r\n]*"${entityAuditEventType}"[\\s\r\n]*\\)`,
28+
);
2629
this.editFile(
2730
`${application.javaPackageSrcDir}config/audit/AuditedEntity.java`,
2831
createNeedleCallback({
@@ -39,7 +42,7 @@ export default class extends BaseApplicationGenerator {
3942
const needleIndex = content.indexOf(' // jhipster-needle-add-audited-entities');
4043
let beforeContent = content.substring(0, needleIndex);
4144
// Drop extra line ending if it exists, can be caused by prettier formatting
42-
beforeContent = beforeContent.endsWith('/n/n') ? beforeContent.slice(0, -1) : beforeContent;
45+
beforeContent = beforeContent.endsWith('\n\n') ? beforeContent.slice(0, -1) : beforeContent;
4346
const afterContent = content.substring(needleIndex);
4447

4548
if (!beforeContent.includes(needleValuePrefix) || !beforeContent.endsWith(needleValueSuffix)) {
@@ -50,10 +53,10 @@ export default class extends BaseApplicationGenerator {
5053
let needleContent = beforeContent.substring(beforeNeedleContentIndex).slice(0, -needleValueSuffix.length);
5154
needleContent = needleContent.trim() ? needleContent : '';
5255

53-
const newContent = `${beforeNeedleContent}${needleContent}${needleContent ? needleValueSeparator : ''}${indentPrefix}${enumValueDeclaration}${needleValueSuffix}${afterContent}`;
56+
const newContent = `${beforeNeedleContent}${needleContent}${needleContent ? needleValueSeparator : ''}${indentPrefix}${enumValueDeclarationContent}${needleValueSuffix}${afterContent}`;
5457
return isCrLr ? normalizeLineEndings(newContent, '\r\n') : newContent;
5558
},
56-
contentToCheck: enumValueDeclaration,
59+
contentToCheck: enumValueDeclarationRegex,
5760
}),
5861
);
5962
};

0 commit comments

Comments
 (0)