Merge pull request #23396 from mshima/skip_ci-cleanup

drop generator-base-todo

generators/azure-app-service/generator.mjs

@@ -33,6 +33,8 @@ import { GENERATOR_AZURE_APP_SERVICE } from '../generator-list.mjs';
 import { buildToolTypes } from '../../jdl/jhipster/index.mjs';
 import { mavenPluginConfiguration } from './templates.mjs';
 import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedServerConfig, loadServerConfig } from '../server/support/index.mjs';
 
 const isWin32 = os.platform() === 'win32';
 
@@ -82,8 +84,8 @@ export default class AzureAppServiceGenerator extends BaseGenerator {
         this.log.log(chalk.bold('Azure App Service configuration is starting'));
       },
       getSharedConfig() {
-        this.loadAppConfig();
-        this.loadServerConfig();
+        loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+        loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
       },
       getConfig() {
         this.azureAppServiceResourceGroupName = ''; // This is not saved, as it is better to get the Azure default variable
@@ -480,11 +482,11 @@ which is free for the first 30 days`);
   }
 
   _computeDerivedConfig(config = this.jhipsterConfigWithDefaults, dest = this) {
-    this.loadAppConfig(config, dest);
-    this.loadServerConfig(config, dest);
+    loadAppConfig({ config, dest, useVersionPlaceholders: this.useVersionPlaceholders });
+    loadServerConfig({ config, application: dest });
 
-    this.loadDerivedAppConfig(dest);
-    this.loadDerivedServerConfig(dest, dest);
+    loadDerivedAppConfig({ application: dest });
+    loadDerivedServerConfig({ application: dest });
     dest.azureAppInsightsInstrumentationKeyEmpty = config.azureAppInsightsInstrumentationKey === '';
   }
 

generators/azure-spring-cloud/generator.mjs

@@ -33,6 +33,8 @@ import { mavenProfile } from './templates.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
 import { getFrontendAppName } from '../base/support/index.mjs';
 import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
 
 const { MEMCACHED } = cacheTypes;
 
@@ -72,13 +74,13 @@ export default class AzureSpringCloudGenerator extends BaseGenerator {
         this.log.log(chalk.bold('Azure Spring Cloud configuration is starting'));
       },
       getSharedConfig() {
-        this.loadAppConfig();
-        this.loadServerConfig();
-        this.loadPlatformConfig();
+        loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+        loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+        loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
 
-        this.loadDerivedAppConfig();
-        this.loadDerivedServerConfig();
-        this.loadDerivedPlatformConfig();
+        loadDerivedAppConfig({ application: this });
+        loadDerivedServerConfig({ application: this });
+        loadDerivedPlatformConfig({ application: this });
       },
       getConfig() {
         this.env.options.appPath = this.config.get('appPath') || CLIENT_MAIN_SRC_DIR;
@@ -327,9 +329,9 @@ ${chalk.red('az extension add --name spring-cloud')}`,
     return {
       derivedProperties() {
         this.isPackageNameJhipsterTech = this.packageName !== 'tech.jhipster';
-        this.loadDerivedServerConfig();
-        this.loadDerivedPlatformConfig();
-        this.loadDerivedAppConfig();
+        loadDerivedServerConfig({ application: this });
+        loadDerivedPlatformConfig({ application: this });
+        loadDerivedAppConfig({ application: this });
       },
     };
   }

generators/base-workspaces/internal/docker-base.mjs

@@ -23,6 +23,8 @@ import { convertSecretToBase64, createBase64Secret, removeFieldsWithNullishValue
 import { applicationTypes, buildToolTypes, getConfigWithDefaults } from '../../../jdl/jhipster/index.mjs';
 import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
 import { loadDeploymentConfig } from '../../base-workspaces/internal/index.mjs';
+import { loadDerivedAppConfig } from '../../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig } from '../../server/support/index.mjs';
 
 const { MAVEN } = buildToolTypes;
 const { MONOLITH, MICROSERVICE, GATEWAY } = applicationTypes;
@@ -97,13 +99,9 @@ export function loadConfigs() {
       config.composePort = serverPort + index;
       this.log.debug(chalk.red.bold(`${config.baseName} has compose port ${config.composePort} and appIndex ${config.applicationIndex}`));
 
-      this.loadAppConfig(config, config);
-      this.loadServerConfig(config, config);
-      this.loadPlatformConfig(config, config);
-
-      this.loadDerivedAppConfig(config);
-      this.loadDerivedPlatformConfig(config);
-      this.loadDerivedServerConfig(config);
+      loadDerivedAppConfig({ application: config });
+      loadDerivedPlatformConfig({ application: config });
+      loadDerivedServerConfig({ application: config });
 
       if (config.applicationType === MONOLITH) {
         this.monolithicNb++;

generators/base/generator.mts

@@ -25,7 +25,6 @@ import _ from 'lodash';
 import type { ComposeOptions } from 'yeoman-generator';
 import { packageJson } from '../../lib/index.mjs';
 import { packageNameToNamespace, removeFieldsWithNullishValues } from './support/index.mjs';
-import JHipsterBaseGenerator from './generator-base-todo.mjs';
 import { mergeBlueprints, parseBluePrints, loadBlueprintsFromConfiguration, normalizeBlueprintName } from './internal/index.mjs';
 import { PRIORITY_NAMES } from './priorities.mjs';
 import { BaseGeneratorDefinition, GenericTaskGroup } from './tasks.mjs';
@@ -42,7 +41,7 @@ const { defaults } = _;
  */
 export default class JHipsterBaseBlueprintGenerator<
   Definition extends BaseGeneratorDefinition = BaseGeneratorDefinition,
-> extends JHipsterBaseGenerator {
+> extends CoreGenerator {
   fromBlueprint!: boolean;
   sbsBlueprint?: boolean;
   delegateToBlueprint?: boolean;

generators/bootstrap-application-base/generator.mts

@@ -36,7 +36,7 @@ import { DOCKER_DIR } from '../generator-constants.mjs';
 import { GENERATOR_BOOTSTRAP, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.mjs';
 import { packageJson } from '../../lib/index.mjs';
 import { loadLanguagesConfig } from '../languages/support/index.mjs';
-import { loadStoredAppOptions } from '../app/support/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../app/support/index.mjs';
 
 const isWin32 = os.platform() === 'win32';
 
@@ -85,7 +85,11 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
   get loading() {
     return this.asLoadingTaskGroup({
       loadApplication({ application, control }) {
-        this.loadAppConfig(undefined, application);
+        loadAppConfig({
+          config: this.jhipsterConfigWithDefaults,
+          application,
+          useVersionPlaceholders: (this as any).useVersionPlaceholders,
+        });
         loadLanguagesConfig({ application, config: this.jhipsterConfigWithDefaults, control });
       },
       loadNodeDependencies({ application }) {
@@ -110,7 +114,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
   get preparing() {
     return this.asPreparingTaskGroup({
       prepareApplication({ application }) {
-        this.loadDerivedAppConfig(application);
+        loadDerivedAppConfig({ application });
 
         application.nodePackageManager = 'npm';
         application.dockerServicesDir = DOCKER_DIR;

generators/bootstrap-application-client/generator.mts

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { preparePostEntityClientDerivedProperties } from '../client/support/index.mjs';
+import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.mjs';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_BOOTSTRAP_APPLICATION_BASE } from '../generator-list.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
@@ -37,7 +37,7 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
   get loading() {
     return this.asLoadingTaskGroup({
       loadApplication({ application }) {
-        this.loadClientConfig(undefined, application);
+        loadClientConfig({ config: this.jhipsterConfigWithDefaults, application });
       },
     });
   }
@@ -49,7 +49,7 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
   get preparing() {
     return this.asPreparingTaskGroup({
       prepareApplication({ application }) {
-        this.loadDerivedClientConfig(application);
+        loadDerivedClientConfig({ application });
       },
     });
   }

generators/bootstrap-application-server/generator.mts

@@ -38,6 +38,8 @@ import {
   getGradleLibsVersionsProperties,
   addEntitiesOtherRelationships,
   hibernateSnakeCase,
+  loadServerConfig,
+  loadDerivedServerConfig,
 } from '../server/support/index.mjs';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.mjs';
 import { dockerPlaceholderGenerator, getDockerfileContainers } from '../docker/utils.mjs';
@@ -58,7 +60,7 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
   get loading() {
     return this.asLoadingTaskGroup({
       async loadApplication({ application }) {
-        this.loadServerConfig(undefined, application);
+        loadServerConfig({ config: this.jhipsterConfigWithDefaults, application });
 
         (application as any).gradleVersion = this.useVersionPlaceholders ? 'GRADLE_VERSION' : GRADLE_VERSION;
         application.backendType = 'Java';
@@ -97,7 +99,7 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
   get preparing() {
     return this.asPreparingTaskGroup({
       prepareApplication({ application }) {
-        this.loadDerivedServerConfig(application);
+        loadDerivedServerConfig({ application });
       },
       prepareForTemplates({ application: app }) {
         const application: any = app;

generators/ci-cd/generator.mjs

@@ -27,6 +27,8 @@ import { NODE_VERSION, SERVER_MAIN_RES_DIR, JAVA_VERSION } from '../generator-co
 import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_CI_CD } from '../generator-list.mjs';
 import { buildToolTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.mjs';
 import { createPomStorage } from '../maven/support/pom-store.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedServerConfig, loadServerConfig } from '../server/support/index.mjs';
 
 const { MAVEN, GRADLE } = buildToolTypes;
 const { REACT } = clientFrameworkTypes;
@@ -97,11 +99,11 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
       },
 
       getSharedConfig() {
-        this.loadAppConfig();
-        this.loadServerConfig();
+        loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+        loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
 
-        this.loadDerivedAppConfig();
-        this.loadDerivedServerConfig();
+        loadDerivedAppConfig({ application: this });
+        loadDerivedServerConfig({ application: this });
       },
 
       getConfig() {

generators/client/support/config.mts

@@ -1,14 +1,13 @@
 import { clientFrameworkTypes } from '../../../jdl/index.js';
 import { getFrontendAppName } from '../../base/support/basename.mjs';
 import { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR } from '../../generator-constants.mjs';
-import { ClientApplication } from '../types.mjs';
 
 const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 
 /**
  * Load client configs into application.
  */
-export const loadClientConfig = ({ config, application }: { config: any; application: ClientApplication }) => {
+export const loadClientConfig = ({ config, application }: { config: any; application: any }) => {
   (application as any).clientPackageManager = config.clientPackageManager;
   application.clientFramework = config.clientFramework;
   (application as any).clientTheme = config.clientTheme;
@@ -22,7 +21,7 @@ export const loadClientConfig = ({ config, application }: { config: any; applica
 /**
  * Load client derived properties.
  */
-export const loadDerivedClientConfig = ({ application }: { application: ClientApplication }) => {
+export const loadDerivedClientConfig = ({ application }: { application: any }) => {
   application.clientFrameworkAngular = application.clientFramework === ANGULAR;
   application.clientFrameworkReact = application.clientFramework === REACT;
   application.clientFrameworkVue = application.clientFramework === VUE;

generators/cloudfoundry/generator.mjs

@@ -31,6 +31,8 @@ import { GENERATOR_CLOUDFOUNDRY } from '../generator-list.mjs';
 import { cacheTypes, buildToolTypes, databaseTypes } from '../../jdl/jhipster/index.mjs';
 import { getFrontendAppName } from '../base/support/index.mjs';
 import { buildApplication } from '../server/internal/index.mjs';
+import { loadAppConfig, loadDerivedAppConfig } from '../app/support/index.mjs';
+import { loadDerivedPlatformConfig, loadDerivedServerConfig, loadPlatformConfig, loadServerConfig } from '../server/support/index.mjs';
 
 const { MEMCACHED } = cacheTypes;
 const { GRADLE, MAVEN } = buildToolTypes;
@@ -56,12 +58,13 @@ export default class CloudfoundryGenerator extends BaseGenerator {
       },
 
       getSharedConfig() {
-        this.loadAppConfig();
-        this.loadServerConfig();
-        this.loadPlatformConfig();
+        loadAppConfig({ config: this.jhipsterConfigWithDefaults, application: this, useVersionPlaceholders: this.useVersionPlaceholders });
+        loadServerConfig({ config: this.jhipsterConfigWithDefaults, application: this });
+        loadPlatformConfig({ config: this.jhipsterConfigWithDefaults, application: this });
 
-        this.loadDerivedAppConfig();
-        this.loadDerivedServerConfig();
+        loadDerivedAppConfig({ application: this });
+        loadDerivedPlatformConfig({ application: this });
+        loadDerivedServerConfig({ application: this });
       },
       getConfig() {
         const configuration = this.config;