remove LocaleConfiguration

remove LocaleConfiguration due to be a leftover from angularjs Fix #20106
jhipster · Apr 29, 2024 · b837857 · b837857
1 parent 7cf3c1f
commit b837857
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 553 deletions.
diff --git a/generators/server/__snapshots__/generator.spec.js.snap b/generators/server/__snapshots__/generator.spec.js.snap
@@ -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",
   },
@@ -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",
   },
@@ -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",
   },
@@ -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",
   },

diff --git a/generators/server/support/__snapshots__/needles.spec.ts.snap b/generators/server/support/__snapshots__/needles.spec.ts.snap
@@ -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",
   },

diff --git a/...s/server/templates/src/main/java/_package_/config/LocaleConfiguration_imperative.java.ejs b/...s/server/templates/src/main/java/_package_/config/LocaleConfiguration_imperative.java.ejs
diff --git a/...ors/server/templates/src/main/java/_package_/config/LocaleConfiguration_reactive.java.ejs b/...ors/server/templates/src/main/java/_package_/config/LocaleConfiguration_reactive.java.ejs
diff --git a/generators/spring-boot/__snapshots__/generator.spec.ts.snap b/generators/spring-boot/__snapshots__/generator.spec.ts.snap
@@ -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",
   },
@@ -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",
   },

diff --git a/generators/spring-boot/cleanup.ts b/generators/spring-boot/cleanup.ts
@@ -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`);
+  }
 });
diff --git a/generators/spring-boot/files.ts b/generators/spring-boot/files.ts
@@ -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: [
     {