remove LocaleConfiguration

remove LocaleConfiguration due to be a leftover from angularjs Fix #20106
jhipster · Oct 11, 2023 · e3006ee · e3006ee
1 parent 31dae68
commit e3006ee
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 645 deletions.
diff --git a/generators/server/__snapshots__/generator.spec.mjs.snap b/generators/server/__snapshots__/generator.spec.mjs.snap
@@ -59,9 +59,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",
   },
@@ -301,9 +298,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",
   },
@@ -543,9 +537,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",
   },
@@ -827,9 +818,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/cleanup.mts b/generators/server/cleanup.mts
@@ -192,5 +192,6 @@ export default function cleanupOldServerFilesTask(this: BaseGenerator, taskParam
       this.removeFile(`${application.srcTestResources}META-INF/spring.factories`);
       this.removeFile(`${application.javaPackageTestDir}config/TestContainersSpringContextCustomizerFactory.java`);
     }
+    this.removeFile(`${application.javaPackageSrcDir}config/LocaleConfiguration.java`);
   }
 }
diff --git a/generators/server/files.mjs b/generators/server/files.mjs
@@ -493,11 +493,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: [
     {

diff --git a/generators/server/support/__snapshots__/needles.spec.mts.snap b/generators/server/support/__snapshots__/needles.spec.mts.snap
@@ -116,9 +116,6 @@ exports[`generator - server - support - needles generated project should match s
   "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/needles.spec.mts b/generators/server/support/needles.spec.mts
@@ -78,44 +78,7 @@ describe('generator - server - support - needles', () => {
         });
 
         it('should match snapshot', () => {
-          expect(snapshot).toMatchInlineSnapshot(`
-{
-  "src/main/java/com/mycompany/myapp/config/ApplicationProperties.java": {
-    "contents": "package com.mycompany.myapp.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Properties specific to JHipster.
- * <p>
- * Properties are configured in the {@code application.yml} file.
- * See {@link tech.jhipster.config.JHipsterProperties} for a good example.
- */
-@ConfigurationProperties(prefix = "application", ignoreUnknownFields = false)
-public class ApplicationProperties {
-    private Foo foo;
-    // jhipster-needle-application-properties-property
-
-    private Foo getFoo() {
-        return foo;
-    };
-    // jhipster-needle-application-properties-property-getter
-
-    public static Foo{} {
-        private String bar;
-
-        public String getBar() {
-          return bar;
-        }
-    };
-    // jhipster-needle-application-properties-property-class
-}
-",
-    "state": "modified",
-    "stateCleared": "modified",
-  },
-}
-`);
+          expect(snapshot).toMatchInlineSnapshot(`{}`);
         });
 
         it('should not be add the content at second call', () => {

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