Skip to content

Commit ab77a57

Browse files
committed
Move AuditedEntity to domain sub package
avoiding architecture violations during ArchUnit tests Fixes jhipster#304
1 parent f07e7f1 commit ab77a57

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

generators/java-audit/__snapshots__/generator.spec.js.snap

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ exports[`SubGenerator java-audit of entity-audit JHipster blueprint > run using
9797
"src/main/java/com/mycompany/myapp/GeneratedByJHipster.java": {
9898
"stateCleared": "modified",
9999
},
100-
"src/main/java/com/mycompany/myapp/config/audit/AuditedEntity.java": {
101-
"stateCleared": "modified",
102-
},
103100
"src/main/java/com/mycompany/myapp/config/audit/JaversAuthorProvider.java": {
104101
"stateCleared": "modified",
105102
},
@@ -112,6 +109,12 @@ exports[`SubGenerator java-audit of entity-audit JHipster blueprint > run using
112109
"src/main/java/com/mycompany/myapp/domain/Authority.java": {
113110
"stateCleared": "modified",
114111
},
112+
"src/main/java/com/mycompany/myapp/domain/audit/AuditedEntity.java": {
113+
"stateCleared": "modified",
114+
},
115+
"src/main/java/com/mycompany/myapp/domain/audit/package-info.java": {
116+
"stateCleared": "modified",
117+
},
115118
"src/main/java/com/mycompany/myapp/domain/package-info.java": {
116119
"stateCleared": "modified",
117120
},

generators/spring-boot-javers/__snapshots__/generator.spec.js.snap

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ exports[`SubGenerator spring-boot-javers of entity-audit JHipster blueprint > ru
88
"src/main/java/com/mycompany/myapp/GeneratedByJHipster.java": {
99
"stateCleared": "modified",
1010
},
11-
"src/main/java/com/mycompany/myapp/config/audit/AuditedEntity.java": {
12-
"stateCleared": "modified",
13-
},
1411
"src/main/java/com/mycompany/myapp/config/audit/JaversAuthorProvider.java": {
1512
"stateCleared": "modified",
1613
},
@@ -20,6 +17,12 @@ exports[`SubGenerator spring-boot-javers of entity-audit JHipster blueprint > ru
2017
"src/main/java/com/mycompany/myapp/domain/Authority.java": {
2118
"stateCleared": "modified",
2219
},
20+
"src/main/java/com/mycompany/myapp/domain/audit/AuditedEntity.java": {
21+
"stateCleared": "modified",
22+
},
23+
"src/main/java/com/mycompany/myapp/domain/audit/package-info.java": {
24+
"stateCleared": "modified",
25+
},
2326
"src/main/java/com/mycompany/myapp/domain/package-info.java": {
2427
"stateCleared": "modified",
2528
},

generators/spring-boot-javers/generator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export default class extends BaseApplicationGenerator {
8686
await this.writeFiles({
8787
blocks: [
8888
javaMainPackageTemplatesBlock({
89-
templates: ['config/audit/JaversAuthorProvider.java', 'config/audit/AuditedEntity.java'],
89+
templates: ['config/audit/JaversAuthorProvider.java', 'domain/audit/AuditedEntity.java'],
9090
}),
9191
javaMainPackageTemplatesBlock({
9292
condition: application.auditPage,

generators/spring-boot-javers/templates/src/main/java/_package_/config/audit/AuditedEntity.java.ejs renamed to generators/spring-boot-javers/templates/src/main/java/_package_/domain/audit/AuditedEntity.java.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package <%=packageName%>.config.audit;
1+
package <%=packageName%>.domain.audit;
22

33
public enum AuditedEntity {
44
;

generators/spring-boot-javers/templates/src/main/java/_package_/web/rest/JaversEntityAuditResource.java.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package <%=packageName%>.web.rest;
22

3-
import <%=packageName%>.config.audit.AuditedEntity;
3+
import <%=packageName%>.domain.audit.AuditedEntity;
44
import <%=packageName%>.web.rest.dto.EntityAuditEvent;
55
import <%=packageName%>.security.AuthoritiesConstants;
66

0 commit comments

Comments
 (0)