From 9a52160304757cb76c584c74942447ae966f9685 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 18 Jun 2024 08:05:07 -0300 Subject: [PATCH 1/6] update samples --- .../.jhipster/DocumentBankAccount.json | 4 +-- .../samples/.jhipster/EmbeddedOperation.json | 1 - .../.jhipster/FieldTestEnumWithValue.json | 4 ++- .../.jhipster/JpaFilteringRelationship.json | 4 +-- .../.jhipster/MapsIdChildEntityWithDTO.json | 2 +- .../MapsIdChildEntityWithoutDTO.json | 2 +- .../MapsIdGrandchildEntityWithDTO.json | 2 +- .../MapsIdGrandchildEntityWithoutDTO.json | 2 +- .../.jhipster/MapsIdParentEntityWithDTO.json | 2 +- .../MapsIdParentEntityWithoutDTO.json | 2 +- .../.jhipster/MapsIdUserProfileWithDTO.json | 2 +- .../samples/app-sample-dev/.yo-rc.json | 10 +++--- test-integration/samples/jdl-default/app.jdl | 6 ++-- .../samples/jdl-entities/custom-id.jdl | 36 +++++++++---------- .../samples/jdl-entities/entities.jdl | 4 +-- .../.yo-rc.json | 8 ++--- .../.yo-rc.json | 8 ++--- .../samples/ms-micro-consul/.yo-rc.json | 7 ++-- .../samples/ms-micro-eureka/.yo-rc.json | 7 ++-- .../.yo-rc.json | 10 +++--- .../.yo-rc.json | 10 +++--- .../samples/ms-ngx-gateway-consul/.yo-rc.json | 8 ++--- .../samples/ms-ngx-gateway-eureka/.yo-rc.json | 8 ++--- .../ms-react-gateway-consul-jwt/.yo-rc.json | 6 ++-- .../.yo-rc.json | 6 ++-- .../.yo-rc.json | 10 +++--- .../{ngx-default => ng-default}/.yo-rc.json | 16 +++++---- .../.yo-rc.json | 8 ++--- .../.yo-rc.json | 12 ++++--- .../.yo-rc.json | 8 ++--- .../.yo-rc.json | 10 +++--- .../.yo-rc.json | 6 ++-- .../.yo-rc.json | 8 ++--- .../.yo-rc.json | 8 ++--- .../.yo-rc.json | 10 +++--- .../.yo-rc.json | 10 +++--- .../.yo-rc.json | 8 ++--- .../.yo-rc.json | 8 ++--- .../{ngx-neo4j => ng-neo4j}/.yo-rc.json | 10 +++--- .../.yo-rc.json | 10 +++--- .../samples/react-default/.yo-rc.json | 13 +++---- .../.yo-rc.json | 10 +++--- .../.yo-rc.json | 6 ++-- .../react-gradle-h2mem-memcached/.yo-rc.json | 8 ++--- .../.yo-rc.json | 6 ++-- .../.yo-rc.json | 8 ++--- .../.yo-rc.json | 6 ++-- .../react-maven-h2mem-memcached/.yo-rc.json | 8 ++--- .../.yo-rc.json | 6 ++-- .../.yo-rc.json | 4 +-- .../samples/vue-couchbase/.yo-rc.json | 8 ++--- .../samples/vue-default/.yo-rc.json | 10 +++--- .../samples/vue-fulli18n-es/.yo-rc.json | 11 +++--- .../samples/vue-gateway/.yo-rc.json | 8 ++--- .../samples/vue-gradle-ws-session/.yo-rc.json | 10 +++--- .../vue-mongodb-kafka-cucumber/.yo-rc.json | 7 ++-- .../samples/vue-noi18n-ws-oauth2/.yo-rc.json | 6 ++-- .../samples/vue-oauth2/.yo-rc.json | 8 ++--- .../vue-session-cassandra-fr/.yo-rc.json | 6 ++-- .../samples/vue-ws-theme/.yo-rc.json | 8 ++--- .../webflux-couchbase-es-oauth2/.yo-rc.json | 8 ++--- .../webflux-couchbase-session/.yo-rc.json | 6 ++-- .../samples/webflux-couchbase/.yo-rc.json | 6 ++-- .../samples/webflux-gateway-jwt/.yo-rc.json | 4 +-- .../webflux-gateway-oauth2/.yo-rc.json | 4 +-- .../.yo-rc.json | 9 ++--- .../webflux-mongodb-es-session/.yo-rc.json | 4 +-- .../webflux-mongodb-oauth2/.yo-rc.json | 10 +++--- .../samples/webflux-mongodb/.yo-rc.json | 6 ++-- .../samples/webflux-mysql-kafka/.yo-rc.json | 6 ++-- .../samples/webflux-nodb-oauth2/.yo-rc.json | 8 ++--- .../samples/webflux-psql/.yo-rc.json | 6 ++-- .../samples/webflux-react/.yo-rc.json | 4 +-- 73 files changed, 273 insertions(+), 268 deletions(-) rename test-integration/samples/{ms-micro-eureka-infinispan => ms-micro-consul-infinispan}/.yo-rc.json (89%) rename test-integration/samples/{ms-micro-eureka-jwt => ms-micro-consul-jwt}/.yo-rc.json (89%) rename test-integration/samples/{ms-ngx-gateway-eureka-jwt => ms-ngx-gateway-consul-jwt}/.yo-rc.json (87%) rename test-integration/samples/{ms-ngx-gateway-eureka-oauth2 => ms-ngx-gateway-consul-oauth2}/.yo-rc.json (87%) rename test-integration/samples/{ngx-couchbase => ng-couchbase}/.yo-rc.json (85%) rename test-integration/samples/{ngx-default => ng-default}/.yo-rc.json (88%) rename test-integration/samples/{ngx-gradle-couchbase-search => ng-gradle-couchbase-search}/.yo-rc.json (88%) rename test-integration/samples/{ngx-gradle-fr => ng-gradle-fr}/.yo-rc.json (82%) rename test-integration/samples/{ngx-gradle-h2disk-ws-nocache => ng-gradle-h2disk-ws-nocache}/.yo-rc.json (90%) rename test-integration/samples/{ngx-gradle-mariadb-oauth2-infinispan => ng-gradle-mariadb-oauth2-infinispan}/.yo-rc.json (84%) rename test-integration/samples/{ngx-gradle-mongodb-kafka-cucumber => ng-gradle-mongodb-kafka-cucumber}/.yo-rc.json (92%) rename test-integration/samples/{ngx-gradle-mysql-es-noi18n-mapsid => ng-gradle-mysql-es-noi18n-mapsid}/.yo-rc.json (89%) rename test-integration/samples/{ngx-h2mem-ws-nol2 => ng-h2mem-ws-nol2}/.yo-rc.json (89%) rename test-integration/samples/{ngx-mariadb-oauth2-infinispan => ng-mariadb-oauth2-infinispan}/.yo-rc.json (84%) rename test-integration/samples/{ngx-mariadb-oauth2-sass-infinispan => ng-mariadb-oauth2-sass-infinispan}/.yo-rc.json (82%) rename test-integration/samples/{ngx-mongodb-kafka-cucumber => ng-mongodb-kafka-cucumber}/.yo-rc.json (89%) rename test-integration/samples/{ngx-mysql-es-noi18n-mapsid => ng-mysql-es-noi18n-mapsid}/.yo-rc.json (89%) rename test-integration/samples/{ngx-neo4j => ng-neo4j}/.yo-rc.json (85%) rename test-integration/samples/{ngx-session-cassandra-fr => ng-session-cassandra-fr}/.yo-rc.json (84%) diff --git a/test-integration/samples/.jhipster/DocumentBankAccount.json b/test-integration/samples/.jhipster/DocumentBankAccount.json index 00dd50f63..189b61fe9 100644 --- a/test-integration/samples/.jhipster/DocumentBankAccount.json +++ b/test-integration/samples/.jhipster/DocumentBankAccount.json @@ -20,8 +20,8 @@ "relationships": [ { "otherEntityName": "embeddedOperation", - "otherEntityRelationshipName": "documentBankAccount", - "relationshipName": "embeddedOperation", + "otherEntityRelationshipName": "documentBankAccountToOne", + "relationshipName": "manyEmbeddedOperation", "relationshipType": "one-to-many" } ], diff --git a/test-integration/samples/.jhipster/EmbeddedOperation.json b/test-integration/samples/.jhipster/EmbeddedOperation.json index cd5586c19..d9ee9676d 100644 --- a/test-integration/samples/.jhipster/EmbeddedOperation.json +++ b/test-integration/samples/.jhipster/EmbeddedOperation.json @@ -14,7 +14,6 @@ { "otherEntityField": "name", "otherEntityName": "documentBankAccount", - "otherEntityRelationshipName": "embeddedOperation", "relationshipName": "documentBankAccount", "relationshipType": "many-to-one" } diff --git a/test-integration/samples/.jhipster/FieldTestEnumWithValue.json b/test-integration/samples/.jhipster/FieldTestEnumWithValue.json index f6460b18a..0c34d7cab 100644 --- a/test-integration/samples/.jhipster/FieldTestEnumWithValue.json +++ b/test-integration/samples/.jhipster/FieldTestEnumWithValue.json @@ -8,7 +8,9 @@ "fields": [ { "fieldName": "myFieldA", "fieldType": "MyEnumA", "fieldValues": "AAA,BBB" }, { "fieldName": "myFieldB", "fieldType": "MyEnumB", "fieldValues": "AAA (aaa_aaa),BBB" }, - { "fieldName": "myFieldC", "fieldType": "MyEnumC", "fieldValues": "AAA (aaa_aaa),BBB (b and b)" } + { "fieldName": "myFieldC", "fieldType": "MyEnumC", "fieldValues": "AAA (aaa_aaa),BBB (b and b)" }, + { "fieldName": "myFieldD", "fieldType": "MyEnumD", "fieldValues": "AAA (AAA),BBB (BBB)" }, + { "fieldName": "myFieldE", "fieldType": "MyEnumE", "fieldValues": "AAA (aaa_aaa),BBB (BBB)" } ], "fluentMethods": true, "jpaMetamodelFiltering": false, diff --git a/test-integration/samples/.jhipster/JpaFilteringRelationship.json b/test-integration/samples/.jhipster/JpaFilteringRelationship.json index d06547c90..96b7346ae 100644 --- a/test-integration/samples/.jhipster/JpaFilteringRelationship.json +++ b/test-integration/samples/.jhipster/JpaFilteringRelationship.json @@ -40,7 +40,7 @@ { "otherEntityField": "id", "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "requiredManyToOneOtherSide", "relationshipName": "requiredManyToOne", "relationshipType": "many-to-one", "relationshipValidateRules": "required" @@ -48,7 +48,7 @@ { "otherEntityField": "id", "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "manyToOneOtherSide", "relationshipName": "manyToOne", "relationshipType": "many-to-one" }, diff --git a/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json index dc50aca3b..39d25aede 100644 --- a/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json @@ -26,6 +26,6 @@ "relationshipType": "one-to-one" } ], - "searchEngine": false, + "searchEngine": "no", "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json index 8f03aa6da..e07b27073 100644 --- a/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json +++ b/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json @@ -26,6 +26,6 @@ "relationshipType": "one-to-one" } ], - "searchEngine": false, + "searchEngine": "no", "service": "no" } diff --git a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json index 8b039f9d2..025b7ca51 100644 --- a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json @@ -19,6 +19,6 @@ "relationshipType": "one-to-one" } ], - "searchEngine": false, + "searchEngine": "no", "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json index 3451510d1..0549b2995 100644 --- a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json +++ b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json @@ -19,6 +19,6 @@ "relationshipType": "one-to-one" } ], - "searchEngine": false, + "searchEngine": "no", "service": "no" } diff --git a/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json index 3611cb4d5..d6c7f0aa3 100644 --- a/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json @@ -17,6 +17,6 @@ "relationshipType": "one-to-one" } ], - "searchEngine": false, + "searchEngine": "no", "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json index fe91ddb75..afc546412 100644 --- a/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json +++ b/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json @@ -17,6 +17,6 @@ "relationshipType": "one-to-one" } ], - "searchEngine": false, + "searchEngine": "no", "service": "no" } diff --git a/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json b/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json index 4cba8dd63..de3dfac2c 100644 --- a/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json @@ -19,6 +19,6 @@ "relationshipType": "one-to-one" } ], - "searchEngine": false, + "searchEngine": "no", "service": "serviceImpl" } diff --git a/test-integration/samples/app-sample-dev/.yo-rc.json b/test-integration/samples/app-sample-dev/.yo-rc.json index 34d01e9d6..ce13582b7 100644 --- a/test-integration/samples/app-sample-dev/.yo-rc.json +++ b/test-integration/samples/app-sample-dev/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "jhipsterSampleApplication", "buildTool": "maven", "cacheProvider": "ehcache", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "sql", @@ -16,15 +16,15 @@ "jhiPrefix": "myPrefix", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/jdl-default/app.jdl b/test-integration/samples/jdl-default/app.jdl index 49543b9e8..64bc0358e 100644 --- a/test-integration/samples/jdl-default/app.jdl +++ b/test-integration/samples/jdl-default/app.jdl @@ -6,9 +6,9 @@ application { authenticationType jwt, prodDatabaseType postgresql, buildTool maven, - searchEngine false, + searchEngine no, testFrameworks [gatling, cypress], - clientFramework angularX, + clientFramework angular, enableTranslation true, nativeLanguage en, languages [ en, fr ] @@ -81,7 +81,7 @@ entity Job { /** * The Employee entity. - * Second line in javadoc. + * Second line in documentation. */ entity Employee { /** diff --git a/test-integration/samples/jdl-entities/custom-id.jdl b/test-integration/samples/jdl-entities/custom-id.jdl index 4215dd2b7..01bedb910 100644 --- a/test-integration/samples/jdl-entities/custom-id.jdl +++ b/test-integration/samples/jdl-entities/custom-id.jdl @@ -1,16 +1,16 @@ /* * UUID custom id */ -@ChangelogDate(20200804035300) +@ChangelogDate(20200805000300) entity EntityUuidId { id UUID } -@ChangelogDate(20200804035301) +@ChangelogDate(20200805000301) entity EntityUuidIdMapsId { } -@ChangelogDate(20200804035302) +@ChangelogDate(20200805000302) entity EntityUuidIdRelationship { id UUID } @@ -34,16 +34,16 @@ relationship ManyToMany { /* * UUID custom id with DTO */ -@ChangelogDate(20200804035400) +@ChangelogDate(20200805000400) entity EntityUuidIdDTO { id UUID } -@ChangelogDate(20200804035401) +@ChangelogDate(20200805000401) entity EntityUuidIdDTOMapsId { } -@ChangelogDate(20200804035402) +@ChangelogDate(20200805000402) entity EntityUuidIdDTORel { id UUID } @@ -69,16 +69,16 @@ dto EntityUuidIdDTO, EntityUuidIdDTOMapsId, EntityUuidIdDTORel with mapstruct /* * Custom named id */ -@ChangelogDate(20200804035500) +@ChangelogDate(20200805000500) entity EntityCustomId { @Id customId Long } -@ChangelogDate(20200804035501) +@ChangelogDate(20200805000501) entity EntityCustomIdMapsId { } -@ChangelogDate(20200804035502) +@ChangelogDate(20200805000502) entity EntityCustomIdRelationship { @Id relatedId Long } @@ -102,16 +102,16 @@ relationship ManyToMany { /* * Custom named id with dto */ -@ChangelogDate(20200804035600) +@ChangelogDate(20200805000600) entity EntityCustomIdDTO { @Id customId Long } -@ChangelogDate(20200804035601) +@ChangelogDate(20200805000601) entity EntityCustomIdDTOMapsId { } -@ChangelogDate(20200804035502) +@ChangelogDate(20200805000602) entity EntityCustomIdDTORel { @Id relatedId Long } @@ -137,16 +137,16 @@ dto EntityCustomIdDTO, EntityCustomIdDTOMapsId, EntityCustomIdDTORel with mapstr /* * UUID Custom named id with filtering */ -@ChangelogDate(20200804035500) +@ChangelogDate(20200805000700) entity UuidIdFiltering { @Id customId UUID } -@ChangelogDate(20200804035501) +@ChangelogDate(20200805000701) entity UuidIdFilteringMapsId { } -@ChangelogDate(20200804035502) +@ChangelogDate(20200805000702) entity UuidIdFilteringRelationship { @Id relatedId UUID } @@ -173,16 +173,16 @@ service UuidIdFiltering, UuidIdFilteringMapsId, UuidIdFilteringRelationship with /* * Custom named id with required relationships, mapstruct dtos and search */ -@ChangelogDate(20200804035700) +@ChangelogDate(20200805000800) entity EntityCustomIdRequiredDTO { @Id customId Long } -@ChangelogDate(20200804035701) +@ChangelogDate(20200805000801) entity EntityCustomIdRequiredDTOMapsId { } -@ChangelogDate(20200804035702) +@ChangelogDate(20200805000802) entity EntityCustomIdRequiredDTORel { @Id relatedId Long } diff --git a/test-integration/samples/jdl-entities/entities.jdl b/test-integration/samples/jdl-entities/entities.jdl index ab7c2a5b7..0385a6445 100644 --- a/test-integration/samples/jdl-entities/entities.jdl +++ b/test-integration/samples/jdl-entities/entities.jdl @@ -1,5 +1,5 @@ @ChangelogDate(20200804035352) -entity JdlFieldTest { +entity MapstructExpressionTest { id Long name String @@ -8,4 +8,4 @@ entity JdlFieldTest { value String } -dto JdlFieldTest with mapstruct +dto MapstructExpressionTest with mapstruct diff --git a/test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json b/test-integration/samples/ms-micro-consul-infinispan/.yo-rc.json similarity index 89% rename from test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json rename to test-integration/samples/ms-micro-consul-infinispan/.yo-rc.json index 23bac8d20..e2170b94d 100644 --- a/test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json +++ b/test-integration/samples/ms-micro-consul-infinispan/.yo-rc.json @@ -18,18 +18,18 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8081", - "serviceDiscoveryType": "eureka", + "serviceDiscoveryType": "consul", "skipClient": true, "skipUserManagement": true, "testFrameworks": ["gatling"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-micro-eureka-jwt/.yo-rc.json b/test-integration/samples/ms-micro-consul-jwt/.yo-rc.json similarity index 89% rename from test-integration/samples/ms-micro-eureka-jwt/.yo-rc.json rename to test-integration/samples/ms-micro-consul-jwt/.yo-rc.json index 46d8a170f..6e8c92dd5 100644 --- a/test-integration/samples/ms-micro-eureka-jwt/.yo-rc.json +++ b/test-integration/samples/ms-micro-consul-jwt/.yo-rc.json @@ -18,18 +18,18 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8081", - "serviceDiscoveryType": "eureka", + "serviceDiscoveryType": "consul", "skipClient": true, "skipUserManagement": true, "testFrameworks": ["gatling"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-micro-consul/.yo-rc.json b/test-integration/samples/ms-micro-consul/.yo-rc.json index c75e5901b..f1da7cbac 100644 --- a/test-integration/samples/ms-micro-consul/.yo-rc.json +++ b/test-integration/samples/ms-micro-consul/.yo-rc.json @@ -5,7 +5,6 @@ "baseName": "sampleMicroserviceConsul", "buildTool": "maven", "cacheProvider": "hazelcast", - "clientFramework": "angularX", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "sql", @@ -15,17 +14,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8081", "serviceDiscoveryType": "consul", "skipClient": true, "skipUserManagement": true, "testFrameworks": ["gatling"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-micro-eureka/.yo-rc.json b/test-integration/samples/ms-micro-eureka/.yo-rc.json index 9486f79fb..f2767ec62 100644 --- a/test-integration/samples/ms-micro-eureka/.yo-rc.json +++ b/test-integration/samples/ms-micro-eureka/.yo-rc.json @@ -5,7 +5,6 @@ "baseName": "sampleMicroserviceEureka", "buildTool": "maven", "cacheProvider": "hazelcast", - "clientFramework": "angularX", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "sql", @@ -15,17 +14,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8081", "serviceDiscoveryType": "eureka", "skipClient": true, "skipUserManagement": true, "testFrameworks": ["gatling"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-ngx-gateway-eureka-jwt/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-consul-jwt/.yo-rc.json similarity index 87% rename from test-integration/samples/ms-ngx-gateway-eureka-jwt/.yo-rc.json rename to test-integration/samples/ms-ngx-gateway-consul-jwt/.yo-rc.json index c4191d77e..fee56968a 100644 --- a/test-integration/samples/ms-ngx-gateway-eureka-jwt/.yo-rc.json +++ b/test-integration/samples/ms-ngx-gateway-consul-jwt/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -20,17 +20,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": "eureka", + "serviceDiscoveryType": "consul", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-ngx-gateway-eureka-oauth2/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-consul-oauth2/.yo-rc.json similarity index 87% rename from test-integration/samples/ms-ngx-gateway-eureka-oauth2/.yo-rc.json rename to test-integration/samples/ms-ngx-gateway-consul-oauth2/.yo-rc.json index 68b6dad93..e37a050aa 100644 --- a/test-integration/samples/ms-ngx-gateway-eureka-oauth2/.yo-rc.json +++ b/test-integration/samples/ms-ngx-gateway-consul-oauth2/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -20,17 +20,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": "eureka", + "serviceDiscoveryType": "consul", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json index 297a36796..7e5a327fb 100644 --- a/test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json +++ b/test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleDefault", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "sql", @@ -15,16 +15,16 @@ "jhiPrefix": "myPrefix", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serviceDiscoveryType": "consul", "testFrameworks": ["gatling"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json index b75770540..c829a3031 100644 --- a/test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json +++ b/test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -20,17 +20,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serviceDiscoveryType": "eureka", "testFrameworks": ["gatling"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-react-gateway-consul-jwt/.yo-rc.json b/test-integration/samples/ms-react-gateway-consul-jwt/.yo-rc.json index 1463a6fc1..50dc09ae2 100644 --- a/test-integration/samples/ms-react-gateway-consul-jwt/.yo-rc.json +++ b/test-integration/samples/ms-react-gateway-consul-jwt/.yo-rc.json @@ -20,17 +20,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serviceDiscoveryType": "consul", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ms-react-gateway-consul-oauth2/.yo-rc.json b/test-integration/samples/ms-react-gateway-consul-oauth2/.yo-rc.json index 964864e53..b8bc89fba 100644 --- a/test-integration/samples/ms-react-gateway-consul-oauth2/.yo-rc.json +++ b/test-integration/samples/ms-react-gateway-consul-oauth2/.yo-rc.json @@ -20,17 +20,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serviceDiscoveryType": "consul", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-couchbase/.yo-rc.json b/test-integration/samples/ng-couchbase/.yo-rc.json similarity index 85% rename from test-integration/samples/ngx-couchbase/.yo-rc.json rename to test-integration/samples/ng-couchbase/.yo-rc.json index 944580165..e840474f8 100644 --- a/test-integration/samples/ngx-couchbase/.yo-rc.json +++ b/test-integration/samples/ng-couchbase/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleCouchbaseNoCache", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "couchbase", @@ -16,15 +16,15 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "couchbase", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-default/.yo-rc.json b/test-integration/samples/ng-default/.yo-rc.json similarity index 88% rename from test-integration/samples/ngx-default/.yo-rc.json rename to test-integration/samples/ng-default/.yo-rc.json index dc6beba37..94ab83055 100644 --- a/test-integration/samples/ngx-default/.yo-rc.json +++ b/test-integration/samples/ng-default/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "ehcache", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -43,7 +43,7 @@ "hi", "hr", "hu", - "in", + "id", "it", "ja", "ko", @@ -66,18 +66,20 @@ "ua", "uz-Cyrl-uz", "uz-Latn-uz", - "vi" + "kr-Latn-kr", + "vi", + "az-Latn-az" ], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-gradle-couchbase-search/.yo-rc.json b/test-integration/samples/ng-gradle-couchbase-search/.yo-rc.json similarity index 88% rename from test-integration/samples/ngx-gradle-couchbase-search/.yo-rc.json rename to test-integration/samples/ng-gradle-couchbase-search/.yo-rc.json index daa403880..6acd2208e 100644 --- a/test-integration/samples/ngx-gradle-couchbase-search/.yo-rc.json +++ b/test-integration/samples/ng-gradle-couchbase-search/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleCouchbaseNoCache", "buildTool": "gradle", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "couchbase", @@ -16,15 +16,15 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "couchbase", "searchEngine": "couchbase", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-gradle-fr/.yo-rc.json b/test-integration/samples/ng-gradle-fr/.yo-rc.json similarity index 82% rename from test-integration/samples/ngx-gradle-fr/.yo-rc.json rename to test-integration/samples/ng-gradle-fr/.yo-rc.json index 9ac6edcec..49d506441 100644 --- a/test-integration/samples/ngx-gradle-fr/.yo-rc.json +++ b/test-integration/samples/ng-gradle-fr/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "gradle", "cacheProvider": "ehcache", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -15,21 +15,23 @@ "dtoSuffix": "DTO", "embeddableLaunchScript": false, "enableHibernateCache": true, + "enableSwaggerCodegen": true, "enableTranslation": true, "entitySuffix": "", + "incrementalChangelog": true, "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "fr", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-gradle-h2disk-ws-nocache/.yo-rc.json b/test-integration/samples/ng-gradle-h2disk-ws-nocache/.yo-rc.json similarity index 90% rename from test-integration/samples/ngx-gradle-h2disk-ws-nocache/.yo-rc.json rename to test-integration/samples/ng-gradle-h2disk-ws-nocache/.yo-rc.json index 4242bbebd..027f0674a 100644 --- a/test-integration/samples/ngx-gradle-h2disk-ws-nocache/.yo-rc.json +++ b/test-integration/samples/ng-gradle-h2disk-ws-nocache/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "gradle", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "clientThemeVariant": "", @@ -22,15 +22,15 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr", "de"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], "websocket": "spring-websocket", "withAdminUi": false diff --git a/test-integration/samples/ngx-gradle-mariadb-oauth2-infinispan/.yo-rc.json b/test-integration/samples/ng-gradle-mariadb-oauth2-infinispan/.yo-rc.json similarity index 84% rename from test-integration/samples/ngx-gradle-mariadb-oauth2-infinispan/.yo-rc.json rename to test-integration/samples/ng-gradle-mariadb-oauth2-infinispan/.yo-rc.json index 1d64f3428..ac1f35cdf 100644 --- a/test-integration/samples/ngx-gradle-mariadb-oauth2-infinispan/.yo-rc.json +++ b/test-integration/samples/ng-gradle-mariadb-oauth2-infinispan/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "gradle", "cacheProvider": "infinispan", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -18,15 +18,15 @@ "enableTranslation": false, "entitySuffix": "", "jhiPrefix": "myPrefix", - "messageBroker": false, + "messageBroker": "no", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mariadb", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-gradle-mongodb-kafka-cucumber/.yo-rc.json b/test-integration/samples/ng-gradle-mongodb-kafka-cucumber/.yo-rc.json similarity index 92% rename from test-integration/samples/ngx-gradle-mongodb-kafka-cucumber/.yo-rc.json rename to test-integration/samples/ng-gradle-mongodb-kafka-cucumber/.yo-rc.json index 23eacc3c1..371e61af9 100644 --- a/test-integration/samples/ngx-gradle-mongodb-kafka-cucumber/.yo-rc.json +++ b/test-integration/samples/ng-gradle-mongodb-kafka-cucumber/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "gradle", "cacheProvider": "ehcache", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -27,9 +27,9 @@ "packageName": "tech.jhipster.sample", "prodDatabaseType": "mongodb", "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cucumber", "cypress"], "websocket": "spring-websocket" } diff --git a/test-integration/samples/ngx-gradle-mysql-es-noi18n-mapsid/.yo-rc.json b/test-integration/samples/ng-gradle-mysql-es-noi18n-mapsid/.yo-rc.json similarity index 89% rename from test-integration/samples/ngx-gradle-mysql-es-noi18n-mapsid/.yo-rc.json rename to test-integration/samples/ng-gradle-mysql-es-noi18n-mapsid/.yo-rc.json index 7b1825224..e3439a2d7 100644 --- a/test-integration/samples/ngx-gradle-mysql-es-noi18n-mapsid/.yo-rc.json +++ b/test-integration/samples/ng-gradle-mysql-es-noi18n-mapsid/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "gradle", "cacheProvider": "hazelcast", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -20,15 +20,15 @@ "entitySuffix": "", "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", - "messageBroker": false, + "messageBroker": "no", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mysql", "searchEngine": "elasticsearch", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-h2mem-ws-nol2/.yo-rc.json b/test-integration/samples/ng-h2mem-ws-nol2/.yo-rc.json similarity index 89% rename from test-integration/samples/ngx-h2mem-ws-nol2/.yo-rc.json rename to test-integration/samples/ng-h2mem-ws-nol2/.yo-rc.json index ec297830b..527a2386d 100644 --- a/test-integration/samples/ngx-h2mem-ws-nol2/.yo-rc.json +++ b/test-integration/samples/ng-h2mem-ws-nol2/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "ehcache", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -20,15 +20,15 @@ "jhiPrefix": "myPrefix", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], "websocket": "spring-websocket", "withAdminUi": false diff --git a/test-integration/samples/ngx-mariadb-oauth2-infinispan/.yo-rc.json b/test-integration/samples/ng-mariadb-oauth2-infinispan/.yo-rc.json similarity index 84% rename from test-integration/samples/ngx-mariadb-oauth2-infinispan/.yo-rc.json rename to test-integration/samples/ng-mariadb-oauth2-infinispan/.yo-rc.json index c17df9ea4..bc867ed11 100644 --- a/test-integration/samples/ngx-mariadb-oauth2-infinispan/.yo-rc.json +++ b/test-integration/samples/ng-mariadb-oauth2-infinispan/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "infinispan", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -18,15 +18,15 @@ "enableTranslation": false, "entitySuffix": "", "jhiPrefix": "myPrefix", - "messageBroker": false, + "messageBroker": "no", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mariadb", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-mariadb-oauth2-sass-infinispan/.yo-rc.json b/test-integration/samples/ng-mariadb-oauth2-sass-infinispan/.yo-rc.json similarity index 82% rename from test-integration/samples/ngx-mariadb-oauth2-sass-infinispan/.yo-rc.json rename to test-integration/samples/ng-mariadb-oauth2-sass-infinispan/.yo-rc.json index 53c83e6d7..ebcc97b58 100644 --- a/test-integration/samples/ngx-mariadb-oauth2-sass-infinispan/.yo-rc.json +++ b/test-integration/samples/ng-mariadb-oauth2-sass-infinispan/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleOauth2SassInfinispan", "buildTool": "maven", "cacheProvider": "infinispan", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "sql", @@ -13,15 +13,15 @@ "enableHibernateCache": true, "enableTranslation": false, "jhiPrefix": "myPrefix", - "messageBroker": false, + "messageBroker": "no", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mariadb", "rememberMeKey": "448f9a67a8a292c4905a733ec22cc3b78e493c56", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-mongodb-kafka-cucumber/.yo-rc.json b/test-integration/samples/ng-mongodb-kafka-cucumber/.yo-rc.json similarity index 89% rename from test-integration/samples/ngx-mongodb-kafka-cucumber/.yo-rc.json rename to test-integration/samples/ng-mongodb-kafka-cucumber/.yo-rc.json index 4288ee39f..02ca2ea57 100644 --- a/test-integration/samples/ngx-mongodb-kafka-cucumber/.yo-rc.json +++ b/test-integration/samples/ng-mongodb-kafka-cucumber/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "ehcache", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -26,10 +26,10 @@ "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mongodb", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cucumber", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-mysql-es-noi18n-mapsid/.yo-rc.json b/test-integration/samples/ng-mysql-es-noi18n-mapsid/.yo-rc.json similarity index 89% rename from test-integration/samples/ngx-mysql-es-noi18n-mapsid/.yo-rc.json rename to test-integration/samples/ng-mysql-es-noi18n-mapsid/.yo-rc.json index 80914a775..f312eee6f 100644 --- a/test-integration/samples/ngx-mysql-es-noi18n-mapsid/.yo-rc.json +++ b/test-integration/samples/ng-mysql-es-noi18n-mapsid/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "maven", "cacheProvider": "hazelcast", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1596513172471, @@ -20,15 +20,15 @@ "entitySuffix": "", "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", - "messageBroker": false, + "messageBroker": "no", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mysql", "searchEngine": "elasticsearch", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-neo4j/.yo-rc.json b/test-integration/samples/ng-neo4j/.yo-rc.json similarity index 85% rename from test-integration/samples/ngx-neo4j/.yo-rc.json rename to test-integration/samples/ng-neo4j/.yo-rc.json index 0cca06401..326a441d7 100644 --- a/test-integration/samples/ngx-neo4j/.yo-rc.json +++ b/test-integration/samples/ng-neo4j/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleNeo4jNoCache", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "neo4j", @@ -16,15 +16,15 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "neo4j", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/ngx-session-cassandra-fr/.yo-rc.json b/test-integration/samples/ng-session-cassandra-fr/.yo-rc.json similarity index 84% rename from test-integration/samples/ngx-session-cassandra-fr/.yo-rc.json rename to test-integration/samples/ng-session-cassandra-fr/.yo-rc.json index cba7416af..7d493099d 100644 --- a/test-integration/samples/ngx-session-cassandra-fr/.yo-rc.json +++ b/test-integration/samples/ng-session-cassandra-fr/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleCassandra", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "cassandra", @@ -14,16 +14,16 @@ "enableTranslation": true, "jhiPrefix": "jhi", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "fr", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "cassandra", "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/react-default/.yo-rc.json b/test-integration/samples/react-default/.yo-rc.json index 574513fc0..ce7216d5c 100644 --- a/test-integration/samples/react-default/.yo-rc.json +++ b/test-integration/samples/react-default/.yo-rc.json @@ -42,7 +42,7 @@ "hi", "hr", "hu", - "in", + "id", "it", "ja", "ko", @@ -65,18 +65,19 @@ "ua", "uz-Cyrl-uz", "uz-Latn-uz", - "vi" + "vi", + "az-Latn-az" ], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/react-gradle-cassandra-session-redis/.yo-rc.json b/test-integration/samples/react-gradle-cassandra-session-redis/.yo-rc.json index e5328f002..44c104501 100644 --- a/test-integration/samples/react-gradle-cassandra-session-redis/.yo-rc.json +++ b/test-integration/samples/react-gradle-cassandra-session-redis/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleReactCassandraSessionRedis", "blueprints": [], "buildTool": "gradle", - "cacheProvider": "redis", + "cacheProvider": "no", "clientFramework": "react", "clientPackageManager": "npm", "clientTheme": "none", @@ -21,17 +21,17 @@ "entitySuffix": "", "jhiPrefix": "jhi", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "cassandra", "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json b/test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json index 548fe528b..fa8268844 100644 --- a/test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json +++ b/test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json @@ -22,7 +22,7 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", @@ -30,8 +30,8 @@ "prodDatabaseType": "couchbase", "searchEngine": "couchbase", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json b/test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json index 8dfcbb301..7a868c6bd 100644 --- a/test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json +++ b/test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json @@ -22,17 +22,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false, + "websocket": "no", "withAdminUi": false } } diff --git a/test-integration/samples/react-gradle-mysql-es-noi18n-mapsid/.yo-rc.json b/test-integration/samples/react-gradle-mysql-es-noi18n-mapsid/.yo-rc.json index c242e291c..00bb359be 100644 --- a/test-integration/samples/react-gradle-mysql-es-noi18n-mapsid/.yo-rc.json +++ b/test-integration/samples/react-gradle-mysql-es-noi18n-mapsid/.yo-rc.json @@ -20,7 +20,7 @@ "entitySuffix": "", "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "es", "otherModules": [], "packageFolder": "tech/jhipster/sample", @@ -28,8 +28,8 @@ "prodDatabaseType": "mysql", "searchEngine": "elasticsearch", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "spring-websocket" } } diff --git a/test-integration/samples/react-maven-cassandra-session-redis/.yo-rc.json b/test-integration/samples/react-maven-cassandra-session-redis/.yo-rc.json index 6760bc98c..d472850bb 100644 --- a/test-integration/samples/react-maven-cassandra-session-redis/.yo-rc.json +++ b/test-integration/samples/react-maven-cassandra-session-redis/.yo-rc.json @@ -21,17 +21,17 @@ "entitySuffix": "", "jhiPrefix": "jhi", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "cassandra", "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json b/test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json index ca97a01dc..4c5549ceb 100644 --- a/test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json +++ b/test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json @@ -22,7 +22,7 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", @@ -30,8 +30,8 @@ "prodDatabaseType": "couchbase", "searchEngine": "couchbase", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json b/test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json index 7ce40e456..ce33f7b63 100644 --- a/test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json +++ b/test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json @@ -22,17 +22,17 @@ "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false, + "websocket": "no", "withAdminUi": false } } diff --git a/test-integration/samples/react-maven-mysql-es-noi18n-mapsid/.yo-rc.json b/test-integration/samples/react-maven-mysql-es-noi18n-mapsid/.yo-rc.json index eee65bf72..e41e7eaea 100644 --- a/test-integration/samples/react-maven-mysql-es-noi18n-mapsid/.yo-rc.json +++ b/test-integration/samples/react-maven-mysql-es-noi18n-mapsid/.yo-rc.json @@ -20,7 +20,7 @@ "entitySuffix": "", "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "es", "otherModules": [], "packageFolder": "tech/jhipster/sample", @@ -28,8 +28,8 @@ "prodDatabaseType": "mysql", "searchEngine": "elasticsearch", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/react-noi18n-es-ws-gradle-session/.yo-rc.json b/test-integration/samples/react-noi18n-es-ws-gradle-session/.yo-rc.json index 094f7861a..73d88f11b 100644 --- a/test-integration/samples/react-noi18n-es-ws-gradle-session/.yo-rc.json +++ b/test-integration/samples/react-noi18n-es-ws-gradle-session/.yo-rc.json @@ -13,14 +13,14 @@ "enableHibernateCache": true, "enableTranslation": false, "jhiPrefix": "myPrefix", - "messageBroker": false, + "messageBroker": "no", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", "searchEngine": "elasticsearch", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["cypress"], "websocket": "spring-websocket" } diff --git a/test-integration/samples/vue-couchbase/.yo-rc.json b/test-integration/samples/vue-couchbase/.yo-rc.json index c5f91ca03..c6205d7f0 100644 --- a/test-integration/samples/vue-couchbase/.yo-rc.json +++ b/test-integration/samples/vue-couchbase/.yo-rc.json @@ -21,23 +21,23 @@ "jhiPrefix": "", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "couchbase", "reactive": false, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, "skipServer": false, "skipUserManagement": false, "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/vue-default/.yo-rc.json b/test-integration/samples/vue-default/.yo-rc.json index 90d68d546..5bca91eac 100644 --- a/test-integration/samples/vue-default/.yo-rc.json +++ b/test-integration/samples/vue-default/.yo-rc.json @@ -18,26 +18,26 @@ "enableSwaggerCodegen": false, "enableTranslation": true, "entitySuffix": "", - "jhiPrefix": "", + "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": false, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, "skipServer": false, "skipUserManagement": false, "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/vue-fulli18n-es/.yo-rc.json b/test-integration/samples/vue-fulli18n-es/.yo-rc.json index d4badec4e..cd1171fd3 100644 --- a/test-integration/samples/vue-fulli18n-es/.yo-rc.json +++ b/test-integration/samples/vue-fulli18n-es/.yo-rc.json @@ -44,7 +44,7 @@ "hi", "hr", "hu", - "in", + "id", "it", "ja", "ko", @@ -67,9 +67,10 @@ "ua", "uz-Cyrl-uz", "uz-Latn-uz", - "vi" + "vi", + "az-Latn-az" ], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", @@ -79,13 +80,13 @@ "searchEngine": "elasticsearch", "serverPort": "8080", "serverSideOptions": ["searchEngine:elasticsearch"], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, "skipServer": false, "skipUserManagement": false, "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/vue-gateway/.yo-rc.json b/test-integration/samples/vue-gateway/.yo-rc.json index a3c825750..c6952c1cb 100644 --- a/test-integration/samples/vue-gateway/.yo-rc.json +++ b/test-integration/samples/vue-gateway/.yo-rc.json @@ -21,23 +21,23 @@ "jhiPrefix": "", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, "skipServer": false, "skipUserManagement": false, "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/vue-gradle-ws-session/.yo-rc.json b/test-integration/samples/vue-gradle-ws-session/.yo-rc.json index 5cc8b8c15..f0c19c61a 100644 --- a/test-integration/samples/vue-gradle-ws-session/.yo-rc.json +++ b/test-integration/samples/vue-gradle-ws-session/.yo-rc.json @@ -12,7 +12,7 @@ "clientThemeVariant": "primary", "creationTimestamp": 1594452153587, "databaseType": "sql", - "devDatabaseType": "h2Disk", + "devDatabaseType": "h2Memory", "dtoSuffix": "DTO", "enableHibernateCache": true, "enableSwaggerCodegen": false, @@ -21,18 +21,18 @@ "jhiPrefix": "", "jwtSecretKey": "NGJiOTZiMWFlMmQ5NmVkNzhmNzA1NjgxYmNlYjI2MzgwZGE3MzAwY2VkZDc0MThmMzM4MjRiODg0ZWVkYTVkNzU1MDNiODM1YjJmMjBhMDJhYzQwZTViNDUwMzA4YjJlOGYxZjhkYzQ1M2RlMGY1ZGQyYmFlOWVmZGYxMjEyODQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", - "prodDatabaseType": "postgresql", + "prodDatabaseType": "mysql", "reactive": false, "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, diff --git a/test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json b/test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json index 787a52c1c..d50b0004b 100644 --- a/test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json +++ b/test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json @@ -22,23 +22,22 @@ "jhipsterVersion": "6.10.0", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": "kafka", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mongodb", "reactive": false, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, "skipServer": false, "skipUserManagement": false, "testFrameworks": ["gatling", "cucumber", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json b/test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json index 5716df0ce..bc3210655 100644 --- a/test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json +++ b/test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json @@ -22,17 +22,17 @@ "jhipsterVersion": "6.10.0", "jwtSecretKey": "YWQzOWQ1NDg4MTczMTQxMmQxM2FjY2M4NmI4NmE5Mjg3NzYwNGQwMGE4NjAxYTkzOTIxZDgzZDU0N2FlYTY2ODM0NDg0OGZkMjY5ODc2ZGQzYjVlYThlYzAxNzdiMmMzMGRlMzA1NGM4ZmVlMTNlZWEyMjAxNmEzYmMyYTg1Y2M=", "languages": [], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": false, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, diff --git a/test-integration/samples/vue-oauth2/.yo-rc.json b/test-integration/samples/vue-oauth2/.yo-rc.json index 967ec576d..5bbe5f30c 100644 --- a/test-integration/samples/vue-oauth2/.yo-rc.json +++ b/test-integration/samples/vue-oauth2/.yo-rc.json @@ -21,23 +21,23 @@ "jhiPrefix": "", "jwtSecretKey": "NGJiOTZiMWFlMmQ5NmVkNzhmNzA1NjgxYmNlYjI2MzgwZGE3MzAwY2VkZDc0MThmMzM4MjRiODg0ZWVkYTVkNzU1MDNiODM1YjJmMjBhMDJhYzQwZTViNDUwMzA4YjJlOGYxZjhkYzQ1M2RlMGY1ZGQyYmFlOWVmZGYxMjEyODQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": false, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, "skipServer": false, "skipUserManagement": false, "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/vue-session-cassandra-fr/.yo-rc.json b/test-integration/samples/vue-session-cassandra-fr/.yo-rc.json index c4f27d21c..2b399f3d8 100644 --- a/test-integration/samples/vue-session-cassandra-fr/.yo-rc.json +++ b/test-integration/samples/vue-session-cassandra-fr/.yo-rc.json @@ -21,7 +21,7 @@ "jhiPrefix": "", "jwtSecretKey": "NGJiOTZiMWFlMmQ5NmVkNzhmNzA1NjgxYmNlYjI2MzgwZGE3MzAwY2VkZDc0MThmMzM4MjRiODg0ZWVkYTVkNzU1MDNiODM1YjJmMjBhMDJhYzQwZTViNDUwMzA4YjJlOGYxZjhkYzQ1M2RlMGY1ZGQyYmFlOWVmZGYxMjEyODQ=", "languages": ["fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", @@ -32,13 +32,13 @@ "searchEngine": false, "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, "skipServer": false, "skipUserManagement": false, "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/vue-ws-theme/.yo-rc.json b/test-integration/samples/vue-ws-theme/.yo-rc.json index 38a8e846a..2c686cbe3 100644 --- a/test-integration/samples/vue-ws-theme/.yo-rc.json +++ b/test-integration/samples/vue-ws-theme/.yo-rc.json @@ -21,17 +21,17 @@ "jhiPrefix": "", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", - "prodDatabaseType": "postgresql", + "prodDatabaseType": "mariadb", "reactive": false, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serverSideOptions": [], - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "skipCheckLengthOfIdentifier": false, "skipClient": false, "skipFakeData": false, diff --git a/test-integration/samples/webflux-couchbase-es-oauth2/.yo-rc.json b/test-integration/samples/webflux-couchbase-es-oauth2/.yo-rc.json index 3b97c0e97..85b946133 100644 --- a/test-integration/samples/webflux-couchbase-es-oauth2/.yo-rc.json +++ b/test-integration/samples/webflux-couchbase-es-oauth2/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "gradle", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1580314672693, @@ -20,7 +20,7 @@ "jhiPrefix": "jhi", "jhipsterVersion": "6.6.0", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", @@ -29,8 +29,8 @@ "reactive": true, "searchEngine": "elasticsearch", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-couchbase-session/.yo-rc.json b/test-integration/samples/webflux-couchbase-session/.yo-rc.json index 44b391b65..2bdbf034e 100644 --- a/test-integration/samples/webflux-couchbase-session/.yo-rc.json +++ b/test-integration/samples/webflux-couchbase-session/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleWebfluxCouchbaseSession", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "couchbase", @@ -20,9 +20,9 @@ "prodDatabaseType": "couchbase", "reactive": true, "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-couchbase/.yo-rc.json b/test-integration/samples/webflux-couchbase/.yo-rc.json index 51b96c816..bc2dc2b9b 100644 --- a/test-integration/samples/webflux-couchbase/.yo-rc.json +++ b/test-integration/samples/webflux-couchbase/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleWebfluxCouchbase", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "couchbase", @@ -20,9 +20,9 @@ "packageName": "tech.jhipster.sample", "prodDatabaseType": "couchbase", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-gateway-jwt/.yo-rc.json b/test-integration/samples/webflux-gateway-jwt/.yo-rc.json index 5c47a3b5d..19b9b7c57 100644 --- a/test-integration/samples/webflux-gateway-jwt/.yo-rc.json +++ b/test-integration/samples/webflux-gateway-jwt/.yo-rc.json @@ -18,10 +18,10 @@ "packageName": "tech.jhipster.gateway", "prodDatabaseType": "mongodb", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serviceDiscoveryType": "eureka", "testFrameworks": ["cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-gateway-oauth2/.yo-rc.json b/test-integration/samples/webflux-gateway-oauth2/.yo-rc.json index b4d9775da..ca9bd688b 100644 --- a/test-integration/samples/webflux-gateway-oauth2/.yo-rc.json +++ b/test-integration/samples/webflux-gateway-oauth2/.yo-rc.json @@ -20,10 +20,10 @@ "packageName": "tech.jhipster.gateway", "prodDatabaseType": "mongodb", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "serviceDiscoveryType": "eureka", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-gradle-session-h2mem-es/.yo-rc.json b/test-integration/samples/webflux-gradle-session-h2mem-es/.yo-rc.json index c759bccfd..d280909ba 100644 --- a/test-integration/samples/webflux-gradle-session-h2mem-es/.yo-rc.json +++ b/test-integration/samples/webflux-gradle-session-h2mem-es/.yo-rc.json @@ -5,25 +5,26 @@ "baseName": "sampleWebfluxH2mem", "buildTool": "gradle", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", - "creationTimestamp": 1596513172471, + "creationTimestamp": 1596513272473, "databaseType": "sql", "devDatabaseType": "h2Memory", "enableHibernateCache": false, "enableSwaggerCodegen": true, "enableTranslation": true, + "fakerSeed": "1", "jhiPrefix": "jhi", "languages": ["en", "fr"], "nativeLanguage": "en", "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", - "prodDatabaseType": "mariadb", + "prodDatabaseType": "postgresql", "reactive": true, "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", "searchEngine": "elasticsearch", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-mongodb-es-session/.yo-rc.json b/test-integration/samples/webflux-mongodb-es-session/.yo-rc.json index ed05634ee..471562f97 100644 --- a/test-integration/samples/webflux-mongodb-es-session/.yo-rc.json +++ b/test-integration/samples/webflux-mongodb-es-session/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleWebfluxMongodbEsSession", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "mongodb", @@ -23,6 +23,6 @@ "searchEngine": "elasticsearch", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json b/test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json index 0b5991e1f..1a2a7af65 100644 --- a/test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json +++ b/test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json @@ -6,7 +6,7 @@ "blueprints": [], "buildTool": "gradle", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "creationTimestamp": 1580314672693, @@ -20,17 +20,17 @@ "jhiPrefix": "jhi", "jhipsterVersion": "6.6.0", "languages": ["en", "fr"], - "messageBroker": false, + "messageBroker": "no", "nativeLanguage": "en", "otherModules": [], "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "prodDatabaseType": "mongodb", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-mongodb/.yo-rc.json b/test-integration/samples/webflux-mongodb/.yo-rc.json index a1091cebb..0f0abfedc 100644 --- a/test-integration/samples/webflux-mongodb/.yo-rc.json +++ b/test-integration/samples/webflux-mongodb/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleWebfluxMongodb", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "mongodb", @@ -20,9 +20,9 @@ "packageName": "tech.jhipster.sample", "prodDatabaseType": "mongodb", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-mysql-kafka/.yo-rc.json b/test-integration/samples/webflux-mysql-kafka/.yo-rc.json index 5a3aa5fe2..a1611a6d4 100644 --- a/test-integration/samples/webflux-mysql-kafka/.yo-rc.json +++ b/test-integration/samples/webflux-mysql-kafka/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleWebfluxMySqlKafka", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "sql", @@ -22,9 +22,9 @@ "packageName": "tech.jhipster.sample", "prodDatabaseType": "mysql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-nodb-oauth2/.yo-rc.json b/test-integration/samples/webflux-nodb-oauth2/.yo-rc.json index df1405ae9..efd24087c 100644 --- a/test-integration/samples/webflux-nodb-oauth2/.yo-rc.json +++ b/test-integration/samples/webflux-nodb-oauth2/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleWebfluxNodb", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "clientTheme": "none", "clientThemeVariant": "", @@ -21,10 +21,10 @@ "packageName": "tech.jhipster.sample", "prodDatabaseType": "no", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", - "serviceDiscoveryType": false, + "serviceDiscoveryType": "no", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-psql/.yo-rc.json b/test-integration/samples/webflux-psql/.yo-rc.json index f0e737782..c911ef88f 100644 --- a/test-integration/samples/webflux-psql/.yo-rc.json +++ b/test-integration/samples/webflux-psql/.yo-rc.json @@ -5,7 +5,7 @@ "baseName": "sampleWebfluxPsql", "buildTool": "maven", "cacheProvider": "no", - "clientFramework": "angularX", + "clientFramework": "angular", "clientPackageManager": "npm", "creationTimestamp": 1596513172471, "databaseType": "sql", @@ -21,9 +21,9 @@ "packageName": "tech.jhipster.sample", "prodDatabaseType": "postgresql", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } diff --git a/test-integration/samples/webflux-react/.yo-rc.json b/test-integration/samples/webflux-react/.yo-rc.json index e92b9cce3..f9bb364a8 100644 --- a/test-integration/samples/webflux-react/.yo-rc.json +++ b/test-integration/samples/webflux-react/.yo-rc.json @@ -20,9 +20,9 @@ "packageFolder": "tech/jhipster/sample", "packageName": "tech.jhipster.sample", "reactive": true, - "searchEngine": false, + "searchEngine": "no", "serverPort": "8080", "testFrameworks": ["gatling", "cypress"], - "websocket": false + "websocket": "no" } } From 22d9c0ff32b04887361a3dc835a72ab6d3d008fd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 18 Jun 2024 08:19:28 -0300 Subject: [PATCH 2/6] update jdl samples --- test-integration/jdl-samples/cache/cache.jdl | 75 ------------- .../blog-store.jdl | 27 ++++- .../blog-store.jdl | 22 ++-- .../blog-store.jdl | 12 +- .../blog-store.jdl | 11 +- .../blog-store.jdl | 31 ++++-- .../blog-store.jdl | 18 ++- .../blog-store.jdl | 8 ++ .../jdl-samples/stack-vue-no-db/stack.jdl | 104 ++++++++++++++++++ 9 files changed, 205 insertions(+), 103 deletions(-) delete mode 100644 test-integration/jdl-samples/cache/cache.jdl rename test-integration/jdl-samples/{mf-ngx-eureka-jwt-psql-ehcache => mf-ng-eureka-jwt-psql-ehcache}/blog-store.jdl (86%) rename test-integration/jdl-samples/{ms-mf-ngx-consul-oauth2-neo4j => ms-mf-ng-consul-oauth2-neo4j}/blog-store.jdl (88%) rename test-integration/jdl-samples/{ms-ngx-eureka-oauth2-mongodb-caffeine => ms-ng-oauth2-mongodb-caffeine}/blog-store.jdl (88%) create mode 100644 test-integration/jdl-samples/stack-vue-no-db/stack.jdl diff --git a/test-integration/jdl-samples/cache/cache.jdl b/test-integration/jdl-samples/cache/cache.jdl deleted file mode 100644 index 4ea15c131..000000000 --- a/test-integration/jdl-samples/cache/cache.jdl +++ /dev/null @@ -1,75 +0,0 @@ -application { - config { - baseName app1 - packageName com.example.app1 - applicationType monolith - prodDatabaseType postgresql - searchEngine elasticsearch - messageBroker kafka - websocket spring-websocket - serviceDiscoveryType consul - cacheProvider ehcache - authenticationType session - testFrameworks [gatling] - creationTimestamp 1617901618891 - } -} - -application { - config { - baseName app2 - packageName com.example.app2 - applicationType microservice - prodDatabaseType mysql - serviceDiscoveryType eureka - cacheProvider caffeine - authenticationType oauth2 - creationTimestamp 1617901618892 - } -} - -application { - config { - baseName app3 - packageName com.example.app3 - applicationType microservice - databaseType mongodb - cacheProvider hazelcast - authenticationType jwt - creationTimestamp 1617901618893 - } -} - -application { - config { - baseName app4 - packageName com.example.app4 - applicationType microservice - databaseType cassandra - cacheProvider infinispan - creationTimestamp 1617901618894 - } -} - -application { - config { - baseName app5 - packageName com.example.app6 - applicationType microservice - prodDatabaseType mariadb - cacheProvider memcached - creationTimestamp 1617901618895 - } -} - -application { - config { - baseName app6 - packageName com.example.app6 - applicationType gateway - prodDatabaseType postgresql - serviceDiscoveryType eureka - authenticationType oauth2 - creationTimestamp 1617901618896 - } -} diff --git a/test-integration/jdl-samples/mf-ngx-eureka-jwt-psql-ehcache/blog-store.jdl b/test-integration/jdl-samples/mf-ng-eureka-jwt-psql-ehcache/blog-store.jdl similarity index 86% rename from test-integration/jdl-samples/mf-ngx-eureka-jwt-psql-ehcache/blog-store.jdl rename to test-integration/jdl-samples/mf-ng-eureka-jwt-psql-ehcache/blog-store.jdl index 6e4c58be9..39d6eca65 100644 --- a/test-integration/jdl-samples/mf-ngx-eureka-jwt-psql-ehcache/blog-store.jdl +++ b/test-integration/jdl-samples/mf-ng-eureka-jwt-psql-ehcache/blog-store.jdl @@ -2,11 +2,12 @@ * Microservice stack sample to test compilation and base microfrontend functionality. * * Test focus: - * - clientFramework: angularX with microfrontend + * - clientFramework: angular with microfrontend * - serviceDiscovery: eureka * - authenticationType: jwt * - prodDatabaseType: postgresql * - testFrameworks: cypress + * - messageBroker: pulsar * * Imperative focus: * - cacheProvider: ehcache @@ -23,9 +24,11 @@ application { authenticationType jwt baseName gateway buildTool maven - clientFramework angularX + clientFramework angular creationTimestamp 1617901618886 jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + // tests are not stable enough + // messageBroker pulsar packageName com.okta.developer.gateway prodDatabaseType postgresql serviceDiscoveryType eureka @@ -43,9 +46,11 @@ application { baseName blog buildTool maven cacheProvider ehcache - clientFramework angularX + clientFramework angular creationTimestamp 1617901618887 jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + // tests are not stable enough + // messageBroker pulsar packageName com.okta.developer.blog prodDatabaseType postgresql serverPort 8081 @@ -63,11 +68,13 @@ application { baseName store, buildTool gradle cacheProvider ehcache - clientFramework angularX + clientFramework angular creationTimestamp 1617901618888 dtoSuffix Rest entitySuffix Entity jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + // tests are not stable enough + // messageBroker pulsar packageName com.okta.developer.store prodDatabaseType postgresql serverPort 8082 @@ -84,11 +91,13 @@ application { authenticationType jwt baseName notification, buildTool gradle - clientFramework angularX + clientFramework angular creationTimestamp 1617901618889 dtoSuffix Rest entitySuffix Entity jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + // tests are not stable enough + // messageBroker pulsar packageName com.okta.developer.notification prodDatabaseType postgresql reactive true @@ -160,3 +169,11 @@ deployment { monitoring no serviceDiscoveryType eureka } + +deployment { + deploymentType kubernetes, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType eureka +} diff --git a/test-integration/jdl-samples/ms-mf-ngx-consul-oauth2-neo4j/blog-store.jdl b/test-integration/jdl-samples/ms-mf-ng-consul-oauth2-neo4j/blog-store.jdl similarity index 88% rename from test-integration/jdl-samples/ms-mf-ngx-consul-oauth2-neo4j/blog-store.jdl rename to test-integration/jdl-samples/ms-mf-ng-consul-oauth2-neo4j/blog-store.jdl index 8734baf54..c594a5453 100644 --- a/test-integration/jdl-samples/ms-mf-ngx-consul-oauth2-neo4j/blog-store.jdl +++ b/test-integration/jdl-samples/ms-mf-ng-consul-oauth2-neo4j/blog-store.jdl @@ -2,7 +2,7 @@ * Microservice stack sample to test compilation and base microfrontend functionality. * * Test focus: - * - clientFramework: angularX with microservice/microfrontend + * - clientFramework: angular with microservice/microfrontend * - serviceDiscovery: consul * - authenticationType: oauth2 * - databaseType: neo4j @@ -17,14 +17,14 @@ * - buildTool: maven, gradle */ -/* reactive, maven */ +/* reactive, liquibase, maven */ application { config { applicationType gateway authenticationType oauth2 baseName gateway buildTool maven - clientFramework angularX + clientFramework angular creationTimestamp 1617901618886 // TODO enable databaseType // databaseType neo4j @@ -46,7 +46,7 @@ application { baseName blog buildTool maven cacheProvider no - clientFramework angularX + clientFramework angular creationTimestamp 1617901618887 databaseType neo4j jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" @@ -58,7 +58,7 @@ application { entities Blog, Post, Tag } -/* microservice, imperative, gradle, entitySuffix/dtoSuffix */ +/* microservice, liquibase, imperative, gradle, entitySuffix/dtoSuffix */ application { config { applicationType microservice @@ -85,7 +85,7 @@ application { authenticationType oauth2 baseName notification, buildTool gradle - clientFramework angularX + clientFramework angular creationTimestamp 1617901618889 databaseType neo4j dtoSuffix Rest @@ -128,7 +128,7 @@ entity Product { image ImageBlob } -/* +/* TODO relationships at Neo4J cascades, changing the user entity. relationship OneToOne { @Id UserData{user(login)} to User } @@ -163,3 +163,11 @@ deployment { monitoring no serviceDiscoveryType consul } + +deployment { + deploymentType kubernetes, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType consul +} diff --git a/test-integration/jdl-samples/ms-mf-react-eureka-oauth2-mariadb-infinispan/blog-store.jdl b/test-integration/jdl-samples/ms-mf-react-eureka-oauth2-mariadb-infinispan/blog-store.jdl index ba3d790de..0f87abda9 100644 --- a/test-integration/jdl-samples/ms-mf-react-eureka-oauth2-mariadb-infinispan/blog-store.jdl +++ b/test-integration/jdl-samples/ms-mf-react-eureka-oauth2-mariadb-infinispan/blog-store.jdl @@ -30,7 +30,7 @@ application { prodDatabaseType mariadb serviceDiscoveryType eureka testFrameworks [cypress] - microfrontends [blog, notification, store] + microfrontends [blog, notification] } entities UserData, Product } @@ -138,6 +138,8 @@ entity Notification { } relationship ManyToOne { + Blog{user(login)} to User + Notification{user(login)} to User Post{blog(name)} to Blog } @@ -161,3 +163,11 @@ deployment { monitoring no serviceDiscoveryType eureka } + +deployment { + deploymentType kubernetes, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType eureka +} diff --git a/test-integration/jdl-samples/ms-mf-vue-consul-oauth2-mysql-memcached/blog-store.jdl b/test-integration/jdl-samples/ms-mf-vue-consul-oauth2-mysql-memcached/blog-store.jdl index 52e2a3181..1a3ad3062 100644 --- a/test-integration/jdl-samples/ms-mf-vue-consul-oauth2-mysql-memcached/blog-store.jdl +++ b/test-integration/jdl-samples/ms-mf-vue-consul-oauth2-mysql-memcached/blog-store.jdl @@ -30,7 +30,7 @@ application { prodDatabaseType mysql serviceDiscoveryType consul testFrameworks [cypress] - microfrontends [blog, notification, store] + microfrontends [blog, notification] } entities UserData, Product } @@ -139,6 +139,7 @@ entity Notification { relationship ManyToOne { Blog{user(login)} to User + Notification{user(login)} to User Post{blog(name)} to Blog } @@ -162,3 +163,11 @@ deployment { monitoring no serviceDiscoveryType consul } + +deployment { + deploymentType kubernetes, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType consul +} diff --git a/test-integration/jdl-samples/ms-ngx-eureka-oauth2-mongodb-caffeine/blog-store.jdl b/test-integration/jdl-samples/ms-ng-oauth2-mongodb-caffeine/blog-store.jdl similarity index 88% rename from test-integration/jdl-samples/ms-ngx-eureka-oauth2-mongodb-caffeine/blog-store.jdl rename to test-integration/jdl-samples/ms-ng-oauth2-mongodb-caffeine/blog-store.jdl index 35eebc0b2..f5f5279d5 100644 --- a/test-integration/jdl-samples/ms-ngx-eureka-oauth2-mongodb-caffeine/blog-store.jdl +++ b/test-integration/jdl-samples/ms-ng-oauth2-mongodb-caffeine/blog-store.jdl @@ -2,7 +2,7 @@ * Microservice stack sample to test compilation and base gateway/microservices functionality. * * Test focus: - * - serviceDiscovery: eureka + * - serviceDiscovery: no * - authenticationType: oauth2 * - databaseType: mongodb * - testFrameworks: cypress, cucumber, gatling @@ -16,42 +16,43 @@ * - buildTool: maven, gradle */ -/* reactive, maven */ +/* imperative, maven */ application { config { applicationType gateway authenticationType oauth2 baseName gateway buildTool maven - clientFramework angularX + // cacheProvider caffeine + clientFramework angular creationTimestamp 1617901618886 databaseType mongodb jhiPrefix custom jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" - // TODO enable kafka // messageBroker kafka packageName com.okta.developer.gateway - serviceDiscoveryType eureka + // reactive false + serviceDiscoveryType consul testFrameworks [cypress, cucumber, gatling] + // routes ["blog:blog:8081", "store:store:8082", "notification:notification:8083"] } entities * } -/* imperative, maven */ +/* reactive, maven */ application { config { applicationType microservice authenticationType oauth2 baseName blog buildTool maven - cacheProvider caffeine creationTimestamp 1617901618887 databaseType mongodb jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" messageBroker kafka packageName com.okta.developer.blog serverPort 8081 - serviceDiscoveryType eureka + serviceDiscoveryType consul testFrameworks [cucumber, gatling] } entities Blog, Post, Tag @@ -73,7 +74,7 @@ application { messageBroker kafka packageName com.okta.developer.store serverPort 8082 - serviceDiscoveryType eureka + serviceDiscoveryType consul testFrameworks [cucumber, gatling] } entities Product @@ -95,7 +96,7 @@ application { packageName com.okta.developer.notification reactive true serverPort 8083 - serviceDiscoveryType eureka + serviceDiscoveryType consul testFrameworks [cucumber, gatling] } entities Notification @@ -162,5 +163,13 @@ deployment { appsFolders [gateway, store, blog, notification] dockerRepositoryName "hipsterslabs" monitoring no - serviceDiscoveryType eureka + serviceDiscoveryType consul +} + +deployment { + deploymentType kubernetes, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType consul } diff --git a/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl b/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl index 7c73920a5..8fce24134 100644 --- a/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl +++ b/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl @@ -45,7 +45,8 @@ application { buildTool gradle cacheProvider redis creationTimestamp 1617901618887 - databaseType cassandra + // databaseType cassandra + prodDatabaseType postgresql jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" packageName com.okta.developer.blog serverPort 8081 @@ -89,8 +90,7 @@ application { entitySuffix Entity jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" packageName com.okta.developer.notification - // TODO switch to reactive - // reactive true + reactive true serverPort 8083 serviceDiscoveryType consul testFrameworks [cucumber, gatling] @@ -123,6 +123,7 @@ entity Tag { @ChangelogDate(20210408164813) entity Product { + @Id id UUID title String required price BigDecimal required min(0) image ImageBlob @@ -130,6 +131,7 @@ entity Product { @ChangelogDate(20210408164814) entity Notification { + @Id id UUID title String required } @@ -166,3 +168,13 @@ deployment { monitoring no serviceDiscoveryType consul } + +/* kubernetes is missing cassandra templates +deployment { + deploymentType kubernetes, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType consul +} +*/ diff --git a/test-integration/jdl-samples/ms-vue-eureka-jwt-couchbase-hazelcast/blog-store.jdl b/test-integration/jdl-samples/ms-vue-eureka-jwt-couchbase-hazelcast/blog-store.jdl index fa6ac6839..30111c7a9 100644 --- a/test-integration/jdl-samples/ms-vue-eureka-jwt-couchbase-hazelcast/blog-store.jdl +++ b/test-integration/jdl-samples/ms-vue-eureka-jwt-couchbase-hazelcast/blog-store.jdl @@ -158,3 +158,11 @@ deployment { monitoring no serviceDiscoveryType eureka } + +deployment { + deploymentType kubernetes, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType eureka +} diff --git a/test-integration/jdl-samples/stack-vue-no-db/stack.jdl b/test-integration/jdl-samples/stack-vue-no-db/stack.jdl new file mode 100644 index 000000000..58b9bb6e6 --- /dev/null +++ b/test-integration/jdl-samples/stack-vue-no-db/stack.jdl @@ -0,0 +1,104 @@ +/* + * Microservice stack sample to test compilation and base gateway/microservices functionality. + * + * Test focus: + * - databaseType: no + * - testFrameworks: cypress + * + * Matrix: + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, maven */ +application { + config { + applicationType gateway + authenticationType oauth2 + baseName gatewayOauth2 + buildTool maven + clientFramework vue + creationTimestamp 1617901618886 + databaseType no + jhiPrefix custom + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway_jwt + serviceDiscoveryType no + testFrameworks [cypress] + } +} + +application { + config { + applicationType gateway + authenticationType jwt + baseName gatewayJwt + buildTool gradle + clientFramework no + creationTimestamp 1617901618887 + databaseType no + enableSwaggerCodegen true + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway_oauth2 + serverPort 8081 + serviceDiscoveryType no + } +} + +application { + config { + applicationType monolith + authenticationType jwt + baseName monolithJwt + buildTool maven + cacheProvider no + clientFramework no + creationTimestamp 1617901618888 + databaseType no + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.monolith_jwt + serverPort 8082 + serviceDiscoveryType no + } +} + +application { + config { + applicationType monolith + authenticationType oauth2 + baseName monolithOauth2 + buildTool gradle + cacheProvider no + clientFramework no + creationTimestamp 1617901618889 + databaseType no + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.monolith_oauth2 + serverPort 8083 + } +} + +application { + config { + applicationType monolith + authenticationType session + baseName monolithSession + buildTool maven + cacheProvider no + clientFramework no + creationTimestamp 1617901618890 + databaseType no + rememberMeKey "1c0faa36864eb6b9863b48914ac61fa1a7699af2cb7ede015b0b38e4a596334bf48d15fffa2d9459751281b2e5b138ba57bc" + packageName com.okta.developer.monolith_session + serverPort 8084 + } +} + +deployment { + deploymentType docker-compose + /* Test e2e at gateway + oauth2 only */ + appsFolders [gatewayOauth2] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType no +} From 1af5c2c371c8cb4fcc5d4ec3dabd7f22b06873fb Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 18 Jun 2024 09:06:55 -0300 Subject: [PATCH 3/6] migrate v8 config --- generators/app/index.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/generators/app/index.js b/generators/app/index.js index 6eed17f56..b5807e503 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -36,6 +36,34 @@ module.exports = class extends BaseGenerator { const initializer = { ...super._initializing(), displayLogo, + adjustV8Config() { + if (this.jhipsterConfig.clientFramework === 'angular') { + this.jhipsterConfig.clientFramework = 'angularX'; + } + if (this.jhipsterConfig.searchEngine === 'no') { + this.jhipsterConfig.searchEngine = false; + } + if (this.jhipsterConfig.serviceDiscoveryType === 'no') { + this.jhipsterConfig.serviceDiscoveryType = false; + } + if (this.jhipsterConfig.messageBroker === 'no') { + this.jhipsterConfig.messageBroker = false; + } + if (this.jhipsterConfig.websocket === 'no') { + this.jhipsterConfig.websocket = false; + } + if (this.jhipsterConfig.languages) { + if (this.jhipsterConfig.languages.includes('id')) { + this.jhipsterConfig.languages = this.jhipsterConfig.languages.map(lang => (lang === 'id' ? 'in' : lang)); + } + if (this.jhipsterConfig.languages.includes('kr-Latn-kr')) { + this.jhipsterConfig.languages = this.jhipsterConfig.languages.filter(lang => lang !== 'kr-Latn-kr'); + } + if (this.jhipsterConfig.languages.includes('az-Latn-az')) { + this.jhipsterConfig.languages = this.jhipsterConfig.languages.filter(lang => lang !== 'az-Latn-az'); + } + } + }, }; return initializer; From 39d9d9c704142506d258db606a33f67c47f45dfb Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 18 Jun 2024 09:27:43 -0300 Subject: [PATCH 4/6] revert ng-gradle-fr --- test-integration/samples/ng-gradle-fr/.yo-rc.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/test-integration/samples/ng-gradle-fr/.yo-rc.json b/test-integration/samples/ng-gradle-fr/.yo-rc.json index 49d506441..3a56b0719 100644 --- a/test-integration/samples/ng-gradle-fr/.yo-rc.json +++ b/test-integration/samples/ng-gradle-fr/.yo-rc.json @@ -15,10 +15,8 @@ "dtoSuffix": "DTO", "embeddableLaunchScript": false, "enableHibernateCache": true, - "enableSwaggerCodegen": true, "enableTranslation": true, "entitySuffix": "", - "incrementalChangelog": true, "jhiPrefix": "jhi", "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", "languages": ["en", "fr"], From 829ad836ff7cbdcd77ddbebf2f0258725518940b Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 18 Jun 2024 09:30:41 -0300 Subject: [PATCH 5/6] revert document entities samples --- test-integration/samples/.jhipster/DocumentBankAccount.json | 4 ++-- test-integration/samples/.jhipster/EmbeddedOperation.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test-integration/samples/.jhipster/DocumentBankAccount.json b/test-integration/samples/.jhipster/DocumentBankAccount.json index 189b61fe9..00dd50f63 100644 --- a/test-integration/samples/.jhipster/DocumentBankAccount.json +++ b/test-integration/samples/.jhipster/DocumentBankAccount.json @@ -20,8 +20,8 @@ "relationships": [ { "otherEntityName": "embeddedOperation", - "otherEntityRelationshipName": "documentBankAccountToOne", - "relationshipName": "manyEmbeddedOperation", + "otherEntityRelationshipName": "documentBankAccount", + "relationshipName": "embeddedOperation", "relationshipType": "one-to-many" } ], diff --git a/test-integration/samples/.jhipster/EmbeddedOperation.json b/test-integration/samples/.jhipster/EmbeddedOperation.json index d9ee9676d..cd5586c19 100644 --- a/test-integration/samples/.jhipster/EmbeddedOperation.json +++ b/test-integration/samples/.jhipster/EmbeddedOperation.json @@ -14,6 +14,7 @@ { "otherEntityField": "name", "otherEntityName": "documentBankAccount", + "otherEntityRelationshipName": "embeddedOperation", "relationshipName": "documentBankAccount", "relationshipType": "many-to-one" } From 0b10ddf8a2b47b72e83d21980f6f1d93f0627a67 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 18 Jun 2024 08:11:42 -0300 Subject: [PATCH 6/6] workflow adjusts --- .github/actions/compare-base/action.yml | 2 +- .github/actions/compare/action.yml | 4 +- .github/workflows/angular.yml | 14 ++++-- .github/workflows/react.yml | 10 ++-- .../scripts/11-generate-config.sh | 15 +++++- test-integration/scripts/25-sonar-analyze.sh | 2 +- .../workflow-samples/angular.json | 46 +++++++++---------- 7 files changed, 54 insertions(+), 39 deletions(-) diff --git a/.github/actions/compare-base/action.yml b/.github/actions/compare-base/action.yml index a6184c088..65789caf7 100644 --- a/.github/actions/compare-base/action.yml +++ b/.github/actions/compare-base/action.yml @@ -41,7 +41,7 @@ runs: git restore -s @~1 . npm install # use updated cli, scripts and samples - git checkout cli/cli.cjs test-integration + git checkout test-integration/scripts shell: bash - name: 'MERGE: merge base config' id: base-config diff --git a/.github/actions/compare/action.yml b/.github/actions/compare/action.yml index 35b312dda..b9dd2ac87 100644 --- a/.github/actions/compare/action.yml +++ b/.github/actions/compare/action.yml @@ -44,9 +44,9 @@ runs: # Verify if the generated source has changed git add . echo "Showing config diff changes (won't trigger builds)" - git -c color.ui=always diff -R --cached -- '.yo-rc.json' '**/.yo-rc.json' '.jhipster/**' '**/.jhipster/**' + git -c color.ui=always diff -R --cached -- '.yo-rc.json' '**/.yo-rc.json' '.jhipster/**' '**/.jhipster/**' '**.jdl' '**.md' 'kubernetes/**' echo "Showing source diff changes (will trigger builds)" - git -c color.ui=always diff -R --cached --exit-code -- . ':!.yo-rc.json' ':!**/.yo-rc.json' ':!.jhipster/**' ':!**/.jhipster/**' ':!package-lock.json' ':!**/package-lock.json' ':!**/keystore.p12' \ + git -c color.ui=always diff -R --cached --exit-code -- . ':!.yo-rc.json' ':!**/.yo-rc.json' ':!.jhipster/**' ':!**/.jhipster/**' ':!package-lock.json' ':!**/package-lock.json' ':!**/keystore.p12' '!**.jdl' '!**.md' '!kubernetes/**' \ && echo "::set-output name=equals::true" \ || echo "::set-output name=has-changes::true" shell: bash diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index b6acefc3b..4efa340ad 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -122,6 +122,10 @@ jobs: #---------------------------------------------------------------------- # Detect changes against base commit #---------------------------------------------------------------------- + # Revert samples rename to old name. + - run: echo "JHI_JDL_APP=${JHI_JDL_APP//ng-oauth2-mongodb/ng-oauth2-eureka-mongodb}" >> $GITHUB_ENV + - run: echo "JHI_JDL_APP=${JHI_JDL_APP//ng-/ngx-}" >> $GITHUB_ENV + - run: echo "JHI_APP=${JHI_APP//ng-/ngx-}" >> $GITHUB_ENV - name: 'MERGE: generate base' continue-on-error: true id: base-app @@ -151,10 +155,10 @@ jobs: run: npm run ci:backend:test continue-on-error: ${{matrix.continue-on-backend-tests-error || false}} timeout-minutes: 20 - - name: 'TESTS: frontend' - if: steps.compare.outputs.equals != 'true' && matrix.skip-frontend-tests != 1 && needs.build-matrix.outputs.client != 'false' - run: npm run ci:frontend:test - timeout-minutes: 8 + #- name: 'TESTS: frontend' + # if: steps.compare.outputs.equals != 'true' && matrix.skip-frontend-tests != 1 && needs.build-matrix.outputs.client != 'false' + # run: npm run ci:frontend:test + # timeout-minutes: 8 - name: 'TESTS: packaging' if: steps.compare.outputs.equals != 'true' run: npm run ci:e2e:package @@ -173,7 +177,7 @@ jobs: if: always() && steps.backend.outcome == 'failure' with: name: log-${{ matrix.name }} - path: ${{ steps.setup.outputs.application-path }}/**/test-results/**/*.xml + path: ${{ steps.setup.outputs.application-path }}/**/reports/ktlint/** - name: 'E2E: Store failure screenshots' uses: actions/upload-artifact@v3 if: always() && steps.e2e.outcome == 'failure' diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index 5597e6c1c..aa2ff117e 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -148,10 +148,10 @@ jobs: run: npm run ci:backend:test continue-on-error: ${{matrix.continue-on-backend-tests-error || false}} timeout-minutes: 20 - - name: 'TESTS: frontend' - if: steps.compare.outputs.equals != 'true' && matrix.skip-frontend-tests != 1 && needs.build-matrix.outputs.client != 'false' - run: npm run ci:frontend:test - timeout-minutes: 8 + #- name: 'TESTS: frontend' + # if: steps.compare.outputs.equals != 'true' && matrix.skip-frontend-tests != 1 && needs.build-matrix.outputs.client != 'false' + # run: npm run ci:frontend:test + # timeout-minutes: 8 - name: 'TESTS: packaging' if: steps.compare.outputs.equals != 'true' run: npm run ci:e2e:package @@ -170,7 +170,7 @@ jobs: if: always() && steps.backend.outcome == 'failure' with: name: log-${{ matrix.name }} - path: ${{ steps.setup.outputs.application-path }}/**/test-results/**/*.xml + path: ${{ steps.setup.outputs.application-path }}/**/reports/ktlint/** - name: 'E2E: Store failure screenshots' uses: actions/upload-artifact@v3 if: always() && steps.e2e.outcome == 'failure' diff --git a/test-integration/scripts/11-generate-config.sh b/test-integration/scripts/11-generate-config.sh index 2b95ea090..58a7875d9 100755 --- a/test-integration/scripts/11-generate-config.sh +++ b/test-integration/scripts/11-generate-config.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash #------------------------------------------------------------------------------- -# Eg: 11-generate-config.sh ./ ngx-default sqlfull +# Eg: 11-generate-config.sh ./ ng-default sqlfull #------------------------------------------------------------------------------- if [[ "$1" != "" ]]; then KHI_FOLDER_APP=$1 @@ -189,7 +189,18 @@ fi # Generate jdl entities #------------------------------------------------------------------------------- if [[ "$JHI_JDL_ENTITY" != "" && "$JHI_JDL_ENTITY" != "none" ]]; then - cli.cjs --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$JHI_JDL_ENTITY.jdl --json-only + IFS=',' + for i in `echo "$JHI_JDL_ENTITY"` + do + if [[ -d "$JHI_SAMPLES/jdl-entities/$i" ]]; then + cli.cjs --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$i --json-only + + elif [[ -f "$JHI_SAMPLES/jdl-entities/$i.jdl" ]]; then + cp -f "$JHI_SAMPLES/jdl-entities/$i.jdl" "$KHI_FOLDER_APP"/ + cli.cjs --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$i.jdl --json-only + + fi + done fi #------------------------------------------------------------------------------- diff --git a/test-integration/scripts/25-sonar-analyze.sh b/test-integration/scripts/25-sonar-analyze.sh index bb4595a75..16f52f421 100755 --- a/test-integration/scripts/25-sonar-analyze.sh +++ b/test-integration/scripts/25-sonar-analyze.sh @@ -7,7 +7,7 @@ source $(dirname $0)/00-init-env.sh #-------------------------------------------------- cd "$KHI_FOLDER_APP" -if [[ "$JHI_APP" = "ngx-default" && "$GITHUB_REPOSITORY" = "jhipster/generator-jhipster" && "$GITHUB_REF" = "refs/heads/main" ]]; then +if [[ "$JHI_APP" = "ng-default" && "$GITHUB_REPOSITORY" = "jhipster/generator-jhipster" && "$GITHUB_REF" = "refs/heads/main" ]]; then echo "*** Sonar analyze for main branch" ./mvnw -ntp --batch-mode initialize org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar \ -Dsonar.host.url=https://sonarcloud.io \ diff --git a/test-integration/workflow-samples/angular.json b/test-integration/workflow-samples/angular.json index 9b723ca20..6228c756f 100644 --- a/test-integration/workflow-samples/angular.json +++ b/test-integration/workflow-samples/angular.json @@ -1,81 +1,81 @@ { "include": [ { - "name": "ngx-default", - "app-sample": "ngx-default", + "name": "ng-default", + "app-sample": "ng-default", "entity": "sqlfull", "sonar-analyse": "true" }, { - "name": "ngx-default-additional", + "name": "ng-default-additional", "entity": "none", - "app-sample": "ngx-default", - "jdl-entity": "*" + "app-sample": "ng-default", + "jdl-entity": "custom-id,entities" }, { - "name": "ngx-mongodb-kafka-cucumber", - "app-sample": "ngx-mongodb-kafka-cucumber", + "name": "ng-mongodb-kafka-cucumber", + "app-sample": "ng-mongodb-kafka-cucumber", "entity": "mongodb", "environment": "dev" }, { - "name": "ngx-gradle-fr", - "app-sample": "ngx-gradle-fr", + "name": "ng-gradle-fr", + "app-sample": "ng-gradle-fr", "entity": "sql" }, { - "name": "ngx-gradle-h2disk-ws-nocache", - "app-sample": "ngx-gradle-h2disk-ws-nocache", + "name": "ng-gradle-h2disk-ws-nocache", + "app-sample": "ng-gradle-h2disk-ws-nocache", "entity": "sql", "environment": "dev", "war": 1, "testcontainers": "false" }, { - "name": "ngx-webflux-mongodb", + "name": "ng-webflux-mongodb", "app-sample": "webflux-mongodb", "entity": "mongodb" }, { - "name": "ngx-webflux-gradle-mongodb-oauth2", + "name": "ng-webflux-gradle-mongodb-oauth2", "app-sample": "webflux-mongodb-oauth2", "entity": "mongodb" }, { - "name": "ngx-webflux-psql-default", + "name": "ng-webflux-psql-default", "app-sample": "webflux-psql", "entity": "sql" }, { - "name": "ngx-webflux-psql-additional", + "name": "ng-webflux-psql-additional", "jdl-samples": "webflux-psql,custom-domain" }, { - "name": "ngx-webflux-gradle-session-h2mem-es", + "name": "ng-webflux-gradle-session-h2mem-es", "app-sample": "webflux-gradle-session-h2mem-es", "environment": "dev", "entity": "sqllight" }, { - "name": "ngx-webflux-couchbase", + "name": "ng-webflux-couchbase", "app-sample": "webflux-couchbase", "entity": "couchbase" }, { - "name": "ms-ngx-eureka-oauth2-mongodb-caffeine", - "jdl-samples": "ms-ngx-eureka-oauth2-mongodb-caffeine", + "name": "ms-ng-oauth2-mongodb-caffeine", + "jdl-samples": "ms-ng-oauth2-mongodb-caffeine", "extra-args": "--workspaces --monorepository", "workspaces": "true" }, { - "name": "mf-ngx-eureka-jwt-psql-ehcache", - "jdl-samples": "mf-ngx-eureka-jwt-psql-ehcache", + "name": "mf-ng-eureka-jwt-psql-ehcache", + "jdl-samples": "mf-ng-eureka-jwt-psql-ehcache", "extra-args": "--workspaces --monorepository", "workspaces": "true" }, { - "name": "ms-mf-ngx-consul-oauth2-neo4j", - "jdl-samples": "ms-mf-ngx-consul-oauth2-neo4j", + "name": "ms-mf-ng-consul-oauth2-neo4j", + "jdl-samples": "ms-mf-ng-consul-oauth2-neo4j", "extra-args": "--workspaces --monorepository", "workspaces": "true" }