generator-jhipster 7.1.0 → 7.4.0

package/generators/spring-controller/index.js

@@ -23,15 +23,31 @@ const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const constants = require('../generator-constants');
 const prompts = require('./prompts');
 const statistics = require('../statistics');
+const { OptionNames } = require('../../jdl/jhipster/application-options');
+const cacheProviders = require('../../jdl/jhipster/cache-types');
+const messageBrokers = require('../../jdl/jhipster/message-broker-types');
+const { GENERATOR_SPRING_CONTROLLER } = require('../generator-list');
 
 const SERVER_MAIN_SRC_DIR = constants.SERVER_MAIN_SRC_DIR;
 const SERVER_TEST_SRC_DIR = constants.SERVER_TEST_SRC_DIR;
-
-let useBlueprints;
+const {
+  BASE_NAME,
+  PACKAGE_NAME,
+  PACKAGE_FOLDER,
+  DATABASE_TYPE,
+  MESSAGE_BROKER,
+  CACHE_PROVIDER,
+  APPLICATION_TYPE,
+  AUTHENTICATION_TYPE,
+  REACTIVE,
+} = OptionNames;
+
+const NO_CACHE_PROVIDER = cacheProviders.NO;
+const NO_MESSAGE_BROKER = messageBrokers.NO;
 
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.argument('name', { type: String, required: true });
     this.name = this.options.name;
@@ -42,8 +58,12 @@ module.exports = class extends BaseBlueprintGenerator {
       description: 'default option',
     });
     this.defaultOption = this.options.default;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('spring-controller', { arguments: [this.name] });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_SPRING_CONTROLLER, { arguments: [this.name] });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -56,19 +76,19 @@ module.exports = class extends BaseBlueprintGenerator {
       initializing() {
         this.log(`The spring-controller ${this.name} is being created.`);
         const configuration = this.config;
-        this.baseName = configuration.get('baseName');
-        this.packageName = configuration.get('packageName');
-        this.packageFolder = configuration.get('packageFolder');
-        this.databaseType = configuration.get('databaseType');
-        this.messageBroker = configuration.get('messageBroker') === 'no' ? false : configuration.get('messageBroker');
-        this.cacheProvider = configuration.get('cacheProvider') || 'no';
+        this.baseName = configuration.get(BASE_NAME);
+        this.packageName = configuration.get(PACKAGE_NAME);
+        this.packageFolder = configuration.get(PACKAGE_FOLDER);
+        this.databaseType = configuration.get(DATABASE_TYPE);
+        this.messageBroker = configuration.get(MESSAGE_BROKER) === NO_MESSAGE_BROKER ? false : configuration.get(MESSAGE_BROKER);
+        this.cacheProvider = configuration.get(CACHE_PROVIDER) || NO_CACHE_PROVIDER;
         if (this.messageBroker === undefined) {
           this.messageBroker = false;
         }
         this.reactiveController = false;
-        this.applicationType = configuration.get('applicationType');
-        this.authenticationType = configuration.get('authenticationType');
-        this.reactive = configuration.get('reactive');
+        this.applicationType = configuration.get(APPLICATION_TYPE);
+        this.authenticationType = configuration.get(AUTHENTICATION_TYPE);
+        this.reactive = configuration.get(REACTIVE);
         this.reactiveController = this.reactive;
         this.controllerActions = [];
       },
@@ -76,7 +96,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -88,7 +108,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -96,13 +116,13 @@ module.exports = class extends BaseBlueprintGenerator {
   _default() {
     return {
       insight() {
-        statistics.sendSubGenEvent('generator', 'spring-controller');
+        statistics.sendSubGenEvent('generator', GENERATOR_SPRING_CONTROLLER);
       },
     };
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -159,7 +179,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 };

package/generators/spring-controller/templates/src/main/java/package/web/rest/Resource.java.ejs

@@ -43,18 +43,18 @@ public class <%= controllerClass %> {
 
     private final Logger log = LoggerFactory.getLogger(<%= controllerClass %>.class);
 
-    <%_ for(let idx in controllerActions) { _%>
+<%_ for(let idx in controllerActions) { _%>
     /**
     * <%= controllerActions[idx].actionMethod.toUpperCase() %> <%= controllerActions[idx].actionName %>
     */
     @<%= controllerActions[idx].actionMethod %>Mapping("/<%= (controllerActions[idx].actionPath) %>")
     public <% if (reactiveController) { %>Mono<String><% } else { %>String<% } %> <%= controllerActions[idx].actionName %>() {
-        <%_ if (reactiveController) { _%>
+  <%_ if (reactiveController) { _%>
         return Mono.just("<%= controllerActions[idx].actionName %>");
-        <%_ } else { _%>
+  <%_ } else { _%>
         return "<%= controllerActions[idx].actionName %>";
-        <%_ } _%>
+  <%_ } _%>
     }
 
-    <%_ } _%>
+<%_ } _%>
 }

package/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs

@@ -48,7 +48,7 @@ class <%= controllerClass %>IT {
             .standaloneSetup(<%= controllerInstance %>)
             .build();
     }
-    <%_ for(let idx in controllerActions) { _%>
+<%_ for(let idx in controllerActions) { _%>
 
     /**
      * Test <%= controllerActions[idx].actionName %>
@@ -58,5 +58,5 @@ class <%= controllerClass %>IT {
         restMockMvc.perform(<%= controllerActions[idx].actionMethod.toLowerCase() %>("/api/<%= apiPrefix %>/<%= controllerActions[idx].actionPath %>"))
             .andExpect(status().isOk());
     }
-    <%_ } _%>
+<%_ } _%>
 }

package/generators/spring-service/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/spring-service/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe.skip('blueprint support', () => testBlueprintSupport(generator));
+});

package/generators/spring-service/index.js

@@ -21,13 +21,15 @@ const _ = require('lodash');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const constants = require('../generator-constants');
 const statistics = require('../statistics');
+const { OptionNames } = require('../../jdl/jhipster/application-options');
+const { GENERATOR_SPRING_SERVICE } = require('../generator-list');
 
+const { BASE_NAME, PACKAGE_NAME, PACKAGE_FOLDER, DATABASE_TYPE } = OptionNames;
 const SERVER_MAIN_SRC_DIR = constants.SERVER_MAIN_SRC_DIR;
 
-let useBlueprints;
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     this.argument('name', { type: String, required: true });
     this.name = this.options.name;
@@ -38,8 +40,12 @@ module.exports = class extends BaseBlueprintGenerator {
       description: 'default option',
     });
     this.defaultOption = this.options.default;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('spring-service', { arguments: [this.name] });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_SPRING_SERVICE, { arguments: [this.name] });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -52,16 +58,16 @@ module.exports = class extends BaseBlueprintGenerator {
       initializing() {
         this.log(`The service ${this.name} is being created.`);
         const configuration = this.config;
-        this.baseName = configuration.get('baseName');
-        this.packageName = configuration.get('packageName');
-        this.packageFolder = configuration.get('packageFolder');
-        this.databaseType = configuration.get('databaseType');
+        this.baseName = configuration.get(BASE_NAME);
+        this.packageName = configuration.get(PACKAGE_NAME);
+        this.packageFolder = configuration.get(PACKAGE_FOLDER);
+        this.databaseType = configuration.get(DATABASE_TYPE);
       },
     };
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -91,21 +97,35 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
+  // Public API method used by the getter and also by Blueprints
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.loadDerivedServerConfig();
+      },
+    };
+  }
+
+  get loading() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
+
   // Public API method used by the getter and also by Blueprints
   _default() {
     return {
       insight() {
-        statistics.sendSubGenEvent('generator', 'service', { interface: this.useInterface });
+        statistics.sendSubGenEvent('generator', GENERATOR_SPRING_SERVICE, { interface: this.useInterface });
       },
     };
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -134,7 +154,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 };

package/generators/spring-service/templates/src/main/java/package/service/Service.java.ejs

@@ -18,17 +18,25 @@
 -%>
 package <%= packageName %>.service;
 
-<% if (useInterface === false) { %>import org.slf4j.Logger;
+<%_ if (!useInterface) { _%>
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;<% if (databaseType === 'sql') { %>
-import org.springframework.transaction.annotation.Transactional;<% } %>
-
-@Service<% if (databaseType === 'sql') { %>
-@Transactional<% } %>
+import org.springframework.stereotype.Service;
+  <%_ if (databaseTypeSql) { _%>
+import org.springframework.transaction.annotation.Transactional;
+  <%_ } _%>
+
+@Service
+  <%_ if (databaseTypeSql) { _%>
+@Transactional
+  <%_ } _%>
 public class <%= serviceClass %> {
 
     private final Logger log = LoggerFactory.getLogger(<%= serviceClass %>.class);
 
-}<% } else  { %>public interface <%= serviceClass %> {
+}
+<%_ } else  { _%>
+public interface <%= serviceClass %> {
 
-}<% } %>
+}
+<%_ } _%>

package/generators/spring-service/templates/src/main/java/package/service/impl/ServiceImpl.java.ejs

@@ -21,11 +21,15 @@ package <%= packageName %>.service.impl;
 import <%= packageName %>.service.<%= serviceClass %>;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;<% if (databaseType === 'sql') { %>
-import org.springframework.transaction.annotation.Transactional;<% } %>
-
-@Service<% if (databaseType === 'sql') { %>
-@Transactional<% } %>
+import org.springframework.stereotype.Service;
+<%_ if (databaseTypeSql) { _%>
+import org.springframework.transaction.annotation.Transactional;
+<%_ } _%>
+
+@Service
+<%_ if (databaseTypeSql) { _%>
+@Transactional
+<%_ } _%>
 public class <%= serviceClass %>Impl implements <%= serviceClass %> {
 
     private final Logger log = LoggerFactory.getLogger(<%= serviceClass %>Impl.class);

package/generators/statistics.js

@@ -71,7 +71,9 @@ class Statistics {
         value: 1,
       });
     };
-    insight.optOut = this.optOut;
+    if (this.optOut !== undefined) {
+      insight.optOut = this.optOut;
+    }
     this.insight = insight;
   }
 

package/generators/upgrade/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/upgrade/generator.spec.mjs

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+});

package/generators/upgrade/index.js

@@ -40,8 +40,8 @@ const FIRST_CLI_SUPPORTED_VERSION = '4.5.1'; // The first version in which CLI s
 const SERVER_MAIN_RES_DIR = constants.SERVER_MAIN_RES_DIR;
 
 module.exports = class extends BaseGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     // This adds support for a `--target-version` flag
     this.option('target-version', {
@@ -89,10 +89,9 @@ module.exports = class extends BaseGenerator {
     // Used for isJhipsterVersionLessThan on cleanup.upgradeFiles
     this.jhipsterOldVersion = this.config.get('jhipsterVersion');
 
-    // Verify 6.6.0 app blueprint bug
-    if (!this.config.existed && !this.options.blueprints && !this.options.help) {
-      this.error(
-        'This seems to be an app blueprinted project with jhipster 6.6.0 bug (https://github.com/jhipster/generator-jhipster/issues/11045), you should pass --blueprints to jhipster upgrade commmand.'
+    if (!this.config.existed) {
+      throw new Error(
+        "Could not find a valid JHipster application configuration, check if the '.yo-rc.json' file exists and if the 'generator-jhipster' key exists inside it."
       );
     }
   }

package/generators/upgrade-config/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/upgrade-config/generator.spec.mjs

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+});

package/generators/upgrade-config/index.js

@@ -21,8 +21,8 @@ const BaseGenerator = require('../generator-base');
 const { parseBluePrints } = require('../../utils/blueprint');
 
 module.exports = class extends BaseGenerator {
-  constructor(args, opts) {
-    super(args, opts);
+  constructor(args, options, features) {
+    super(args, options, features);
 
     if (this.options.help) {
       return;