generator-jhipster 7.2.0 → 7.4.1

package/generators/languages/index.js

@@ -31,8 +31,6 @@ const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
 const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
 const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -90,10 +88,12 @@ module.exports = class extends BaseBlueprintGenerator {
         }
       });
     }
+  }
 
-    useBlueprints =
-      !this.fromBlueprint &&
-      this.instantiateBlueprints('languages', { languages: this.languagesToApply, arguments: this.options.languages });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('languages', { languages: this.languagesToApply, arguments: this.options.languages });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -118,7 +118,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -131,7 +131,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -170,7 +170,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -193,7 +193,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -214,7 +214,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -229,7 +229,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -258,7 +258,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -292,7 +292,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 };

package/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs

@@ -25,7 +25,7 @@
             },
             "messages": {
                 "info": "Unesite adresu e-pošte koju ste koristili kod registracije",
-                "success": "Provjerite svoju e-poštu radi detalja o tome kako resetirati zaporku.",
+                "success": "Provjerite svoju e-poštu radi detalja o tome kako resetirati zaporku."
             }
         },
         "finish": {
@@ -41,5 +41,4 @@
             }
         }
     }
-
 }

package/generators/languages/templates/src/main/webapp/i18n/vi/login.json

@@ -3,7 +3,7 @@
         "title": "Đăng nhập",
         "form": {
             "password": "Mật khẩu",
-            "password.placeholder": "Nhập mật khầu của bạn",
+            "password.placeholder": "Nhập mật khẩu của bạn",
             "rememberme": "Nhớ tài khoản",
             "button": "Đăng nhập"
         },

package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

package/generators/openapi-client/index.js

@@ -25,8 +25,6 @@ const prompts = require('./prompts');
 const { writeFiles, customizeFiles } = require('./files');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -35,7 +33,12 @@ module.exports = class extends BaseBlueprintGenerator {
       type: Boolean,
       defaults: OpenAPIDefaultValues.REGEN,
     });
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_OPENAPI_CLIENT);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENAPI_CLIENT);
+    }
   }
 
   _initializing() {
@@ -55,7 +58,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -68,7 +71,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -101,7 +104,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -110,7 +113,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -119,7 +122,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -146,7 +149,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   install() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._install();
   }
 
@@ -159,7 +162,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/openshift/index.js

@@ -38,13 +38,12 @@ const NO_DATABASE = databaseTypes.NO;
 const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 const { EPHEMERAL, PERSISTENT } = StorageTypes;
 
-let useBlueprints;
-
 /* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_OPENSHIFT);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENSHIFT);
+    }
   }
 
   _initializing() {
@@ -90,7 +89,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -110,7 +109,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -159,7 +158,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -177,7 +176,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -186,7 +185,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -261,7 +260,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 

package/generators/openshift/templates/deployment.yml.ejs

@@ -190,7 +190,7 @@ objects:
 <%_ if (app.databaseTypeCouchbase) { _%>
             - name: SPRING_COUCHBASE_CONNECTION_STRING
               value: ${APPLICATION_NAME}-couchbase
-            - name: JHIPSTER_COUCHBASE_BUCKET_NAME
+            - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
               value: ${APPLICATION_NAME}
 <%_ } _%>
 <%_ if (app.searchEngineElasticsearch) { _%>

package/generators/page/index.js

@@ -27,8 +27,6 @@ const { PROTRACTOR } = require('../../jdl/jhipster/test-framework-types');
 
 const { VUE } = constants.SUPPORTED_CLIENT_FRAMEWORKS;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -61,8 +59,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.loadRuntimeOptions();
 
     this.rootGenerator = this.env.rootGenerator() === this;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_PAGE);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_PAGE);
+    }
   }
 
   _initializing() {
@@ -81,7 +83,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -92,7 +94,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -110,7 +112,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -130,7 +132,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -147,7 +149,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -165,7 +167,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -183,7 +185,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/server/__snapshots__/generator.spec.mjs.snap

@@ -378,6 +378,10 @@ Object {
           "file": "package/security/jwt/JWTFilter.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/management/SecurityMetersService.java",
+          "renameTo": [Function],
+        },
       ],
     },
     Object {
@@ -1130,10 +1134,18 @@ Object {
       "condition": [Function],
       "path": "src/test/java/",
       "templates": Array [
+        Object {
+          "file": "package/management/SecurityMetersServiceTests.java",
+          "renameTo": [Function],
+        },
         Object {
           "file": "package/security/jwt/TokenProviderTest.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/security/jwt/TokenProviderSecurityMetersTests.java",
+          "renameTo": [Function],
+        },
         Object {
           "file": "package/security/jwt/JWTFilterTest.java",
           "renameTo": [Function],

package/generators/server/files-sql.js

@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+const { SERVER_MAIN_SRC_DIR } = require('../generator-constants');
+
+const sqlFiles = {
+  reactiveJavaUserManagement: [
+    {
+      condition: generator => generator.reactive && (!generator.skipUserManagement || generator.authenticationTypeOauth2),
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/UserSqlHelper.java',
+          renameTo: generator => `${generator.javaDir}repository/UserSqlHelper.java`,
+        },
+      ],
+    },
+  ],
+};
+
+function writeSqlFiles() {
+  return {
+    async writeSqlFiles() {
+      if (!this.databaseTypeSql) return;
+
+      await this.writeFiles({
+        sections: sqlFiles,
+        rootTemplatesPath: ['sql/reactive', 'sql'],
+      });
+    },
+  };
+}
+
+module.exports = {
+  sqlFiles,
+  writeSqlFiles,
+};

package/generators/server/files.js

@@ -30,6 +30,7 @@ const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
 const { CONSUL, EUREKA } = require('../../jdl/jhipster/service-discovery-types');
 const { addSectionsCondition, mergeSections } = require('../utils');
 const { writeCouchbaseFiles } = require('./files-couchbase');
+const { writeSqlFiles } = require('./files-sql');
 
 /* Constants use throughout */
 const NO_DATABASE = databaseTypes.NO;
@@ -451,6 +452,10 @@ const baseServerFiles = {
           file: 'package/security/jwt/JWTFilter.java',
           renameTo: generator => `${generator.javaDir}security/jwt/JWTFilter.java`,
         },
+        {
+          file: 'package/management/SecurityMetersService.java',
+          renameTo: generator => `${generator.javaDir}management/SecurityMetersService.java`,
+        },
       ],
     },
     {
@@ -1597,10 +1602,18 @@ const baseServerFiles = {
       condition: generator => generator.authenticationType === JWT,
       path: SERVER_TEST_SRC_DIR,
       templates: [
+        {
+          file: 'package/management/SecurityMetersServiceTests.java',
+          renameTo: generator => `${generator.testDir}management/SecurityMetersServiceTests.java`,
+        },
         {
           file: 'package/security/jwt/TokenProviderTest.java',
           renameTo: generator => `${generator.testDir}security/jwt/TokenProviderTest.java`,
         },
+        {
+          file: 'package/security/jwt/TokenProviderSecurityMetersTests.java',
+          renameTo: generator => `${generator.testDir}security/jwt/TokenProviderSecurityMetersTests.java`,
+        },
         {
           file: 'package/security/jwt/JWTFilterTest.java',
           renameTo: generator => `${generator.testDir}security/jwt/JWTFilterTest.java`,
@@ -1736,6 +1749,8 @@ function writeFiles() {
     },
 
     ...writeCouchbaseFiles(),
+
+    ...writeSqlFiles(),
   };
 }