Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove LocaleConfiguration #23818

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Remove LocaleConfiguration #23818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions generators/server/__snapshots__/generator.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ exports[`generator - server composing databaseType option no with jwt should mat
"src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -289,9 +286,6 @@ exports[`generator - server composing databaseType option no with oauth2 should
"src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -525,9 +519,6 @@ exports[`generator - server composing databaseType option no with session should
"src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -815,9 +806,6 @@ exports[`generator - server with entities should match files snapshot 1`] = `
"src/main/java/com/mycompany/myapp/config/LiquibaseConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
"stateCleared": "modified",
},
Expand Down
3 changes: 0 additions & 3 deletions generators/server/support/__snapshots__/needles.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ exports[`generator - server - support - needles generated project should match s
"src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
"stateCleared": "modified",
},
Expand Down
43 changes: 0 additions & 43 deletions ...s/server/templates/src/main/java/_package_/config/LocaleConfiguration_imperative.java.ejs
View file
Open in desktop

This file was deleted.

184 changes: 0 additions & 184 deletions ...ors/server/templates/src/main/java/_package_/config/LocaleConfiguration_reactive.java.ejs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions generators/spring-boot/__snapshots__/generator.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ exports[`generator - spring-boot with jwt should match generated files snapshot
"src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
"stateCleared": "modified",
},
Expand Down Expand Up @@ -427,9 +424,6 @@ exports[`generator - spring-boot with oauth2 should match generated files snapsh
"src/main/java/com/mycompany/myapp/config/JacksonConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LocaleConfiguration.java": {
"stateCleared": "modified",
},
"src/main/java/com/mycompany/myapp/config/LoggingAspectConfiguration.java": {
"stateCleared": "modified",
},
Expand Down
4 changes: 4 additions & 0 deletions generators/spring-boot/cleanup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,8 @@ export default asWritingTask(function cleanupTask(this, taskParam) {
this.removeFile('gradle/sonar.gradle');
}
}

if (this.isJhipsterVersionLessThan('8.4.0')) {
this.removeFile(`${application.javaPackageSrcDir}config/LocaleConfiguration.java`);
}
});
5 changes: 0 additions & 5 deletions generators/spring-boot/files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,6 @@ export const baseServerFiles = {
renameTo: moveToJavaPackageSrcDir,
templates: ['config/Constants.java'],
},
{
path: `${SERVER_MAIN_SRC_DIR}_package_/`,
renameTo: moveToJavaPackageSrcDir,
templates: [data => `config/LocaleConfiguration_${data.imperativeOrReactive}.java`],
},
],
serverJavaDomain: [
{
Expand Down
Loading
Loading