@@ -22,7 +22,10 @@ export default class extends BaseApplicationGenerator {
22
22
} ,
23
23
async addNeedle ( { application, source } ) {
24
24
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
+ ) ;
26
29
this . editFile (
27
30
`${ application . javaPackageSrcDir } config/audit/AuditedEntity.java` ,
28
31
createNeedleCallback ( {
@@ -39,7 +42,7 @@ export default class extends BaseApplicationGenerator {
39
42
const needleIndex = content . indexOf ( ' // jhipster-needle-add-audited-entities' ) ;
40
43
let beforeContent = content . substring ( 0 , needleIndex ) ;
41
44
// 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 ;
43
46
const afterContent = content . substring ( needleIndex ) ;
44
47
45
48
if ( ! beforeContent . includes ( needleValuePrefix ) || ! beforeContent . endsWith ( needleValueSuffix ) ) {
@@ -50,10 +53,10 @@ export default class extends BaseApplicationGenerator {
50
53
let needleContent = beforeContent . substring ( beforeNeedleContentIndex ) . slice ( 0 , - needleValueSuffix . length ) ;
51
54
needleContent = needleContent . trim ( ) ? needleContent : '' ;
52
55
53
- const newContent = `${ beforeNeedleContent } ${ needleContent } ${ needleContent ? needleValueSeparator : '' } ${ indentPrefix } ${ enumValueDeclaration } ${ needleValueSuffix } ${ afterContent } ` ;
56
+ const newContent = `${ beforeNeedleContent } ${ needleContent } ${ needleContent ? needleValueSeparator : '' } ${ indentPrefix } ${ enumValueDeclarationContent } ${ needleValueSuffix } ${ afterContent } ` ;
54
57
return isCrLr ? normalizeLineEndings ( newContent , '\r\n' ) : newContent ;
55
58
} ,
56
- contentToCheck : enumValueDeclaration ,
59
+ contentToCheck : enumValueDeclarationRegex ,
57
60
} ) ,
58
61
) ;
59
62
} ;
0 commit comments