Merge pull request #437 from mshima/microservice

Fix microservice support
jhipster · Jan 16, 2025 · 405da10 · 405da10
2 parents a4bf49c + 31fd88d
commit 405da10
Show file tree

Hide file tree

Showing 12 changed files with 2,493 additions and 170 deletions.
diff --git a/.blueprint/generate-sample/templates/samples/microservice-jwt.jdl b/.blueprint/generate-sample/templates/samples/microservice-jwt.jdl
@@ -0,0 +1,30 @@
+application {
+  config {
+    applicationType microservice
+    authenticationType jwt
+    baseName jhipsterSampleApplication
+    creationTimestamp 1617901618891
+    packageName io.github.jhipster.sample
+  }
+
+  entities *
+}
+
+entity BankAccount {
+  name String required,
+  balance BigDecimal required
+}
+entity Label {
+  label String required minlength(3)
+}
+entity Operation {
+  date Instant required,
+  description String,
+  amount BigDecimal required unique
+}
+relationship OneToMany {
+  BankAccount{operation} to Operation{bankAccount(name)}
+}
+relationship ManyToMany {
+  Operation{label(label)} to Label{operation}
+}
diff --git a/.blueprint/generate-sample/templates/samples/microservice-oauth2.jdl b/.blueprint/generate-sample/templates/samples/microservice-oauth2.jdl
@@ -0,0 +1,30 @@
+application {
+  config {
+    applicationType microservice
+    authenticationType oauth2
+    baseName jhipsterSampleApplication
+    creationTimestamp 1617901618891
+    packageName io.github.jhipster.sample
+  }
+
+  entities *
+}
+
+entity BankAccount {
+  name String required,
+  balance BigDecimal required
+}
+entity Label {
+  label String required minlength(3)
+}
+entity Operation {
+  date Instant required,
+  description String,
+  amount BigDecimal required unique
+}
+relationship OneToMany {
+  BankAccount{operation} to Operation{bankAccount(name)}
+}
+relationship ManyToMany {
+  Operation{label(label)} to Label{operation}
+}
diff --git a/.blueprint/github-build-matrix/__snapshots__/generator.spec.mjs.snap b/.blueprint/github-build-matrix/__snapshots__/generator.spec.mjs.snap
@@ -87,6 +87,30 @@ exports[`generator - github-build-matrix > with samples > should match matrix va
       "sample-type": "jdl",
       "samples-group": "samples",
     },
+    {
+      "default-environment": "prod",
+      "java-version": "17",
+      "job-name": "microservice-jwt",
+      "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
+      "node-version": "22.12.0",
+      "npm-version": "11.0.0",
+      "os": "ubuntu-latest",
+      "sample": "microservice-jwt",
+      "sample-type": "jdl",
+      "samples-group": "samples",
+    },
+    {
+      "default-environment": "prod",
+      "java-version": "17",
+      "job-name": "microservice-oauth2",
+      "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
+      "node-version": "22.12.0",
+      "npm-version": "11.0.0",
+      "os": "ubuntu-latest",
+      "sample": "microservice-oauth2",
+      "sample-type": "jdl",
+      "samples-group": "samples",
+    },
     {
       "default-environment": "prod",
       "java-version": "17",

diff --git a/.github/workflows/smoke-test-imperative.yml b/.github/workflows/smoke-test-imperative.yml
@@ -38,13 +38,17 @@ jobs:
                     - imperative-ngx-jwt-maven-mysql-redis
                     - imperative-sql-jwt-maven-no-db
                     - imperative-ngx-oauth2-maven-mysql-caffeine
+                    - microservice-jwt
+                    - microservice-oauth2
                 include:
                     - app: imperative-ngx-jwt-maven-mysql-caffeine
                     - app: imperative-ngx-jwt-maven-mongodb-caffeine
                     - app: imperative-ngx-jwt-maven-psql-nocache
                     - app: imperative-react-jwt-gradle-mysql-caffeine
                     - app: imperative-ngx-jwt-maven-mysql-redis
                     - app: imperative-ngx-oauth2-maven-mysql-caffeine
+                    - app: microservice-jwt
+                    - app: microservice-oauth2
                 exclude:
                     - app: imperative-sql-jwt-maven-no-db
                     - app: imperative-ngx-jwt-gradle-mongodb-redis
@@ -142,7 +146,7 @@ jobs:
               run: npm run ci:backend:test
             - name: 'Run JHipster Application client tests'
               if: steps.compare.outputs.equals != 'true'
-              run: npm run ci:frontend:test
+              run: npm run ci:frontend:test --if-present
             - name: 'Packaging'
               if: steps.compare.outputs.equals != 'true'
               run: npm run ci:e2e:package