Merge pull request #294 from mshima/jhipster-8

upgrade generator-jhipster to v8.0.0

.blueprint/generate-sample/templates/samples/gradle-jwt-react.jdl

@@ -51,7 +51,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}

.blueprint/generate-sample/templates/samples/gradle-oauth-angular.jdl

@@ -49,7 +49,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}

.blueprint/generate-sample/templates/samples/jdl-default-app.jdl

@@ -132,16 +132,16 @@ entity Region {
 
 relationship OneToOne {
   Department{location} to Location,
-  Employee{user(login)} to User
-  // Employee{user(login)} to User with jpaDerivedIdentifier
+  Employee{user(login)} to User with builtInEntity
+  // Employee{user(login)} to User with builtInEntity with jpaDerivedIdentifier
   // Please see: https://github.com/jhipster/generator-jhipster-micronaut/issues/219
 }
 
 relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{theLabel(labelName)} to TheLabel{operation}

.blueprint/generate-sample/templates/samples/mvn-jwt-angular.jdl

@@ -49,7 +49,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}

.blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.jdl

@@ -49,7 +49,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}

.blueprint/generate-sample/templates/samples/mvn-no-client.jdl

@@ -48,7 +48,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name) required}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation required}

.blueprint/generate-sample/templates/samples/sample-app.jdl

@@ -48,7 +48,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}

.eslintrc.json

@@ -3,7 +3,7 @@
     "node": true,
     "es2020": true
   },
-  "extends": ["airbnb-base", "plugin:prettier/recommended"],
+  "extends": ["eslint:recommended", "plugin:prettier/recommended"],
   "parserOptions": {
     "ecmaVersion": 11,
     "sourceType": "module"
@@ -15,7 +15,6 @@
   ],
   "rules": {
     "func-names": "off",
-    "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
     "import/no-unresolved": "off",
     "no-restricted-syntax": [
       "error",

.yo-rc.json

@@ -18,12 +18,6 @@
         "sbs": true,
         "written": true
       },
-      "common": {
-        "command": false,
-        "priorities": ["writing"],
-        "sbs": true,
-        "written": true
-      },
       "cypress": {
         "command": false,
         "priorities": ["postWriting"],
@@ -102,11 +96,12 @@
       }
     },
     "jhipsterVersion": "8.0.0-beta.3",
+    "js": true,
     "localBlueprint": false,
     "prettierDefaultIndent": 2,
     "projectName": "Micronaut Blueprint",
     "sampleWritten": true,
     "skipCommitHook": true,
-    "subGenerators": ["angular", "client", "common", "cypress", "heroku", "react", "server"]
+    "subGenerators": ["angular", "client", "cypress", "heroku", "react", "server"]
   }
 }

.yo-resolve

@@ -1,3 +1,2 @@
-README.md
-cli/cli.cjs
-generators/{angular,client,cypress,common,docker,heroku,liquibase,micronaut-cache,react,server}/{command,generator,generator.spec}.mjs skip
+!package.json skip
+

cli/cli.cjs

@@ -11,7 +11,7 @@ const devBlueprintPath = join(packagePath, '.blueprint');
 
 (async () => {
   const { runJHipster, done, logger } = await import('generator-jhipster/cli');
-  const { getLogo } = await import('./logo.mjs');
+  const { getLogo } = await import('./logo.js');
   const executableName = Object.keys(bin)[0];
 
   runJHipster({

cli/logo.mjs → cli/logo.js

@@ -6,7 +6,6 @@ const {
   versions: { micronaut: MICRONAUT_VERSION },
 } = constants;
 
-// eslint-disable-next-line import/prefer-default-export
 export function getLogo() {
   const { version } = JSON.parse(readFileSync(new URL('../package.json', import.meta.url)));
 

generators/angular/__snapshots__/generator.spec.mjs.snap → generators/angular/__snapshots__/generator.spec.js.snap

@@ -20,7 +20,7 @@ exports[`SubGenerator angular of micronaut JHipster blueprint > run > should suc
   ".husky/pre-commit": {
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "stateCleared": "modified",
   },
   ".prettierignore": {

generators/angular/generator.mjs → generators/angular/generator.js

@@ -1,5 +1,5 @@
 import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
-import { angularFiles } from './files.mjs';
+import { angularFiles } from './files.js';
 
 export default class extends BaseApplicationGenerator {
   constructor(args, opts, features) {

generators/angular/index.js

@@ -0,0 +1 @@
+export { default } from './generator.js';

generators/client/__snapshots__/generator.spec.mjs.snap → generators/client/__snapshots__/generator.spec.js.snap

@@ -20,7 +20,7 @@ exports[`SubGenerator client of micronaut JHipster blueprint > run > should succ
   ".husky/pre-commit": {
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "stateCleared": "modified",
   },
   ".prettierignore": {

generators/client/generator.mjs → generators/client/generator.js

@@ -1,5 +1,5 @@
 import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
-import { commonFiles } from './files.mjs';
+import { commonFiles } from './files.js';
 
 export default class extends BaseApplicationGenerator {
   constructor(args, opts, features) {

generators/client/index.js

@@ -0,0 +1 @@
+export { default } from './generator.js';

generators/cypress/index.js

@@ -0,0 +1 @@
+export { default } from './generator.js';

generators/docker/index.js

@@ -0,0 +1 @@
+export { default } from './generator.js';

generators/heroku/index.js

@@ -0,0 +1,2 @@
+export { default } from './generator.js';
+export { default as command } from './command.js';

generators/liquibase/index.js

@@ -0,0 +1 @@
+export { default } from './generator.js';

generators/micronaut-cache/index.js

@@ -0,0 +1 @@
+export { default } from './generator.js';

generators/react/__snapshots__/generator.spec.mjs.snap → generators/react/__snapshots__/generator.spec.js.snap

@@ -20,7 +20,7 @@ exports[`SubGenerator react of micronaut JHipster blueprint > run > should succe
   ".husky/pre-commit": {
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "stateCleared": "modified",
   },
   ".prettierignore": {

generators/react/index.js

@@ -0,0 +1 @@
+export { default } from './generator.js';

generators/server/__snapshots__/generator.spec.mjs.snap → generators/server/__snapshots__/generator.spec.js.snap

@@ -14,7 +14,7 @@ exports[`SubGenerator server of micronaut JHipster blueprint > run > should succ
   ".husky/pre-commit": {
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "stateCleared": "modified",
   },
   ".mvn/jvm.config": {
@@ -544,7 +544,7 @@ exports[`SubGenerator server of micronaut JHipster blueprint > with some entitie
   ".jhipster/Entity.json": {
     "stateCleared": "modified",
   },
-  ".lintstagedrc.js": {
+  ".lintstagedrc.cjs": {
     "stateCleared": "modified",
   },
   ".mvn/jvm.config": {
@@ -1024,6 +1024,9 @@ exports[`SubGenerator server of micronaut JHipster blueprint > with some entitie
   "src/test/java/com/mycompany/myapp/domain/EntityTest.java": {
     "stateCleared": "modified",
   },
+  "src/test/java/com/mycompany/myapp/domain/EntityTestSamples.java": {
+    "stateCleared": "modified",
+  },
   "src/test/java/com/mycompany/myapp/security/DomainUserDetailsServiceIT.java": {
     "stateCleared": "modified",
   },

generators/server/files.mjs → generators/server/files.js

@@ -281,7 +281,6 @@ export const serverFiles = {
         'config/JHipsterConfigurationEndpoint.java',
         'config/LoggingConfiguration.java',
         'config/MessagesBundleMessageSource.java',
-        'config/package-info.java',
         'config/SnakeCasePhysicalNamingStrategy.java',
         'config/metric/JHipsterMetricsEndpoint.java',
       ],
@@ -322,7 +321,6 @@ export const serverFiles = {
       templates: [
         'security/AuthoritiesConstants.java',
         'security/NotAuthenticatedResponse.java',
-        'security/package-info.java',
         'security/SecurityUtils.java',
         'security/SecurityHeaderFilter.java',
       ],
@@ -346,12 +344,7 @@ export const serverFiles = {
   ],
   serverJavaService: [
     javaMainPackageTemplatesBlock({
-      templates: [
-        'service/dto/package-info.java',
-        'service/mapper/package-info.java',
-        'service/util/RandomUtil.java',
-        'service/package-info.java',
-      ],
+      templates: ['service/util/RandomUtil.java'],
     }),
     javaMainPackageTemplatesBlock({
       condition: generator => !generator.skipUserManagement,
@@ -387,10 +380,6 @@ export const serverFiles = {
         'web/rest/errors/BadRequestAlertException.java',
         'web/rest/errors/ErrorConstants.java',
         'web/rest/errors/FieldErrorVM.java',
-        'web/rest/errors/package-info.java',
-        // VM
-        'web/rest/vm/package-info.java',
-        'web/rest/package-info.java',
       ],
     }),
     javaMainPackageTemplatesBlock({

generators/server/generator.mjs → generators/server/generator.js

@@ -7,21 +7,21 @@ import {
   GENERATOR_MAVEN,
 } from 'generator-jhipster/generators';
 import { createNeedleCallback, createBase64Secret } from 'generator-jhipster/generators/base/support';
+import { addJavaAnnotation } from 'generator-jhipster/generators/java/support';
 import mnConstants from '../constants.cjs';
-import { writeFiles } from './files.mjs';
+import { writeFiles } from './files.js';
 
-import command from './command.mjs';
-import { entityFiles } from './entity-files.mjs';
+import command from './command.js';
+import { entityFiles } from './entity-files.js';
 
 export default class extends ServerGenerator {
-  command = command;
-
   constructor(args, opts, features) {
     super(args, opts, {
       ...features,
       checkBlueprint: true,
     });
 
+    this.command = command;
     if (!this.options.help) {
       this.jhipsterTemplatesFolders.push(
         // For _persistClass_.java.jhi.hibernate_cache file
@@ -72,8 +72,7 @@ export default class extends ServerGenerator {
   get [ServerGenerator.COMPOSING]() {
     return this.asComposingTaskGroup({
       async composing() {
-        const { buildTool, enableTranslation, databaseType, messageBroker, searchEngine, testFrameworks, websocket, cacheProvider } =
-          this.jhipsterConfigWithDefaults;
+        const { buildTool, enableTranslation, databaseType, cacheProvider } = this.jhipsterConfigWithDefaults;
         if (buildTool === 'gradle') {
           await this.composeWithJHipster(GENERATOR_GRADLE);
         } else if (buildTool === 'maven') {
@@ -92,32 +91,6 @@ export default class extends ServerGenerator {
         if (databaseType === 'sql') {
           await this.composeWithJHipster(GENERATOR_LIQUIBASE);
         }
-        /*
-        else if (databaseType === CASSANDRA) {
-          await this.composeWithJHipster(GENERATOR_SPRING_DATA_CASSANDRA);
-        } else if (databaseType === COUCHBASE) {
-          await this.composeWithJHipster(GENERATOR_SPRING_DATA_COUCHBASE);
-        } else if (databaseType === MONGODB) {
-          await this.composeWithJHipster(GENERATOR_SPRING_DATA_MONGODB);
-        } else if (databaseType === NEO4J) {
-          await this.composeWithJHipster(GENERATOR_SPRING_DATA_NEO4J);
-        }
-        if (messageBroker === KAFKA || messageBroker === PULSAR) {
-          await this.composeWithJHipster(GENERATOR_SPRING_CLOUD_STREAM);
-        }
-        if (searchEngine === ELASTICSEARCH) {
-          await this.composeWithJHipster(GENERATOR_SPRING_DATA_ELASTICSEARCH);
-        }
-        if (testFrameworks?.includes(CUCUMBER)) {
-          await this.composeWithJHipster(GENERATOR_CUCUMBER);
-        }
-        if (testFrameworks?.includes(GATLING)) {
-          await this.composeWithJHipster(GENERATOR_GATLING);
-        }
-        if (websocket === SPRING_WEBSOCKET) {
-          await this.composeWithJHipster(GENERATOR_SPRING_WEBSOCKET);
-        }
-        */
         if (['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached', 'redis'].includes(cacheProvider)) {
           await this.composeWithJHipster('jhipster-micronaut:micronaut-cache');
         }

generators/server/generator.spec.mjs → generators/server/generator.spec.js

@@ -59,7 +59,7 @@ describe('SubGenerator server of micronaut JHipster blueprint', () => {
     });
 
     it('should not write jakarta validation', () => {
-      expect(result.fs.read('src/main/java/com/mycompany/myapp/domain/Entity.java.jhi')).toMatch(/^((?!jakarta).)*$/s);
+      expect(result.fs.read('src/main/java/com/mycompany/myapp/domain/Entity.java')).toMatch(/^((?!jakarta).)*$/s);
     });
   });
 });

generators/server/index.js

@@ -0,0 +1,2 @@
+export { default } from './generator.js';
+export { default as command } from './command.js';