From ec3207b6abafb8b50f2d87eb11bdc4e7dfc51cdc Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 13 Jun 2024 15:31:06 -0300 Subject: [PATCH 01/10] add jdl-samples --- test-integration/jdl-samples/cache/cache.jdl | 75 ++++++++ .../blog-store.jdl | 162 +++++++++++++++++ .../blog-store.jdl | 165 +++++++++++++++++ .../blog-store.jdl | 163 +++++++++++++++++ .../blog-store.jdl | 164 +++++++++++++++++ .../blog-store.jdl | 166 +++++++++++++++++ .../blog-store.jdl | 168 ++++++++++++++++++ .../blog-store.jdl | 160 +++++++++++++++++ .../jdl-samples/webflux-psql/webflux-psql.jdl | 9 + 9 files changed, 1232 insertions(+) create mode 100644 test-integration/jdl-samples/cache/cache.jdl create mode 100644 test-integration/jdl-samples/mf-ngx-eureka-jwt-psql-ehcache/blog-store.jdl create mode 100644 test-integration/jdl-samples/ms-mf-ngx-consul-oauth2-neo4j/blog-store.jdl create mode 100644 test-integration/jdl-samples/ms-mf-react-eureka-oauth2-mariadb-infinispan/blog-store.jdl create mode 100644 test-integration/jdl-samples/ms-mf-vue-consul-oauth2-mysql-memcached/blog-store.jdl create mode 100644 test-integration/jdl-samples/ms-ngx-eureka-oauth2-mongodb-caffeine/blog-store.jdl create mode 100644 test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl create mode 100644 test-integration/jdl-samples/ms-vue-eureka-jwt-couchbase-hazelcast/blog-store.jdl create mode 100644 test-integration/jdl-samples/webflux-psql/webflux-psql.jdl diff --git a/test-integration/jdl-samples/cache/cache.jdl b/test-integration/jdl-samples/cache/cache.jdl new file mode 100644 index 000000000..4ea15c131 --- /dev/null +++ b/test-integration/jdl-samples/cache/cache.jdl @@ -0,0 +1,75 @@ +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-ngx-eureka-jwt-psql-ehcache/blog-store.jdl new file mode 100644 index 000000000..6e4c58be9 --- /dev/null +++ b/test-integration/jdl-samples/mf-ngx-eureka-jwt-psql-ehcache/blog-store.jdl @@ -0,0 +1,162 @@ +/* + * Microservice stack sample to test compilation and base microfrontend functionality. + * + * Test focus: + * - clientFramework: angularX with microfrontend + * - serviceDiscovery: eureka + * - authenticationType: jwt + * - prodDatabaseType: postgresql + * - testFrameworks: cypress + * + * Imperative focus: + * - cacheProvider: ehcache + * + * Matrix: + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, maven */ +application { + config { + applicationType gateway + authenticationType jwt + baseName gateway + buildTool maven + clientFramework angularX + creationTimestamp 1617901618886 + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway + prodDatabaseType postgresql + serviceDiscoveryType eureka + testFrameworks [cypress] + microfrontends [blog, notification, store] + } + entities UserData +} + +/* imperative, maven */ +application { + config { + applicationType microservice + authenticationType jwt + baseName blog + buildTool maven + cacheProvider ehcache + clientFramework angularX + creationTimestamp 1617901618887 + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.blog + prodDatabaseType postgresql + serverPort 8081 + serviceDiscoveryType eureka + testFrameworks [cypress] + } + entities Blog, Post, Tag +} + +/* imperative, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType jwt + baseName store, + buildTool gradle + cacheProvider ehcache + clientFramework angularX + creationTimestamp 1617901618888 + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.store + prodDatabaseType postgresql + serverPort 8082 + serviceDiscoveryType eureka + testFrameworks [cypress] + } + entities Product +} + +/* reactive, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType jwt + baseName notification, + buildTool gradle + clientFramework angularX + creationTimestamp 1617901618889 + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.notification + prodDatabaseType postgresql + reactive true + serverPort 8083 + serviceDiscoveryType eureka + testFrameworks [cypress] + } + entities Notification +} + +@ChangelogDate(20210408164809) +entity UserData { + address String +} + +@ChangelogDate(20210408164810) +entity Blog { + name String required minlength(3) + handle String required minlength(2) +} + +@ChangelogDate(20210408164811) +entity Post { + title String required +} + +@ChangelogDate(20210408164812) +entity Tag { + name String required minlength(2) +} + +@ChangelogDate(20210408164813) +entity Product { + title String required + price BigDecimal required min(0) + image ImageBlob +} + +/* +relationship OneToOne { + @Id UserData{user(login)} to User +} +*/ + +@ChangelogDate(20210408164814) +entity Notification { + title String required +} + +relationship ManyToOne { + Post{blog(name)} to Blog +} + +relationship ManyToMany { + Post{tag(name)} to Tag{post} +} + +paginate Post, Tag with infinite-scroll +paginate Product with pagination + +service Product with serviceClass +service Notification with serviceImpl +dto Blog, Post, Tag, Notification with mapstruct + +deployment { + deploymentType docker-compose, + 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-ngx-consul-oauth2-neo4j/blog-store.jdl new file mode 100644 index 000000000..8734baf54 --- /dev/null +++ b/test-integration/jdl-samples/ms-mf-ngx-consul-oauth2-neo4j/blog-store.jdl @@ -0,0 +1,165 @@ +/* + * Microservice stack sample to test compilation and base microfrontend functionality. + * + * Test focus: + * - clientFramework: angularX with microservice/microfrontend + * - serviceDiscovery: consul + * - authenticationType: oauth2 + * - databaseType: neo4j + * - testFrameworks: cypress + * + * Imperative focus: + * - cacheProvider: no + * + * Matrix: + * - microfrontend: true, false + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, maven */ +application { + config { + applicationType gateway + authenticationType oauth2 + baseName gateway + buildTool maven + clientFramework angularX + creationTimestamp 1617901618886 + // TODO enable databaseType + // databaseType neo4j + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway + serviceDiscoveryType consul + testFrameworks [cypress] + microfrontends [blog, notification] + } + // TODO Add UserData + entities Product +} + +/* microfrontend, imperative, maven */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName blog + buildTool maven + cacheProvider no + clientFramework angularX + creationTimestamp 1617901618887 + databaseType neo4j + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.blog + serverPort 8081 + serviceDiscoveryType consul + testFrameworks [cypress] + } + entities Blog, Post, Tag +} + +/* microservice, imperative, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName store, + buildTool gradle + cacheProvider no + creationTimestamp 1617901618888 + databaseType neo4j + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.store + serverPort 8082 + serviceDiscoveryType consul + } + entities Product +} + +/* microfrontend, reactive, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName notification, + buildTool gradle + clientFramework angularX + creationTimestamp 1617901618889 + databaseType neo4j + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.notification + reactive true + serverPort 8083 + serviceDiscoveryType consul + testFrameworks [cypress] + } + entities Notification +} + +@ChangelogDate(20210408164809) +entity UserData { + address String +} + +@ChangelogDate(20210408164810) +entity Blog { + name String required minlength(3) + handle String required minlength(2) +} + +@ChangelogDate(20210408164811) +entity Post { + title String required +} + +@ChangelogDate(20210408164812) +entity Tag { + name String required minlength(2) +} + +@ChangelogDate(20210408164813) +entity Product { + title String required + price BigDecimal required min(0) + image ImageBlob +} + +/* +relationship OneToOne { + @Id UserData{user(login)} to User +} +*/ + +@ChangelogDate(20210408164814) +entity Notification { + title String required +} + +relationship ManyToOne { + Post{blog(name)} to Blog +} + +relationship ManyToMany { + Post{tag(name)} to Tag{post} +} + +paginate Post, Tag with infinite-scroll +paginate Product with pagination + +service Product with serviceClass +service Notification with serviceImpl +dto Blog, Post, Tag, Notification with mapstruct + +microservice Product with store + +deployment { + deploymentType docker-compose, + 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 new file mode 100644 index 000000000..ba3d790de --- /dev/null +++ b/test-integration/jdl-samples/ms-mf-react-eureka-oauth2-mariadb-infinispan/blog-store.jdl @@ -0,0 +1,163 @@ +/* + * Microservice stack sample to test compilation and base microfrontend functionality. + * + * Test focus: + * - clientFramework: react with microservice/microfrontend + * - serviceDiscovery: eureka + * - authenticationType: oauth2 + * - prodDatabaseType: mariadb + * - testFrameworks: cypress + * + * Imperative focus: + * - cacheProvider: infinispan + * + * Matrix: + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, maven */ +application { + config { + applicationType gateway + authenticationType oauth2 + baseName gateway + buildTool maven + clientFramework react + creationTimestamp 1617901618886 + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway + prodDatabaseType mariadb + serviceDiscoveryType eureka + testFrameworks [cypress] + microfrontends [blog, notification, store] + } + entities UserData, Product +} + +/* microfrontend, imperative, maven */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName blog + buildTool maven + cacheProvider infinispan + clientFramework react + creationTimestamp 1617901618887 + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.blog + prodDatabaseType mariadb + serverPort 8081 + serviceDiscoveryType eureka + testFrameworks [cypress] + } + entities Blog, Post, Tag +} + +/* microservice, imperative, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName store, + buildTool gradle + cacheProvider infinispan + creationTimestamp 1617901618888 + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.store + prodDatabaseType mariadb + serverPort 8082 + serviceDiscoveryType eureka + testFrameworks [cypress] + } + entities Product +} + +/* microfrontend, reactive, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName notification, + buildTool gradle + clientFramework react + creationTimestamp 1617901618889 + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.notification + prodDatabaseType mariadb + reactive true + serverPort 8083 + serviceDiscoveryType eureka + testFrameworks [cypress] + } + entities Notification +} + +@ChangelogDate(20210408164809) +entity UserData { + address String +} + +@ChangelogDate(20210408164810) +entity Blog { + name String required minlength(3) + handle String required minlength(2) +} + +@ChangelogDate(20210408164811) +entity Post { + title String required +} + +@ChangelogDate(20210408164812) +entity Tag { + name String required minlength(2) +} + +@ChangelogDate(20210408164813) +entity Product { + title String required + price BigDecimal required min(0) + image ImageBlob +} + +/* +relationship OneToOne { + @Id UserData{user(login)} to User +} +*/ + +@ChangelogDate(20210408164814) +entity Notification { + title String required +} + +relationship ManyToOne { + Post{blog(name)} to Blog +} + +relationship ManyToMany { + Post{tag(name)} to Tag{post} +} + +paginate Post, Tag with infinite-scroll +paginate Product with pagination + +service Product with serviceClass +service Notification with serviceImpl +dto Blog, Post, Tag, Notification with mapstruct + +microservice Product with store + +deployment { + deploymentType docker-compose, + 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 new file mode 100644 index 000000000..52e2a3181 --- /dev/null +++ b/test-integration/jdl-samples/ms-mf-vue-consul-oauth2-mysql-memcached/blog-store.jdl @@ -0,0 +1,164 @@ +/* + * Microservice stack sample to test compilation and base microfrontend functionality. + * + * Test focus: + * - clientFramework: vue with microservice/microfrontend + * - serviceDiscovery: consul + * - authenticationType: oauth2 + * - prodDatabaseType: mysql + * - testFrameworks: cypress + * + * Imperative focus: + * - cacheProvider: memcached + * + * Matrix: + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, maven */ +application { + config { + applicationType gateway + authenticationType oauth2 + baseName gateway + buildTool maven + clientFramework vue + creationTimestamp 1617901618886 + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway + prodDatabaseType mysql + serviceDiscoveryType consul + testFrameworks [cypress] + microfrontends [blog, notification, store] + } + entities UserData, Product +} + +/* microfrontend, imperative, maven */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName blog + buildTool maven + cacheProvider memcached + clientFramework vue + creationTimestamp 1617901618887 + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.blog + prodDatabaseType mysql + serverPort 8081 + serviceDiscoveryType consul + testFrameworks [cypress] + } + entities Blog, Post, Tag +} + +/* microservice, imperative, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName store, + buildTool gradle + cacheProvider memcached + creationTimestamp 1617901618888 + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.store + prodDatabaseType mysql + serverPort 8082 + serviceDiscoveryType consul + testFrameworks [cypress] + } + entities Product +} + +/* microfrontend, reactive, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName notification, + buildTool gradle + clientFramework vue + creationTimestamp 1617901618889 + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.notification + prodDatabaseType mysql + reactive true + serverPort 8083 + serviceDiscoveryType consul + testFrameworks [cypress] + } + entities Notification +} + +@ChangelogDate(20210408164809) +entity UserData { + address String +} + +@ChangelogDate(20210408164810) +entity Blog { + name String required minlength(3) + handle String required minlength(2) +} + +@ChangelogDate(20210408164811) +entity Post { + title String required +} + +@ChangelogDate(20210408164812) +entity Tag { + name String required minlength(2) +} + +@ChangelogDate(20210408164813) +entity Product { + title String required + price BigDecimal required min(0) + image ImageBlob +} + +/* +relationship OneToOne { + @Id UserData{user(login)} to User +} +*/ + +@ChangelogDate(20210408164814) +entity Notification { + title String required +} + +relationship ManyToOne { + Blog{user(login)} to User + Post{blog(name)} to Blog +} + +relationship ManyToMany { + Post{tag(name)} to Tag{post} +} + +paginate Post, Tag with infinite-scroll +paginate Product with pagination + +service Product with serviceClass +service Notification with serviceImpl +dto Blog, Post, Tag with mapstruct + +microservice Product with store + +deployment { + deploymentType docker-compose, + 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-ngx-eureka-oauth2-mongodb-caffeine/blog-store.jdl new file mode 100644 index 000000000..35eebc0b2 --- /dev/null +++ b/test-integration/jdl-samples/ms-ngx-eureka-oauth2-mongodb-caffeine/blog-store.jdl @@ -0,0 +1,166 @@ +/* + * Microservice stack sample to test compilation and base gateway/microservices functionality. + * + * Test focus: + * - serviceDiscovery: eureka + * - authenticationType: oauth2 + * - databaseType: mongodb + * - testFrameworks: cypress, cucumber, gatling + * - messageBroker: kafka + * + * Imperative focus: + * - cacheProvider: caffeine + * + * Matrix: + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, maven */ +application { + config { + applicationType gateway + authenticationType oauth2 + baseName gateway + buildTool maven + clientFramework angularX + creationTimestamp 1617901618886 + databaseType mongodb + jhiPrefix custom + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + // TODO enable kafka + // messageBroker kafka + packageName com.okta.developer.gateway + serviceDiscoveryType eureka + testFrameworks [cypress, cucumber, gatling] + } + entities * +} + +/* imperative, 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 + testFrameworks [cucumber, gatling] + } + entities Blog, Post, Tag +} + +/* imperative, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName store, + buildTool gradle + cacheProvider caffeine + creationTimestamp 1617901618888 + databaseType mongodb + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + messageBroker kafka + packageName com.okta.developer.store + serverPort 8082 + serviceDiscoveryType eureka + testFrameworks [cucumber, gatling] + } + entities Product +} + +/* reactive, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType oauth2 + baseName notification, + buildTool gradle + creationTimestamp 1617901618889 + databaseType mongodb + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + messageBroker kafka + packageName com.okta.developer.notification + reactive true + serverPort 8083 + serviceDiscoveryType eureka + testFrameworks [cucumber, gatling] + } + entities Notification +} + +@ChangelogDate(20210408164809) +entity UserData { + address String +} + +@ChangelogDate(20210408164810) +entity Blog { + name String required minlength(3) + handle String required minlength(2) +} + +@ChangelogDate(20210408164811) +entity Post { + title String required +} + +@ChangelogDate(20210408164812) +entity Tag { + name String required minlength(2) +} + +@ChangelogDate(20210408164813) +entity Product { + title String required + price BigDecimal required min(0) + image ImageBlob +} + +@ChangelogDate(20210408164814) +entity Notification { + title String required +} + +relationship OneToOne { + @Id UserData{user(login)} to User +} + +relationship ManyToOne { + Post{blog(name)} to Blog +} + +relationship ManyToMany { + Post{tag(name)} to Tag{post} +} + +paginate Post, Tag with infinite-scroll +paginate Product with pagination + +service Product with serviceClass +service Notification with serviceImpl +dto Blog, Post, Tag with mapstruct + +microservice Product with store +microservice Blog, Post, Tag with blog +microservice Notification with notification + +deployment { + deploymentType docker-compose, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType eureka +} 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 new file mode 100644 index 000000000..7c73920a5 --- /dev/null +++ b/test-integration/jdl-samples/ms-react-consul-jwt-cassandra-redis/blog-store.jdl @@ -0,0 +1,168 @@ +/* + * Microservice stack sample to test compilation and base gateway/microservices functionality. + * + * Test focus: + * - serviceDiscovery: consul + * - authenticationType: jwt + * - databaseType: cassandra + * - testFrameworks: cypress, cucumber, gatling + * + * Imperative focus: + * - cacheProvider: redis + * + * Matrix: + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, gradle */ +application { + config { + applicationType gateway + authenticationType jwt + baseName gateway + buildTool gradle + clientFramework react + creationTimestamp 1617901618886 + // TODO switch to cassandra + // databaseType cassandra + prodDatabaseType postgresql + jhiPrefix custom + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway + serviceDiscoveryType consul + testFrameworks [cypress, cucumber, gatling] + } + entities * +} + +/* imperative, gradle */ +application { + config { + applicationType microservice + authenticationType jwt + baseName blog + buildTool gradle + cacheProvider redis + creationTimestamp 1617901618887 + databaseType cassandra + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.blog + serverPort 8081 + serviceDiscoveryType consul + testFrameworks [cucumber, gatling] + } + entities Blog, Post, Tag +} + +/* imperative, maven, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType jwt + baseName store, + buildTool maven + cacheProvider redis + creationTimestamp 1617901618888 + databaseType cassandra + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.store + serverPort 8082 + serviceDiscoveryType consul + testFrameworks [cucumber, gatling] + } + entities Product +} + +/* reactive, maven, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType jwt + baseName notification, + buildTool maven + creationTimestamp 1617901618889 + databaseType cassandra + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.notification + // TODO switch to reactive + // reactive true + serverPort 8083 + serviceDiscoveryType consul + testFrameworks [cucumber, gatling] + } + entities Notification +} + +/* TODO enable when gateway+cassandra is fixed +@ChangelogDate(20210408164809) +entity UserData { + address String +} +*/ + +@ChangelogDate(20210408164810) +entity Blog { + name String required minlength(3) + handle String required minlength(2) +} + +@ChangelogDate(20210408164811) +entity Post { + title String required +} + +@ChangelogDate(20210408164812) +entity Tag { + name String required minlength(2) +} + +@ChangelogDate(20210408164813) +entity Product { + title String required + price BigDecimal required min(0) + image ImageBlob +} + +@ChangelogDate(20210408164814) +entity Notification { + title String required +} + +/* Relationships are broken or unsupported at cassandra db +relationship OneToOne { + @Id UserData{user(login)} to User +} + +relationship ManyToOne { + Post{blog(name)} to Blog +} + +relationship ManyToMany { + Post{tag(name)} to Tag{post} +} +*/ + +// Cassandra not compatible with pagination +// paginate Post, Tag with infinite-scroll +// paginate Product with pagination + +service Product with serviceClass +service Notification with serviceImpl +dto Blog, Post, Tag with mapstruct + +microservice Product with store +microservice Blog, Post, Tag with blog +microservice Notification with notification + +deployment { + deploymentType docker-compose, + 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 new file mode 100644 index 000000000..fa6ac6839 --- /dev/null +++ b/test-integration/jdl-samples/ms-vue-eureka-jwt-couchbase-hazelcast/blog-store.jdl @@ -0,0 +1,160 @@ +/* + * Microservice stack sample to test compilation and base gateway/microservices functionality. + * + * Test focus: + * - serviceDiscovery: eureka + * - authenticationType: jwt + * - databaseType: couchbase + * - testFrameworks: cypress, cucumber, gatling + * + * Imperative focus: + * - cacheProvider: hazelcast + * + * Matrix: + * - reactive: true, false + * - buildTool: maven, gradle + */ + +/* reactive, maven */ +application { + config { + applicationType gateway + authenticationType jwt + baseName gateway + buildTool maven + clientFramework vue + creationTimestamp 1617901618886 + databaseType couchbase + jhiPrefix custom + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.gateway + serviceDiscoveryType eureka + testFrameworks [cypress, cucumber, gatling] + } + entities * +} + +/* imperative, maven */ +application { + config { + applicationType microservice + authenticationType jwt + baseName blog + buildTool maven + cacheProvider hazelcast + creationTimestamp 1617901618887 + databaseType couchbase + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.blog + serverPort 8081 + serviceDiscoveryType eureka + testFrameworks [cucumber, gatling] + } + entities Blog, Post, Tag +} + +/* imperative, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType jwt + baseName store, + buildTool gradle + cacheProvider hazelcast + creationTimestamp 1617901618888 + databaseType couchbase + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.store + serverPort 8082 + serviceDiscoveryType eureka + testFrameworks [cucumber, gatling] + } + entities Product +} + +/* reactive, gradle, entitySuffix/dtoSuffix */ +application { + config { + applicationType microservice + authenticationType jwt + baseName notification, + buildTool gradle + creationTimestamp 1617901618889 + databaseType couchbase + dtoSuffix Rest + entitySuffix Entity + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + packageName com.okta.developer.notification + reactive true + serverPort 8083 + serviceDiscoveryType eureka + testFrameworks [cucumber, gatling] + } + entities Notification +} + +@ChangelogDate(20210408164809) +entity UserData { + address String +} + +@ChangelogDate(20210408164810) +entity Blog { + name String required minlength(3) + handle String required minlength(2) +} + +@ChangelogDate(20210408164811) +entity Post { + title String required +} + +@ChangelogDate(20210408164812) +entity Tag { + name String required minlength(2) +} + +@ChangelogDate(20210408164813) +entity Product { + title String required + price BigDecimal required min(0) + image ImageBlob +} + +@ChangelogDate(20210408164814) +entity Notification { + title String required +} + +relationship OneToOne { + @Id UserData{user(login)} to User +} + +relationship ManyToOne { + Post{blog(name)} to Blog +} + +relationship ManyToMany { + Post{tag(name)} to Tag{post} +} + +paginate Post, Tag with infinite-scroll +paginate Product with pagination + +service Product with serviceClass +service Notification with serviceImpl +dto Blog, Post, Tag, Notification with mapstruct + +microservice Product with store +microservice Blog, Post, Tag with blog +microservice Notification with notification + +deployment { + deploymentType docker-compose, + appsFolders [gateway, store, blog, notification] + dockerRepositoryName "hipsterslabs" + monitoring no + serviceDiscoveryType eureka +} diff --git a/test-integration/jdl-samples/webflux-psql/webflux-psql.jdl b/test-integration/jdl-samples/webflux-psql/webflux-psql.jdl new file mode 100644 index 000000000..1bf5476de --- /dev/null +++ b/test-integration/jdl-samples/webflux-psql/webflux-psql.jdl @@ -0,0 +1,9 @@ +application { + config { + reactive true + testFrameworks [cypress] + creationTimestamp 1617901618886 + jwtSecretKey "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=" + } + entities * +} From 3c108e5698f85e2fcf4a13b5066cf2831cbdc4f5 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 13 Jun 2024 15:31:23 -0300 Subject: [PATCH 02/10] add samples --- test-integration/samples/.gitignore | 5 + test-integration/samples/.jhipster/Album.json | 34 +++ .../samples/.jhipster/Artist.json | 16 ++ .../samples/.jhipster/BankAccount.json | 35 +++ .../samples/.jhipster/CassBankAccount.json | 22 ++ .../samples/.jhipster/Division.json | 37 ++++ .../.jhipster/DocumentBankAccount.json | 29 +++ .../samples/.jhipster/EmbeddedOperation.json | 23 ++ .../samples/.jhipster/EntityWithDTO.json | 10 + .../.jhipster/EntityWithPaginationAndDTO.json | 10 + .../EntityWithServiceClassAndPagination.json | 10 + ...ntityWithServiceClassPaginationAndDTO.json | 10 + .../EntityWithServiceImplAndDTO.json | 10 + .../EntityWithServiceImplAndPagination.json | 10 + ...EntityWithServiceImplPaginationAndDTO.json | 10 + .../samples/.jhipster/FieldTestEntity.json | 104 +++++++++ .../.jhipster/FieldTestEnumWithValue.json | 20 ++ .../FieldTestInfiniteScrollEntity.json | 92 ++++++++ ...eldTestMapstructAndServiceClassEntity.json | 92 ++++++++ .../.jhipster/FieldTestPaginationEntity.json | 92 ++++++++ ...TestServiceClassAndJpaFilteringEntity.json | 93 ++++++++ .../.jhipster/FieldTestServiceImplEntity.json | 92 ++++++++ test-integration/samples/.jhipster/Genre.json | 16 ++ .../.jhipster/JpaFilteringOtherSide.json | 57 +++++ .../.jhipster/JpaFilteringRelationship.json | 75 +++++++ test-integration/samples/.jhipster/Label.json | 21 ++ .../.jhipster/MapsIdChildEntityWithDTO.json | 31 +++ .../MapsIdChildEntityWithoutDTO.json | 31 +++ .../MapsIdGrandchildEntityWithDTO.json | 24 ++ .../MapsIdGrandchildEntityWithoutDTO.json | 24 ++ .../.jhipster/MapsIdParentEntityWithDTO.json | 22 ++ .../MapsIdParentEntityWithoutDTO.json | 22 ++ .../.jhipster/MapsIdUserProfileWithDTO.json | 24 ++ .../.jhipster/MicroserviceBankAccount.json | 30 +++ .../samples/.jhipster/MicroserviceLabel.json | 20 ++ .../.jhipster/MicroserviceOperation.json | 29 +++ .../samples/.jhipster/Operation.json | 30 +++ test-integration/samples/.jhipster/Place.json | 34 +++ .../.jhipster/SuperMegaLargeTestEntity.json | 60 +++++ .../.jhipster/TestCustomTableName.json | 61 ++++++ .../samples/.jhipster/TestEntity.json | 60 +++++ .../samples/.jhipster/TestInfiniteScroll.json | 46 ++++ .../.jhipster/TestManyRelPaginDTO.json | 52 +++++ .../samples/.jhipster/TestManyToMany.json | 67 ++++++ .../samples/.jhipster/TestManyToOne.json | 60 +++++ .../samples/.jhipster/TestMapstruct.json | 65 ++++++ .../samples/.jhipster/TestOneToOne.json | 67 ++++++ .../samples/.jhipster/TestPagination.json | 46 ++++ .../samples/.jhipster/TestServiceClass.json | 47 ++++ .../samples/.jhipster/TestServiceImpl.json | 47 ++++ .../TestTwoRelationshipsSameEntity.json | 44 ++++ test-integration/samples/.jhipster/Track.json | 24 ++ .../samples/app-sample-dev/.yo-rc.json | 30 +++ test-integration/samples/jdl-default/app.jdl | 186 ++++++++++++++++ .../samples/jdl-entities/custom-domain.jdl | 22 ++ .../samples/jdl-entities/custom-id.jdl | 206 ++++++++++++++++++ .../samples/jdl-entities/entities.jdl | 11 + .../user-relationships/entities.jdl | 36 +++ .../samples/ms-micro-consul/.yo-rc.json | 31 +++ .../ms-micro-eureka-infinispan/.yo-rc.json | 35 +++ .../samples/ms-micro-eureka-jwt/.yo-rc.json | 35 +++ .../samples/ms-micro-eureka/.yo-rc.json | 31 +++ .../samples/ms-ngx-gateway-consul/.yo-rc.json | 30 +++ .../ms-ngx-gateway-eureka-jwt/.yo-rc.json | 36 +++ .../ms-ngx-gateway-eureka-oauth2/.yo-rc.json | 36 +++ .../samples/ms-ngx-gateway-eureka/.yo-rc.json | 36 +++ .../ms-react-gateway-consul-jwt/.yo-rc.json | 36 +++ .../.yo-rc.json | 36 +++ .../samples/ngx-couchbase/.yo-rc.json | 30 +++ .../samples/ngx-default/.yo-rc.json | 83 +++++++ .../ngx-gradle-couchbase-search/.yo-rc.json | 30 +++ .../samples/ngx-gradle-fr/.yo-rc.json | 35 +++ .../ngx-gradle-h2disk-ws-nocache/.yo-rc.json | 38 ++++ .../.yo-rc.json | 32 +++ .../.yo-rc.json | 36 +++ .../.yo-rc.json | 34 +++ .../samples/ngx-h2mem-ws-nol2/.yo-rc.json | 36 +++ .../ngx-mariadb-oauth2-infinispan/.yo-rc.json | 32 +++ .../.yo-rc.json | 27 +++ .../ngx-mongodb-kafka-cucumber/.yo-rc.json | 35 +++ .../ngx-mysql-es-noi18n-mapsid/.yo-rc.json | 34 +++ .../samples/ngx-neo4j/.yo-rc.json | 30 +++ .../ngx-session-cassandra-fr/.yo-rc.json | 29 +++ .../samples/react-default/.yo-rc.json | 82 +++++++ .../.yo-rc.json | 37 ++++ .../.yo-rc.json | 37 ++++ .../react-gradle-h2mem-memcached/.yo-rc.json | 38 ++++ .../.yo-rc.json | 35 +++ .../.yo-rc.json | 37 ++++ .../.yo-rc.json | 37 ++++ .../react-maven-h2mem-memcached/.yo-rc.json | 38 ++++ .../.yo-rc.json | 35 +++ .../.yo-rc.json | 27 +++ .../samples/vue-couchbase/.yo-rc.json | 43 ++++ .../samples/vue-default/.yo-rc.json | 43 ++++ .../samples/vue-fulli18n-es/.yo-rc.json | 91 ++++++++ .../samples/vue-gateway/.yo-rc.json | 43 ++++ .../samples/vue-gradle-ws-session/.yo-rc.json | 44 ++++ .../vue-mongodb-kafka-cucumber/.yo-rc.json | 44 ++++ .../samples/vue-noi18n-ws-oauth2/.yo-rc.json | 44 ++++ .../samples/vue-oauth2/.yo-rc.json | 43 ++++ .../vue-session-cassandra-fr/.yo-rc.json | 44 ++++ .../samples/vue-ws-theme/.yo-rc.json | 44 ++++ .../webflux-couchbase-es-oauth2/.yo-rc.json | 36 +++ .../webflux-couchbase-session/.yo-rc.json | 28 +++ .../samples/webflux-couchbase/.yo-rc.json | 28 +++ .../samples/webflux-gateway-jwt/.yo-rc.json | 27 +++ .../webflux-gateway-oauth2/.yo-rc.json | 29 +++ .../.yo-rc.json | 54 ++--- .../webflux-mongodb-es-session/.yo-rc.json | 28 +++ .../webflux-mongodb-oauth2/.yo-rc.json | 36 +++ .../samples/webflux-mongodb/.yo-rc.json | 28 +++ .../samples/webflux-mysql-kafka/.yo-rc.json | 30 +++ .../samples/webflux-nodb-oauth2/.yo-rc.json | 30 +++ .../samples/webflux-psql/.yo-rc.json | 29 +++ .../samples/webflux-react/.yo-rc.json | 28 +++ 116 files changed, 4736 insertions(+), 27 deletions(-) create mode 100644 test-integration/samples/.gitignore create mode 100644 test-integration/samples/.jhipster/Album.json create mode 100644 test-integration/samples/.jhipster/Artist.json create mode 100644 test-integration/samples/.jhipster/BankAccount.json create mode 100644 test-integration/samples/.jhipster/CassBankAccount.json create mode 100644 test-integration/samples/.jhipster/Division.json create mode 100644 test-integration/samples/.jhipster/DocumentBankAccount.json create mode 100644 test-integration/samples/.jhipster/EmbeddedOperation.json create mode 100644 test-integration/samples/.jhipster/EntityWithDTO.json create mode 100644 test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json create mode 100644 test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json create mode 100644 test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json create mode 100644 test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json create mode 100644 test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json create mode 100644 test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json create mode 100644 test-integration/samples/.jhipster/FieldTestEntity.json create mode 100644 test-integration/samples/.jhipster/FieldTestEnumWithValue.json create mode 100644 test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json create mode 100644 test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json create mode 100644 test-integration/samples/.jhipster/FieldTestPaginationEntity.json create mode 100644 test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json create mode 100644 test-integration/samples/.jhipster/FieldTestServiceImplEntity.json create mode 100644 test-integration/samples/.jhipster/Genre.json create mode 100644 test-integration/samples/.jhipster/JpaFilteringOtherSide.json create mode 100644 test-integration/samples/.jhipster/JpaFilteringRelationship.json create mode 100644 test-integration/samples/.jhipster/Label.json create mode 100644 test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json create mode 100644 test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json create mode 100644 test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json create mode 100644 test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json create mode 100644 test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json create mode 100644 test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json create mode 100644 test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json create mode 100644 test-integration/samples/.jhipster/MicroserviceBankAccount.json create mode 100644 test-integration/samples/.jhipster/MicroserviceLabel.json create mode 100644 test-integration/samples/.jhipster/MicroserviceOperation.json create mode 100644 test-integration/samples/.jhipster/Operation.json create mode 100644 test-integration/samples/.jhipster/Place.json create mode 100644 test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json create mode 100644 test-integration/samples/.jhipster/TestCustomTableName.json create mode 100644 test-integration/samples/.jhipster/TestEntity.json create mode 100644 test-integration/samples/.jhipster/TestInfiniteScroll.json create mode 100644 test-integration/samples/.jhipster/TestManyRelPaginDTO.json create mode 100644 test-integration/samples/.jhipster/TestManyToMany.json create mode 100644 test-integration/samples/.jhipster/TestManyToOne.json create mode 100644 test-integration/samples/.jhipster/TestMapstruct.json create mode 100644 test-integration/samples/.jhipster/TestOneToOne.json create mode 100644 test-integration/samples/.jhipster/TestPagination.json create mode 100644 test-integration/samples/.jhipster/TestServiceClass.json create mode 100644 test-integration/samples/.jhipster/TestServiceImpl.json create mode 100644 test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json create mode 100644 test-integration/samples/.jhipster/Track.json create mode 100644 test-integration/samples/app-sample-dev/.yo-rc.json create mode 100644 test-integration/samples/jdl-default/app.jdl create mode 100644 test-integration/samples/jdl-entities/custom-domain.jdl create mode 100644 test-integration/samples/jdl-entities/custom-id.jdl create mode 100644 test-integration/samples/jdl-entities/entities.jdl create mode 100644 test-integration/samples/jdl-entities/user-relationships/entities.jdl create mode 100644 test-integration/samples/ms-micro-consul/.yo-rc.json create mode 100644 test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json create mode 100644 test-integration/samples/ms-micro-eureka-jwt/.yo-rc.json create mode 100644 test-integration/samples/ms-micro-eureka/.yo-rc.json create mode 100644 test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json create mode 100644 test-integration/samples/ms-ngx-gateway-eureka-jwt/.yo-rc.json create mode 100644 test-integration/samples/ms-ngx-gateway-eureka-oauth2/.yo-rc.json create mode 100644 test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json create mode 100644 test-integration/samples/ms-react-gateway-consul-jwt/.yo-rc.json create mode 100644 test-integration/samples/ms-react-gateway-consul-oauth2/.yo-rc.json create mode 100644 test-integration/samples/ngx-couchbase/.yo-rc.json create mode 100644 test-integration/samples/ngx-default/.yo-rc.json create mode 100644 test-integration/samples/ngx-gradle-couchbase-search/.yo-rc.json create mode 100644 test-integration/samples/ngx-gradle-fr/.yo-rc.json create mode 100644 test-integration/samples/ngx-gradle-h2disk-ws-nocache/.yo-rc.json create mode 100644 test-integration/samples/ngx-gradle-mariadb-oauth2-infinispan/.yo-rc.json create mode 100644 test-integration/samples/ngx-gradle-mongodb-kafka-cucumber/.yo-rc.json create mode 100644 test-integration/samples/ngx-gradle-mysql-es-noi18n-mapsid/.yo-rc.json create mode 100644 test-integration/samples/ngx-h2mem-ws-nol2/.yo-rc.json create mode 100644 test-integration/samples/ngx-mariadb-oauth2-infinispan/.yo-rc.json create mode 100644 test-integration/samples/ngx-mariadb-oauth2-sass-infinispan/.yo-rc.json create mode 100644 test-integration/samples/ngx-mongodb-kafka-cucumber/.yo-rc.json create mode 100644 test-integration/samples/ngx-mysql-es-noi18n-mapsid/.yo-rc.json create mode 100644 test-integration/samples/ngx-neo4j/.yo-rc.json create mode 100644 test-integration/samples/ngx-session-cassandra-fr/.yo-rc.json create mode 100644 test-integration/samples/react-default/.yo-rc.json create mode 100644 test-integration/samples/react-gradle-cassandra-session-redis/.yo-rc.json create mode 100644 test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json create mode 100644 test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json create mode 100644 test-integration/samples/react-gradle-mysql-es-noi18n-mapsid/.yo-rc.json create mode 100644 test-integration/samples/react-maven-cassandra-session-redis/.yo-rc.json create mode 100644 test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json create mode 100644 test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json create mode 100644 test-integration/samples/react-maven-mysql-es-noi18n-mapsid/.yo-rc.json create mode 100644 test-integration/samples/react-noi18n-es-ws-gradle-session/.yo-rc.json create mode 100644 test-integration/samples/vue-couchbase/.yo-rc.json create mode 100644 test-integration/samples/vue-default/.yo-rc.json create mode 100644 test-integration/samples/vue-fulli18n-es/.yo-rc.json create mode 100644 test-integration/samples/vue-gateway/.yo-rc.json create mode 100644 test-integration/samples/vue-gradle-ws-session/.yo-rc.json create mode 100644 test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json create mode 100644 test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json create mode 100644 test-integration/samples/vue-oauth2/.yo-rc.json create mode 100644 test-integration/samples/vue-session-cassandra-fr/.yo-rc.json create mode 100644 test-integration/samples/vue-ws-theme/.yo-rc.json create mode 100644 test-integration/samples/webflux-couchbase-es-oauth2/.yo-rc.json create mode 100644 test-integration/samples/webflux-couchbase-session/.yo-rc.json create mode 100644 test-integration/samples/webflux-couchbase/.yo-rc.json create mode 100644 test-integration/samples/webflux-gateway-jwt/.yo-rc.json create mode 100644 test-integration/samples/webflux-gateway-oauth2/.yo-rc.json create mode 100644 test-integration/samples/webflux-mongodb-es-session/.yo-rc.json create mode 100644 test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json create mode 100644 test-integration/samples/webflux-mongodb/.yo-rc.json create mode 100644 test-integration/samples/webflux-mysql-kafka/.yo-rc.json create mode 100644 test-integration/samples/webflux-nodb-oauth2/.yo-rc.json create mode 100644 test-integration/samples/webflux-psql/.yo-rc.json create mode 100644 test-integration/samples/webflux-react/.yo-rc.json diff --git a/test-integration/samples/.gitignore b/test-integration/samples/.gitignore new file mode 100644 index 000000000..8de7aca8c --- /dev/null +++ b/test-integration/samples/.gitignore @@ -0,0 +1,5 @@ +*/* +!*/.yo-rc.json +!*/*.jdl +!.jhipster/* +*-sample/.yo-rc.json diff --git a/test-integration/samples/.jhipster/Album.json b/test-integration/samples/.jhipster/Album.json new file mode 100644 index 000000000..1d2fef46d --- /dev/null +++ b/test-integration/samples/.jhipster/Album.json @@ -0,0 +1,34 @@ +{ + "applications": "*", + "changelogDate": "20200417191023", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "album", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Album", + "pagination": "no", + "readOnly": false, + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "artist", + "otherEntityRelationshipName": "album", + "ownerSide": true, + "relationshipName": "artist", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "name", + "otherEntityName": "genre", + "otherEntityRelationshipName": "album", + "ownerSide": true, + "relationshipName": "genre", + "relationshipType": "one-to-one" + }, + { "otherEntityName": "track", "otherEntityRelationshipName": "album", "relationshipName": "track", "relationshipType": "one-to-many" } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/Artist.json b/test-integration/samples/.jhipster/Artist.json new file mode 100644 index 000000000..ee7bf1f6d --- /dev/null +++ b/test-integration/samples/.jhipster/Artist.json @@ -0,0 +1,16 @@ +{ + "applications": "*", + "changelogDate": "20200417190723", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "artist", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Artist", + "pagination": "no", + "readOnly": false, + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/BankAccount.json b/test-integration/samples/.jhipster/BankAccount.json new file mode 100644 index 000000000..3ceca5f14 --- /dev/null +++ b/test-integration/samples/.jhipster/BankAccount.json @@ -0,0 +1,35 @@ +{ + "angularJSSuffix": "mySuffix", + "changelogDate": "20200804163352", + "clientRootFolder": "test-root", + "dto": "no", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "guid", "fieldType": "UUID" }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "meanQueueDuration", "fieldType": "Duration" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "openingDay", "fieldType": "LocalDate" }, + { "fieldName": "lastOperationDate", "fieldType": "Instant" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, + { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "user", "relationshipType": "many-to-one" }, + { + "otherEntityName": "operation", + "otherEntityRelationshipName": "bankAccount", + "relationshipName": "operation", + "relationshipType": "one-to-many" + } + ], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/CassBankAccount.json b/test-integration/samples/.jhipster/CassBankAccount.json new file mode 100644 index 000000000..933c77e4f --- /dev/null +++ b/test-integration/samples/.jhipster/CassBankAccount.json @@ -0,0 +1,22 @@ +{ + "angularJSSuffix": "mySuffix", + "changelogDate": "20150805124839", + "dto": "mapstruct", + "fields": [ + { "fieldName": "userId", "fieldType": "UUID" }, + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "lastOperationDate", "fieldType": "Date" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "picture", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { "fieldName": "operationsFile", "fieldType": "byte[]" }, + { "fieldName": "accountType", "fieldType": "AccountTypeEnum", "fieldValues": "STANDARD,PREMIUM" } + ], + "fluentMethods": true, + "pagination": "no", + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/Division.json b/test-integration/samples/.jhipster/Division.json new file mode 100644 index 000000000..d0d5ca3d6 --- /dev/null +++ b/test-integration/samples/.jhipster/Division.json @@ -0,0 +1,37 @@ +{ + "changelogDate": "20170626061520", + "clientRootFolder": "test-root", + "dto": "no", + "entityTableName": "division", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required", "unique"] }, + { "fieldName": "shortName", "fieldType": "String", "fieldValidateRules": ["unique"] }, + { "fieldName": "numberOfPeople", "fieldType": "Long" }, + { + "fieldName": "divisionType", + "fieldType": "DivisionType", + "fieldValidateRules": ["required"], + "fieldValues": "SCHOOL,CLASS,SUBGROUP" + }, + { "fieldName": "colorBackground", "fieldType": "String" }, + { "fieldName": "colorText", "fieldType": "String" } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "place", + "otherEntityRelationshipName": "owner", + "relationshipName": "divisionsPlace", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "place", + "otherEntityRelationshipName": "preferredDivision", + "ownerSide": false, + "relationshipName": "preferredPlace", + "relationshipType": "many-to-many" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/DocumentBankAccount.json b/test-integration/samples/.jhipster/DocumentBankAccount.json new file mode 100644 index 000000000..64d4aa7ae --- /dev/null +++ b/test-integration/samples/.jhipster/DocumentBankAccount.json @@ -0,0 +1,29 @@ +{ + "changelogDate": "20150805124838", + "dto": "mapstruct", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "openingDay", "fieldType": "LocalDate" }, + { "fieldName": "lastOperationDate", "fieldType": "Instant" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, + { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "embeddedOperation", + "otherEntityRelationshipName": "documentBankAccount", + "relationshipName": "embeddedOperation", + "relationshipType": "one-to-many" + } + ], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/EmbeddedOperation.json b/test-integration/samples/.jhipster/EmbeddedOperation.json new file mode 100644 index 000000000..c1943ec3d --- /dev/null +++ b/test-integration/samples/.jhipster/EmbeddedOperation.json @@ -0,0 +1,23 @@ +{ + "changelogDate": "20200804163351", + "clientRootFolder": "test-root", + "dto": "mapstruct", + "embedded": true, + "fields": [ + { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "description", "fieldType": "String" }, + { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "documentBankAccount", + "otherEntityRelationshipName": "embeddedOperation", + "relationshipName": "documentBankAccount", + "relationshipType": "many-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/EntityWithDTO.json b/test-integration/samples/.jhipster/EntityWithDTO.json new file mode 100644 index 000000000..224898865 --- /dev/null +++ b/test-integration/samples/.jhipster/EntityWithDTO.json @@ -0,0 +1,10 @@ +{ + "changelogDate": "20160806123735", + "dto": "mapstruct", + "entityTableName": "entity_with_dto", + "fields": [{ "fieldName": "emma", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json b/test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json new file mode 100644 index 000000000..8bb38bd78 --- /dev/null +++ b/test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json @@ -0,0 +1,10 @@ +{ + "changelogDate": "20160806123743", + "dto": "mapstruct", + "entityTableName": "entity_with_pagination_and_dto", + "fields": [{ "fieldName": "lea", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json b/test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json new file mode 100644 index 000000000..44fcb32be --- /dev/null +++ b/test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json @@ -0,0 +1,10 @@ +{ + "changelogDate": "20160806123739", + "dto": "no", + "entityTableName": "entity_with_service_class_and_pagination", + "fields": [{ "fieldName": "enzo", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceClass" +} diff --git a/test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json b/test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json new file mode 100644 index 000000000..621633396 --- /dev/null +++ b/test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json @@ -0,0 +1,10 @@ +{ + "changelogDate": "20160806123744", + "dto": "mapstruct", + "entityTableName": "entity_with_service_class_pagination_and_dto", + "fields": [{ "fieldName": "lena", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceClass" +} diff --git a/test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json b/test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json new file mode 100644 index 000000000..15cc2404a --- /dev/null +++ b/test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json @@ -0,0 +1,10 @@ +{ + "changelogDate": "20160806123742", + "dto": "mapstruct", + "entityTableName": "entity_with_service_impl_and_dto", + "fields": [{ "fieldName": "louis", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json b/test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json new file mode 100644 index 000000000..9995b7fda --- /dev/null +++ b/test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json @@ -0,0 +1,10 @@ +{ + "changelogDate": "20160806123740", + "dto": "no", + "entityTableName": "entity_with_service_impl_and_pagination", + "fields": [{ "fieldName": "hugo", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json b/test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json new file mode 100644 index 000000000..26b053747 --- /dev/null +++ b/test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json @@ -0,0 +1,10 @@ +{ + "changelogDate": "20160806123845", + "dto": "mapstruct", + "entityTableName": "entity_with_service_impl_pagination_and_dto", + "fields": [{ "fieldName": "theo", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/FieldTestEntity.json b/test-integration/samples/.jhipster/FieldTestEntity.json new file mode 100644 index 000000000..1c80d6f6d --- /dev/null +++ b/test-integration/samples/.jhipster/FieldTestEntity.json @@ -0,0 +1,104 @@ +{ + "changelogDate": "20160208184035", + "dto": "no", + "fields": [ + { "fieldName": "stringTom", "fieldType": "String" }, + { "fieldName": "stringRequiredTom", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthTom", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { "fieldName": "stringMaxlengthTom", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, + { + "fieldName": "stringPatternTom", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { + "fieldName": "numberPatternTom", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^\\d+$" + }, + { + "fieldName": "numberPatternRequiredTom", + "fieldType": "String", + "fieldValidateRules": ["pattern", "required"], + "fieldValidateRulesPattern": "^\\d+$" + }, + { "fieldName": "integerTom", "fieldType": "Integer" }, + { "fieldName": "integerRequiredTom", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinTom", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxTom", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longTom", "fieldType": "Long" }, + { "fieldName": "longRequiredTom", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinTom", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxTom", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatTom", "fieldType": "Float" }, + { "fieldName": "floatRequiredTom", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinTom", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxTom", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredTom", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinTom", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxTom", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredTom", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinTom", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxTom", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateTom", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredTom", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantTom", "fieldType": "Instant" }, + { "fieldName": "instantRequiredTom", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeTom", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredTom", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationTom", "fieldType": "Duration" }, + { "fieldName": "durationRequiredTom", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanTom", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredTom", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumTom", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredTom", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidTom", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredTom", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageTom", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyTom", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextTom", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/FieldTestEnumWithValue.json b/test-integration/samples/.jhipster/FieldTestEnumWithValue.json new file mode 100644 index 000000000..904a73e71 --- /dev/null +++ b/test-integration/samples/.jhipster/FieldTestEnumWithValue.json @@ -0,0 +1,20 @@ +{ + "applications": "*", + "changelogDate": "20200415193919", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "entity_with_enums", + "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)" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "FieldTestEnumWithValue", + "pagination": "no", + "readOnly": false, + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json b/test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json new file mode 100644 index 000000000..feb0c19b5 --- /dev/null +++ b/test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json @@ -0,0 +1,92 @@ +{ + "changelogDate": "20160208184036", + "dto": "no", + "fields": [ + { "fieldName": "stringHugo", "fieldType": "String" }, + { "fieldName": "stringRequiredHugo", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthHugo", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { "fieldName": "stringMaxlengthHugo", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, + { + "fieldName": "stringPatternHugo", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerHugo", "fieldType": "Integer" }, + { "fieldName": "integerRequiredHugo", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinHugo", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxHugo", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longHugo", "fieldType": "Long" }, + { "fieldName": "longRequiredHugo", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinHugo", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxHugo", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatHugo", "fieldType": "Float" }, + { "fieldName": "floatRequiredHugo", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinHugo", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxHugo", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredHugo", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinHugo", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxHugo", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateHugo", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredHugo", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantHugo", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredHugo", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeHugo", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredHugo", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationHugo", "fieldType": "Duration" }, + { "fieldName": "durationRequiredHugo", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanHugo", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredHugo", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumHugo", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredHugo", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidHugo", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredHugo", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json b/test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json new file mode 100644 index 000000000..4ba349669 --- /dev/null +++ b/test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json @@ -0,0 +1,92 @@ +{ + "changelogDate": "20160208184037", + "dto": "mapstruct", + "fields": [ + { "fieldName": "stringEva", "fieldType": "String" }, + { "fieldName": "stringRequiredEva", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthEva", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { "fieldName": "stringMaxlengthEva", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, + { + "fieldName": "stringPatternEva", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerEva", "fieldType": "Integer" }, + { "fieldName": "integerRequiredEva", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinEva", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxEva", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longEva", "fieldType": "Long" }, + { "fieldName": "longRequiredEva", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinEva", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxEva", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatEva", "fieldType": "Float" }, + { "fieldName": "floatRequiredEva", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinEva", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxEva", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredEva", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinEva", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxEva", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredEva", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinEva", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxEva", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateEva", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredEva", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantEva", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredEva", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeEva", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredEva", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationEva", "fieldType": "Duration" }, + { "fieldName": "durationRequiredEva", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanEva", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredEva", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumEva", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredEva", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidEva", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredEva", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageEva", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyEva", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextEva", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "serviceClass" +} diff --git a/test-integration/samples/.jhipster/FieldTestPaginationEntity.json b/test-integration/samples/.jhipster/FieldTestPaginationEntity.json new file mode 100644 index 000000000..5c0ef2b05 --- /dev/null +++ b/test-integration/samples/.jhipster/FieldTestPaginationEntity.json @@ -0,0 +1,92 @@ +{ + "changelogDate": "20160208184038", + "dto": "no", + "fields": [ + { "fieldName": "stringAlice", "fieldType": "String" }, + { "fieldName": "stringRequiredAlice", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthAlice", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { "fieldName": "stringMaxlengthAlice", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, + { + "fieldName": "stringPatternAlice", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerAlice", "fieldType": "Integer" }, + { "fieldName": "integerRequiredAlice", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinAlice", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxAlice", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longAlice", "fieldType": "Long" }, + { "fieldName": "longRequiredAlice", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinAlice", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxAlice", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatAlice", "fieldType": "Float" }, + { "fieldName": "floatRequiredAlice", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinAlice", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxAlice", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredAlice", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinAlice", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxAlice", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateAlice", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredAlice", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantAlice", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredAlice", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeAlice", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredAlice", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationAlice", "fieldType": "Duration" }, + { "fieldName": "durationRequiredAlice", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanAlice", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredAlice", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumAlice", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredAlice", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidAlice", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredAlice", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json b/test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json new file mode 100644 index 000000000..291229c52 --- /dev/null +++ b/test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json @@ -0,0 +1,93 @@ +{ + "changelogDate": "20160208184039", + "dto": "no", + "fields": [ + { "fieldName": "stringBob", "fieldType": "String" }, + { "fieldName": "stringRequiredBob", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthBob", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { "fieldName": "stringMaxlengthBob", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, + { + "fieldName": "stringPatternBob", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerBob", "fieldType": "Integer" }, + { "fieldName": "integerRequiredBob", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinBob", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxBob", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longBob", "fieldType": "Long" }, + { "fieldName": "longRequiredBob", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinBob", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxBob", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatBob", "fieldType": "Float" }, + { "fieldName": "floatRequiredBob", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinBob", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxBob", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredBob", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinBob", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxBob", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredBob", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinBob", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxBob", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateBob", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredBob", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantBob", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredBob", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeBob", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredBob", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationBob", "fieldType": "Duration" }, + { "fieldName": "durationRequiredBob", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanBob", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredBob", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumBob", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredBob", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidBob", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredBob", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageBob", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyBob", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextBob", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [], + "service": "serviceClass" +} diff --git a/test-integration/samples/.jhipster/FieldTestServiceImplEntity.json b/test-integration/samples/.jhipster/FieldTestServiceImplEntity.json new file mode 100644 index 000000000..8680b5427 --- /dev/null +++ b/test-integration/samples/.jhipster/FieldTestServiceImplEntity.json @@ -0,0 +1,92 @@ +{ + "changelogDate": "20160208184040", + "dto": "no", + "fields": [ + { "fieldName": "stringMika", "fieldType": "String" }, + { "fieldName": "stringRequiredMika", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthMika", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { "fieldName": "stringMaxlengthMika", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, + { + "fieldName": "stringPatternMika", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerMika", "fieldType": "Integer" }, + { "fieldName": "integerRequiredMika", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinMika", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxMika", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longMika", "fieldType": "Long" }, + { "fieldName": "longRequiredMika", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinMika", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxMika", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatMika", "fieldType": "Float" }, + { "fieldName": "floatRequiredMika", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinMika", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxMika", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredMika", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinMika", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxMika", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredMika", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinMika", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxMika", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateMika", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredMika", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantMika", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredMika", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeMika", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredMika", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationMika", "fieldType": "Duration" }, + { "fieldName": "durationRequiredMika", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanMika", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredMika", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumMika", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredMika", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidMika", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredMika", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageMika", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyMika", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextMika", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/Genre.json b/test-integration/samples/.jhipster/Genre.json new file mode 100644 index 000000000..5bf784bea --- /dev/null +++ b/test-integration/samples/.jhipster/Genre.json @@ -0,0 +1,16 @@ +{ + "applications": "*", + "changelogDate": "20200417190823", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "genre", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Genre", + "pagination": "no", + "readOnly": false, + "relationships": [], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/JpaFilteringOtherSide.json b/test-integration/samples/.jhipster/JpaFilteringOtherSide.json new file mode 100644 index 000000000..460a3df75 --- /dev/null +++ b/test-integration/samples/.jhipster/JpaFilteringOtherSide.json @@ -0,0 +1,57 @@ +{ + "applications": ["jhipster"], + "changelogDate": "20200820222459", + "dto": "mapstruct", + "embedded": false, + "entityTableName": "jpa_filtering_other_side", + "fields": [ + { "fieldName": "createdBy", "fieldType": "String" }, + { "fieldName": "createdOn", "fieldType": "Instant" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "name": "JpaFilteringOtherSide", + "pagination": "pagination", + "readOnly": false, + "relationships": [ + { + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "requiredOneToOne", + "ownerSide": false, + "relationshipName": "requiredOneToOneOtherSide", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "oneToOne", + "ownerSide": false, + "relationshipName": "oneToOneOtherSide", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "oneToMany", + "relationshipName": "oneToManyOtherSide", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "requiredManyToMany", + "ownerSide": false, + "relationshipName": "requiredManyToManyOtherSide", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "manyToMany", + "ownerSide": false, + "relationshipName": "manyToManyOtherSide", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass", + "skipUiGrouping": false +} diff --git a/test-integration/samples/.jhipster/JpaFilteringRelationship.json b/test-integration/samples/.jhipster/JpaFilteringRelationship.json new file mode 100644 index 000000000..36b3c4aa2 --- /dev/null +++ b/test-integration/samples/.jhipster/JpaFilteringRelationship.json @@ -0,0 +1,75 @@ +{ + "applications": ["jhipster"], + "changelogDate": "20200820222306", + "dto": "mapstruct", + "embedded": false, + "entityTableName": "jpa_filtering_relationship", + "fields": [ + { "fieldName": "createdBy", "fieldType": "String" }, + { "fieldName": "createdOn", "fieldType": "Instant" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "name": "JpaFilteringRelationship", + "pagination": "pagination", + "readOnly": false, + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "requiredOneToOneOtherSide", + "ownerSide": true, + "relationshipName": "requiredOneToOne", + "relationshipType": "one-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "oneToOneOtherSide", + "ownerSide": true, + "relationshipName": "oneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "oneToManyOtherSide", + "relationshipName": "oneToMany", + "relationshipType": "one-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "jpaFilteringRelationship", + "relationshipName": "requiredManyToOne", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "jpaFilteringRelationship", + "relationshipName": "manyToOne", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "requiredManyToManyOtherSide", + "ownerSide": true, + "relationshipName": "requiredManyToMany", + "relationshipType": "many-to-many", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "manyToManyOtherSide", + "ownerSide": true, + "relationshipName": "manyToMany", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass", + "skipUiGrouping": false +} diff --git a/test-integration/samples/.jhipster/Label.json b/test-integration/samples/.jhipster/Label.json new file mode 100644 index 000000000..e3676faff --- /dev/null +++ b/test-integration/samples/.jhipster/Label.json @@ -0,0 +1,21 @@ +{ + "changelogDate": "20200804163353", + "clientRootFolder": "test-root", + "dto": "no", + "fields": [ + { "fieldName": "labelName", "fieldType": "String", "fieldValidateRules": ["required", "minlength"], "fieldValidateRulesMinlength": "3" } + ], + "fluentMethods": true, + "pagination": "pagination", + "readOnly": true, + "relationships": [ + { + "otherEntityName": "operation", + "otherEntityRelationshipName": "label", + "ownerSide": false, + "relationshipName": "operation", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass" +} diff --git a/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json new file mode 100644 index 000000000..6232067b3 --- /dev/null +++ b/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json @@ -0,0 +1,31 @@ +{ + "changelogDate": "20190117075155", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_child_with_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdParentEntityWithDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithDTO", + "ownerSide": true, + "relationshipName": "mapsIdParentEntityWithDTO", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "mapsIdGrandchildEntityWithDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithDTO", + "ownerSide": false, + "relationshipName": "mapsIdGrandchildEntityWithDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json new file mode 100644 index 000000000..3a784c321 --- /dev/null +++ b/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json @@ -0,0 +1,31 @@ +{ + "changelogDate": "20190117074746", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "no", + "entityTableName": "maps_id_child_wo_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdParentEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithoutDTO", + "ownerSide": true, + "relationshipName": "mapsIdParentEntityWithoutDTO", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "mapsIdGrandchildEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithoutDTO", + "ownerSide": false, + "relationshipName": "mapsIdGrandchildEntityWithoutDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "no" +} diff --git a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json new file mode 100644 index 000000000..166a575a2 --- /dev/null +++ b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json @@ -0,0 +1,24 @@ +{ + "changelogDate": "20220313234025", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_grandchild_with_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdChildEntityWithDTO", + "otherEntityRelationshipName": "mapsIdGrandchildEntityWithDTO", + "ownerSide": true, + "relationshipName": "mapsIdChildEntityWithDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json new file mode 100644 index 000000000..44b372c14 --- /dev/null +++ b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json @@ -0,0 +1,24 @@ +{ + "changelogDate": "20220313234416", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "no", + "entityTableName": "maps_id_grandchild_wo_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdChildEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdGrandchildEntityWithoutDTO", + "ownerSide": true, + "relationshipName": "mapsIdChildEntityWithoutDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "no" +} diff --git a/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json new file mode 100644 index 000000000..d56f201a3 --- /dev/null +++ b/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json @@ -0,0 +1,22 @@ +{ + "changelogDate": "20190117075042", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_parent_with_dto", + "fields": [{ "fieldName": "name", "fieldType": "String" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "mapsIdChildEntityWithDTO", + "otherEntityRelationshipName": "mapsIdParentEntityWithDTO", + "ownerSide": false, + "relationshipName": "mapsIdChildEntityWithDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json new file mode 100644 index 000000000..78c400ec6 --- /dev/null +++ b/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json @@ -0,0 +1,22 @@ +{ + "changelogDate": "20190117074315", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "no", + "entityTableName": "maps_id_parent_wo_dto", + "fields": [{ "fieldName": "name", "fieldType": "String" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "mapsIdChildEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdParentEntityWithoutDTO", + "ownerSide": false, + "relationshipName": "mapsIdChildEntityWithoutDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "no" +} diff --git a/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json b/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json new file mode 100644 index 000000000..2c26d97dd --- /dev/null +++ b/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json @@ -0,0 +1,24 @@ +{ + "changelogDate": "20190117080030", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_user_profile_with_dto", + "fields": [{ "fieldName": "dateOfBirth", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "mapsIdUserProfileWithDTO", + "ownerSide": true, + "relationshipName": "user", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/MicroserviceBankAccount.json b/test-integration/samples/.jhipster/MicroserviceBankAccount.json new file mode 100644 index 000000000..033940e17 --- /dev/null +++ b/test-integration/samples/.jhipster/MicroserviceBankAccount.json @@ -0,0 +1,30 @@ +{ + "changelogDate": "20200804163350", + "dto": "mapstruct", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "openingDay", "fieldType": "LocalDate" }, + { "fieldName": "lastOperationDate", "fieldType": "Instant" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, + { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "microserviceOperation", + "otherEntityRelationshipName": "bankAccount", + "relationshipName": "operation", + "relationshipType": "one-to-many" + } + ], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/MicroserviceLabel.json b/test-integration/samples/.jhipster/MicroserviceLabel.json new file mode 100644 index 000000000..df16953ed --- /dev/null +++ b/test-integration/samples/.jhipster/MicroserviceLabel.json @@ -0,0 +1,20 @@ +{ + "changelogDate": "20150805124936", + "dto": "no", + "fields": [ + { "fieldName": "label", "fieldType": "String", "fieldValidateRules": ["required", "minlength"], "fieldValidateRulesMinlength": "3" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityName": "microserviceOperation", + "otherEntityRelationshipName": "label", + "ownerSide": false, + "relationshipName": "operation", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass" +} diff --git a/test-integration/samples/.jhipster/MicroserviceOperation.json b/test-integration/samples/.jhipster/MicroserviceOperation.json new file mode 100644 index 000000000..09795915c --- /dev/null +++ b/test-integration/samples/.jhipster/MicroserviceOperation.json @@ -0,0 +1,29 @@ +{ + "changelogDate": "20150805125054", + "dto": "no", + "fields": [ + { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "description", "fieldType": "String" }, + { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "microserviceBankAccount", + "otherEntityRelationshipName": "operation", + "relationshipName": "bankAccount", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "label", + "otherEntityName": "microserviceLabel", + "otherEntityRelationshipName": "operation", + "ownerSide": true, + "relationshipName": "label", + "relationshipType": "many-to-many" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/Operation.json b/test-integration/samples/.jhipster/Operation.json new file mode 100644 index 000000000..32477fab3 --- /dev/null +++ b/test-integration/samples/.jhipster/Operation.json @@ -0,0 +1,30 @@ +{ + "changelogDate": "20150805125055", + "clientRootFolder": "test-root", + "dto": "no", + "fields": [ + { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "description", "fieldType": "String" }, + { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "bankAccount", + "otherEntityRelationshipName": "operation", + "relationshipName": "bankAccount", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "labelName", + "otherEntityName": "label", + "otherEntityRelationshipName": "operation", + "ownerSide": true, + "relationshipName": "label", + "relationshipType": "many-to-many" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/Place.json b/test-integration/samples/.jhipster/Place.json new file mode 100644 index 000000000..49d86d32f --- /dev/null +++ b/test-integration/samples/.jhipster/Place.json @@ -0,0 +1,34 @@ +{ + "changelogDate": "20170626061521", + "clientRootFolder": "test-root", + "dto": "no", + "entityTableName": "place", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "numberOfSeats", "fieldType": "Long" }, + { "fieldName": "shortName", "fieldType": "String" }, + { "fieldName": "colorBackground", "fieldType": "String" }, + { "fieldName": "colorText", "fieldType": "String" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "division", + "otherEntityRelationshipName": "preferredPlace", + "ownerSide": true, + "relationshipName": "preferredDivision", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "name", + "otherEntityName": "division", + "otherEntityRelationshipName": "divisionsPlace", + "relationshipName": "owner", + "relationshipType": "many-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json b/test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json new file mode 100644 index 000000000..941035687 --- /dev/null +++ b/test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json @@ -0,0 +1,60 @@ +{ + "angularJSSuffix": "mySuffixAlt", + "changelogDate": "20181120190609", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "relationshipName": "superMegaLargeTestManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "ownerSide": false, + "relationshipName": "superMegaLargeTestManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "ownerSide": false, + "relationshipName": "superMegaLargeTestOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "relationshipName": "superMegaLargeUserOneToMany", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "superMegaLargeUserManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "superMegaLargeUserOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "relationshipName": "superMegaLargeTestCustomTableName", + "relationshipType": "one-to-many" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestCustomTableName.json b/test-integration/samples/.jhipster/TestCustomTableName.json new file mode 100644 index 000000000..14254548e --- /dev/null +++ b/test-integration/samples/.jhipster/TestCustomTableName.json @@ -0,0 +1,61 @@ +{ + "changelogDate": "20160208210109", + "dto": "no", + "entityTableName": "test_custom_table_name_entity", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testCustomTableName", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testCustomTableName", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testCustomTableName", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "relationshipName": "testEntity", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestEntity.json b/test-integration/samples/.jhipster/TestEntity.json new file mode 100644 index 000000000..71d6b26f0 --- /dev/null +++ b/test-integration/samples/.jhipster/TestEntity.json @@ -0,0 +1,60 @@ +{ + "angularJSSuffix": "mySuffixAlt", + "changelogDate": "20160208210110", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testEntity", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testEntity", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testEntity", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "relationshipName": "userOneToMany", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testEntity", + "relationshipName": "testCustomTableName", + "relationshipType": "one-to-many" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestInfiniteScroll.json b/test-integration/samples/.jhipster/TestInfiniteScroll.json new file mode 100644 index 000000000..c63cf8c37 --- /dev/null +++ b/test-integration/samples/.jhipster/TestInfiniteScroll.json @@ -0,0 +1,46 @@ +{ + "changelogDate": "20160208210111", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testInfiniteScroll", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testInfiniteScroll", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testInfiniteScroll", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestManyRelPaginDTO.json b/test-integration/samples/.jhipster/TestManyRelPaginDTO.json new file mode 100644 index 000000000..b605b8804 --- /dev/null +++ b/test-integration/samples/.jhipster/TestManyRelPaginDTO.json @@ -0,0 +1,52 @@ +{ + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208210534", + "dto": "mapstruct", + "entityTableName": "test_many_many_pagination_dto", + "fields": [], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructOwnerOneToOne", + "ownerSide": false, + "relationshipName": "backTestMapstructOwnerOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructOwnerManyToMany", + "ownerSide": false, + "relationshipName": "backTestMapstructOwnerManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructOwnerManyToOne", + "relationshipName": "backTestMapstructOwnerManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructBackOneToOne", + "ownerSide": true, + "relationshipName": "backTestMapstructBackOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructBackManyToMany", + "ownerSide": true, + "relationshipName": "backTestMapstructBackManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructBackManyToOne", + "relationshipName": "backTestMapstructBackManyToOne", + "relationshipType": "many-to-one" + } + ], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/TestManyToMany.json b/test-integration/samples/.jhipster/TestManyToMany.json new file mode 100644 index 000000000..aee8d4235 --- /dev/null +++ b/test-integration/samples/.jhipster/TestManyToMany.json @@ -0,0 +1,67 @@ +{ + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208210535", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testEntity", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceClass", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testServiceClass", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceImpl", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testServiceImpl", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testInfiniteScroll", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testInfiniteScroll", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testPagination", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testPagination", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testCustomTableName", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "otherEntityRelationshipName": "superMegaLargeTestManyToMany", + "ownerSide": true, + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "many-to-many" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestManyToOne.json b/test-integration/samples/.jhipster/TestManyToOne.json new file mode 100644 index 000000000..a69d8274b --- /dev/null +++ b/test-integration/samples/.jhipster/TestManyToOne.json @@ -0,0 +1,60 @@ +{ + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208211440", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testEntity", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceClass", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testServiceClass", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceImpl", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testServiceImpl", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testInfiniteScroll", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testInfiniteScroll", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testPagination", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testPagination", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testCustomTableName", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "otherEntityRelationshipName": "superMegaLargeTestManyToOne", + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "many-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestMapstruct.json b/test-integration/samples/.jhipster/TestMapstruct.json new file mode 100644 index 000000000..9436e3a4c --- /dev/null +++ b/test-integration/samples/.jhipster/TestMapstruct.json @@ -0,0 +1,65 @@ +{ + "changelogDate": "20160208210112", + "dto": "mapstruct", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructOwnerOneToOne", + "ownerSide": true, + "relationshipName": "testMapstructOwnerOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructOwnerManyToMany", + "ownerSide": true, + "relationshipName": "testMapstructOwnerManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructOwnerManyToOne", + "relationshipName": "testMapstructOwnerManyToOne", + "relationshipType": "many-to-one" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructBackOneToOne", + "ownerSide": false, + "relationshipName": "testMapstructBackOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructBackManyToMany", + "ownerSide": false, + "relationshipName": "testMapstructBackManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructBackManyToOne", + "relationshipName": "testMapstructBackManyToOne", + "relationshipType": "one-to-many" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userManyToOne", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestOneToOne.json b/test-integration/samples/.jhipster/TestOneToOne.json new file mode 100644 index 000000000..83af31676 --- /dev/null +++ b/test-integration/samples/.jhipster/TestOneToOne.json @@ -0,0 +1,67 @@ +{ + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208211541", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testEntity", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceClass", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testServiceClass", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceImpl", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testServiceImpl", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testInfiniteScroll", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testInfiniteScroll", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testPagination", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testPagination", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testCustomTableName", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "otherEntityRelationshipName": "superMegaLargeTestOneToOne", + "ownerSide": true, + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "one-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestPagination.json b/test-integration/samples/.jhipster/TestPagination.json new file mode 100644 index 000000000..bd9166206 --- /dev/null +++ b/test-integration/samples/.jhipster/TestPagination.json @@ -0,0 +1,46 @@ +{ + "changelogDate": "20160208210113", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testPagination", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testPagination", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testPagination", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/TestServiceClass.json b/test-integration/samples/.jhipster/TestServiceClass.json new file mode 100644 index 000000000..2edd177d2 --- /dev/null +++ b/test-integration/samples/.jhipster/TestServiceClass.json @@ -0,0 +1,47 @@ +{ + "changelogDate": "20160208210114", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testServiceClass", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testServiceClass", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testServiceClass", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "serviceClass" +} diff --git a/test-integration/samples/.jhipster/TestServiceImpl.json b/test-integration/samples/.jhipster/TestServiceImpl.json new file mode 100644 index 000000000..0d0abba6e --- /dev/null +++ b/test-integration/samples/.jhipster/TestServiceImpl.json @@ -0,0 +1,47 @@ +{ + "changelogDate": "20160208210115", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testServiceImpl", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testServiceImpl", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testServiceImpl", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "serviceImpl" +} diff --git a/test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json b/test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json new file mode 100644 index 000000000..2f69cd586 --- /dev/null +++ b/test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json @@ -0,0 +1,44 @@ +{ + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208210116", + "dto": "no", + "entityTableName": "test_multiple_rel", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "firstTestTwoRelationshipsSameEntity", + "relationshipName": "firstRelationship", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "secondTestTwoRelationshipsSameEntity", + "relationshipName": "secondRelationship", + "relationshipType": "many-to-one" + }, + { "otherEntityName": "user", "ownerSide": true, "relationshipName": "userOne", "relationshipType": "one-to-one" }, + { "otherEntityName": "user", "ownerSide": true, "relationshipName": "userTwo", "relationshipType": "one-to-one" }, + { + "otherEntityField": "id", + "otherEntityName": "division", + "otherEntityRelationshipName": "firstTestTwoRelationshipsSameEntity", + "relationshipName": "firstUniqueRequiredRelation", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "division", + "otherEntityRelationshipName": "secondTestTwoRelationshipsSameEntity", + "relationshipName": "secondUniqueRequiredRelation", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + } + ], + "service": "no" +} diff --git a/test-integration/samples/.jhipster/Track.json b/test-integration/samples/.jhipster/Track.json new file mode 100644 index 000000000..ca662c941 --- /dev/null +++ b/test-integration/samples/.jhipster/Track.json @@ -0,0 +1,24 @@ +{ + "applications": "*", + "changelogDate": "20200417190923", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "track", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Track", + "pagination": "no", + "readOnly": false, + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "album", + "otherEntityRelationshipName": "track", + "relationshipName": "album", + "relationshipType": "many-to-one" + } + ], + "service": "no" +} diff --git a/test-integration/samples/app-sample-dev/.yo-rc.json b/test-integration/samples/app-sample-dev/.yo-rc.json new file mode 100644 index 000000000..34d01e9d6 --- /dev/null +++ b/test-integration/samples/app-sample-dev/.yo-rc.json @@ -0,0 +1,30 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipsterSampleApplication", + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": true, + "jhiPrefix": "myPrefix", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/jdl-default/app.jdl b/test-integration/samples/jdl-default/app.jdl new file mode 100644 index 000000000..49543b9e8 --- /dev/null +++ b/test-integration/samples/jdl-default/app.jdl @@ -0,0 +1,186 @@ +application { + config { + applicationType monolith, + baseName jhipsterSampleApplication, + packageName tech.jhipster.sample, + authenticationType jwt, + prodDatabaseType postgresql, + buildTool maven, + searchEngine false, + testFrameworks [gatling, cypress], + clientFramework angularX, + enableTranslation true, + nativeLanguage en, + languages [ en, fr ] + } + entities * +} + +entity Bank { + bankNumber Integer +} +entity BankAccount { + name String required + bankNumber Integer + agencyNumber Long + lastOperationDuration Float + meanOperationDuration Double + balance BigDecimal required + openingDay LocalDate + lastOperationDate Instant + active Boolean + accountType BankAccountType + attachment AnyBlob + description TextBlob +} +entity TheLabel { + labelName String required minlength(3) +} +entity Operation { + date Instant required + description String + amount BigDecimal required +} + +enum BankAccountType { + CHECKING (checking_account), + SAVINGS (savings_account), + LOAN (loan_account) +} + +entity Department { + name String required, + description TextBlob, + advertisement Blob, + logo ImageBlob +} + +/** + * JobHistory comment. + */ +entity JobHistory { + startDate ZonedDateTime, + endDate ZonedDateTime, + language Language +} + +enum Language { + FRENCH, ENGLISH, SPANISH +} + +enum JobType { + BOSS, SLAVE +} + +entity Job { + title String minlength(5) maxlength(25), + type JobType, + minSalary Long, + maxSalary Long +} + +/** + * The Employee entity. + * Second line in javadoc. + */ +entity Employee { + /** + * The firstname attribute. + */ + firstName String, + lastName String, + email String, + phoneNumber String, + hireDate ZonedDateTime, + salary Long, + commissionPct Long +} + +entity Location { + streetAddress String, + postalCode String, + city String, + stateProvince String +} + +entity Task { + title String, + description String +} + +entity GoldenBadge { + name String +} + +entity SilverBadge { + name String +} + +entity Identifier { + name String required unique +} + +entity Country { + name String +} + +entity Region { + name String +} + +relationship OneToOne { + Department{location} to Location, + Employee{user(login)} to User with jpaDerivedIdentifier +} + +relationship OneToMany { + BankAccount{operation} to Operation{bankAccount(name)} +} +relationship ManyToOne { + BankAccount{user(login)} to User +} +relationship ManyToMany { + Operation{theLabel(labelName)} to TheLabel{operation} +} + +relationship OneToMany { + /** + * A relationship + */ + Department{employee} to + /** + * Another side of the same relationship, + */ + Employee{department}, + Employee{job} to Job{emp(lastName)}, + Location{country} to Country, + Country{area(name)} to Region +} + +relationship ManyToOne { + Employee{manager(lastName)} to Employee, + Employee{sibag(name) required} to SilverBadge, + Employee{gobag(name) required} to GoldenBadge, + SilverBadge{iden(name) required} to Identifier, + GoldenBadge{iden(name) required} to Identifier +} + +relationship ManyToMany { + JobHistory{department} to Department{history}, + JobHistory{job} to Job{history}, + JobHistory{emp(firstName)} to Employee{history}, + Job{chore(title)} to Task{linkedJob(title)}, + Bank{account} to BankAccount{bank} +} + +dto BankAccount, Employee, Department, Location, Country, Region, SilverBadge, GoldenBadge, Identifier with mapstruct + +angularSuffix BankAccount with mySuffix +filter BankAccount, Employee +clientRootFolder BankAccount, TheLabel, Operation with test-root + +paginate TheLabel, Job with pagination +paginate Operation, JobHistory, Employee with infinite-scroll + +service TheLabel, Employee, Department, Region with serviceClass +service BankAccount, Location, Country with serviceImpl diff --git a/test-integration/samples/jdl-entities/custom-domain.jdl b/test-integration/samples/jdl-entities/custom-domain.jdl new file mode 100644 index 000000000..4c4ee0937 --- /dev/null +++ b/test-integration/samples/jdl-entities/custom-domain.jdl @@ -0,0 +1,22 @@ +@ChangelogDate(20200804035400) +@EntityPackage("app.custom") +entity CustomPackageParent { + parentName String +} + +@ChangelogDate(20200804035401) +@EntityPackage("app.child") +entity CustomPackageChild { + childName String +} + +relationship OneToMany { + CustomPackageParent to CustomPackageChild +} + +relationship ManyToOne { + CustomPackageChild to User +} + +dto CustomPackageParent, CustomPackageChild with mapstruct +service CustomPackageParent, CustomPackageChild with serviceClass diff --git a/test-integration/samples/jdl-entities/custom-id.jdl b/test-integration/samples/jdl-entities/custom-id.jdl new file mode 100644 index 000000000..4215dd2b7 --- /dev/null +++ b/test-integration/samples/jdl-entities/custom-id.jdl @@ -0,0 +1,206 @@ +/* + * UUID custom id + */ +@ChangelogDate(20200804035300) +entity EntityUuidId { + id UUID +} + +@ChangelogDate(20200804035301) +entity EntityUuidIdMapsId { +} + +@ChangelogDate(20200804035302) +entity EntityUuidIdRelationship { + id UUID +} + +relationship OneToOne { + EntityUuidIdMapsId to @Id EntityUuidId + EntityUuidIdRelationship{oneToOne} to EntityUuidId{oneToOneBack} + EntityUuidIdRelationship{oneToOneMapsId} to EntityUuidIdMapsId{oneToOneMapsIdBack} +} + +relationship ManyToOne { + EntityUuidIdRelationship{manyToOne} to EntityUuidId{manyToOneBack} + EntityUuidIdRelationship{manyToOneMapsId} to EntityUuidIdMapsId{manyToOneMapsIdBack} +} + +relationship ManyToMany { + EntityUuidIdRelationship{manyToMany} to EntityUuidId{manyToManyBack} + EntityUuidIdRelationship{manyToManyMapsId} to EntityUuidIdMapsId{manyToManyMapsIdBack} +} + +/* + * UUID custom id with DTO + */ +@ChangelogDate(20200804035400) +entity EntityUuidIdDTO { + id UUID +} + +@ChangelogDate(20200804035401) +entity EntityUuidIdDTOMapsId { +} + +@ChangelogDate(20200804035402) +entity EntityUuidIdDTORel { + id UUID +} + +relationship OneToOne { + EntityUuidIdDTOMapsId to @Id EntityUuidIdDTO + EntityUuidIdDTORel{oneToOne} to EntityUuidIdDTO{oneToOneBack} + EntityUuidIdDTORel{oneToOneMapsId} to EntityUuidIdDTOMapsId{oneToOneMapsIdBack} +} + +relationship ManyToOne { + EntityUuidIdDTORel{manyToOne} to EntityUuidIdDTO{manyToOneBack} + EntityUuidIdDTORel{manyToOneMapsId} to EntityUuidIdDTOMapsId{manyToOneMapsIdBack} +} + +relationship ManyToMany { + EntityUuidIdDTORel{manyToMany} to EntityUuidIdDTO{manyToManyBack} + EntityUuidIdDTORel{manyToManyMapsId} to EntityUuidIdDTOMapsId{manyToManyMapsIdBack} +} + +dto EntityUuidIdDTO, EntityUuidIdDTOMapsId, EntityUuidIdDTORel with mapstruct + +/* + * Custom named id + */ +@ChangelogDate(20200804035500) +entity EntityCustomId { + @Id customId Long +} + +@ChangelogDate(20200804035501) +entity EntityCustomIdMapsId { +} + +@ChangelogDate(20200804035502) +entity EntityCustomIdRelationship { + @Id relatedId Long +} + +relationship OneToOne { + EntityCustomIdMapsId to @Id EntityCustomId + EntityCustomIdRelationship{oneToOne} to EntityCustomId{oneToOneBack} + EntityCustomIdRelationship{oneToOneMapsId} to EntityCustomIdMapsId{oneToOneMapsIdBack} +} + +relationship ManyToOne { + EntityCustomIdRelationship{manyToOne} to EntityCustomId{manyToOneBack} + EntityCustomIdRelationship{manyToOneMapsId} to EntityCustomIdMapsId{manyToOneMapsIdBack} +} + +relationship ManyToMany { + EntityCustomIdRelationship{manyToMany} to EntityCustomId{manyToManyBack} + EntityCustomIdRelationship{manyToManyMapsId} to EntityCustomIdMapsId{manyToManyMapsIdBack} +} + +/* + * Custom named id with dto + */ +@ChangelogDate(20200804035600) +entity EntityCustomIdDTO { + @Id customId Long +} + +@ChangelogDate(20200804035601) +entity EntityCustomIdDTOMapsId { +} + +@ChangelogDate(20200804035502) +entity EntityCustomIdDTORel { + @Id relatedId Long +} + +relationship OneToOne { + EntityCustomIdDTOMapsId to @Id EntityCustomIdDTO + EntityCustomIdDTORel{oneToOne} to EntityCustomIdDTO{oneToOneBack} + EntityCustomIdDTORel{oneToOneMapsId} to EntityCustomIdDTOMapsId{oneToOneMapsIdBack} +} + +relationship ManyToOne { + EntityCustomIdDTORel{manyToOne} to EntityCustomIdDTO{manyToOneBack} + EntityCustomIdDTORel{manyToOneMapsId} to EntityCustomIdDTOMapsId{manyToOneMapsIdBack} +} + +relationship ManyToMany { + EntityCustomIdDTORel{manyToMany} to EntityCustomIdDTO{manyToManyBack} + EntityCustomIdDTORel{manyToManyMapsId} to EntityCustomIdDTOMapsId{manyToManyMapsIdBack} +} + +dto EntityCustomIdDTO, EntityCustomIdDTOMapsId, EntityCustomIdDTORel with mapstruct + +/* + * UUID Custom named id with filtering + */ +@ChangelogDate(20200804035500) +entity UuidIdFiltering { + @Id customId UUID +} + +@ChangelogDate(20200804035501) +entity UuidIdFilteringMapsId { +} + +@ChangelogDate(20200804035502) +entity UuidIdFilteringRelationship { + @Id relatedId UUID +} + +relationship OneToOne { + UuidIdFilteringMapsId to @Id UuidIdFiltering + UuidIdFilteringRelationship{oneToOne} to UuidIdFiltering{oneToOneBack} + UuidIdFilteringRelationship{oneToOneMapsId} to UuidIdFilteringMapsId{oneToOneMapsIdBack} +} + +relationship ManyToOne { + UuidIdFilteringRelationship{manyToOne} to UuidIdFiltering{manyToOneBack} + UuidIdFilteringRelationship{manyToOneMapsId} to UuidIdFilteringMapsId{manyToOneMapsIdBack} +} + +relationship ManyToMany { + UuidIdFilteringRelationship{manyToMany} to UuidIdFiltering{manyToManyBack} + UuidIdFilteringRelationship{manyToManyMapsId} to UuidIdFilteringMapsId{manyToManyMapsIdBack} +} + +filter UuidIdFiltering, UuidIdFilteringMapsId, UuidIdFilteringRelationship +service UuidIdFiltering, UuidIdFilteringMapsId, UuidIdFilteringRelationship with serviceClass + +/* + * Custom named id with required relationships, mapstruct dtos and search + */ +@ChangelogDate(20200804035700) +entity EntityCustomIdRequiredDTO { + @Id customId Long +} + +@ChangelogDate(20200804035701) +entity EntityCustomIdRequiredDTOMapsId { +} + +@ChangelogDate(20200804035702) +entity EntityCustomIdRequiredDTORel { + @Id relatedId Long +} + +relationship OneToOne { + EntityCustomIdRequiredDTOMapsId to @Id EntityCustomIdRequiredDTO + EntityCustomIdRequiredDTORel{oneToOne required} to EntityCustomIdRequiredDTO{oneToOneBack} + EntityCustomIdRequiredDTORel{oneToOneMapsId required} to EntityCustomIdRequiredDTOMapsId{oneToOneMapsIdBack} +} + +relationship ManyToOne { + EntityCustomIdRequiredDTORel{manyToOne required} to EntityCustomIdRequiredDTO{manyToOneBack} + EntityCustomIdRequiredDTORel{manyToOneMapsId required} to EntityCustomIdRequiredDTOMapsId{manyToOneMapsIdBack} +} + +relationship ManyToMany { + EntityCustomIdRequiredDTORel{manyToMany required} to EntityCustomIdRequiredDTO{manyToManyBack} + EntityCustomIdRequiredDTORel{manyToManyMapsId required} to EntityCustomIdRequiredDTOMapsId{manyToManyMapsIdBack} +} + +dto EntityCustomIdRequiredDTO, EntityCustomIdRequiredDTOMapsId, EntityCustomIdRequiredDTORel with mapstruct \ No newline at end of file diff --git a/test-integration/samples/jdl-entities/entities.jdl b/test-integration/samples/jdl-entities/entities.jdl new file mode 100644 index 000000000..ab7c2a5b7 --- /dev/null +++ b/test-integration/samples/jdl-entities/entities.jdl @@ -0,0 +1,11 @@ +@ChangelogDate(20200804035352) +entity JdlFieldTest { + id Long + + name String + + @MapstructExpression("java(s.getName())") + value String +} + +dto JdlFieldTest with mapstruct diff --git a/test-integration/samples/jdl-entities/user-relationships/entities.jdl b/test-integration/samples/jdl-entities/user-relationships/entities.jdl new file mode 100644 index 000000000..a79557f95 --- /dev/null +++ b/test-integration/samples/jdl-entities/user-relationships/entities.jdl @@ -0,0 +1,36 @@ +@ChangelogDate(20200804040000) +entity UserMapsId { +} + +@ChangelogDate(20200804050000) +entity UserMapsIdDto { +} + +@ChangelogDate(20200804060000) +entity UserRelationship { +} + +@ChangelogDate(20200804070000) +entity UserRelationshipDto { +} + +relationship OneToOne { + UserMapsId to @Id User + UserRelationship{oneToOne} to User + UserRelationshipDto{oneToOneDto} to User + UserRelationship{oneToOneMapsId} to UserMapsId{oneToOneMapsIdBack} +} + +relationship ManyToOne { + UserRelationship{manyToOne} to User + UserRelationshipDto{manyToOneMapsId} to User + UserRelationship{manyToOneMapsId} to UserMapsId{manyToOneMapsIdBack} +} + +relationship ManyToMany { + UserRelationship{manyToMany} to User + UserRelationshipDto{manyToManyMapsId} to User + UserRelationship{manyToManyMapsId} to UserMapsId{manyToManyMapsIdBack} +} + +dto UserRelationshipDto with mapstruct diff --git a/test-integration/samples/ms-micro-consul/.yo-rc.json b/test-integration/samples/ms-micro-consul/.yo-rc.json new file mode 100644 index 000000000..c75e5901b --- /dev/null +++ b/test-integration/samples/ms-micro-consul/.yo-rc.json @@ -0,0 +1,31 @@ +{ + "generator-jhipster": { + "applicationType": "microservice", + "authenticationType": "jwt", + "baseName": "sampleMicroserviceConsul", + "buildTool": "maven", + "cacheProvider": "hazelcast", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": true, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8081", + "serviceDiscoveryType": "consul", + "skipClient": true, + "skipUserManagement": true, + "testFrameworks": ["gatling"], + "websocket": false + } +} diff --git a/test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json b/test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json new file mode 100644 index 000000000..23bac8d20 --- /dev/null +++ b/test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json @@ -0,0 +1,35 @@ +{ + "generator-jhipster": { + "applicationType": "microservice", + "authenticationType": "jwt", + "baseName": "samplesMicroserviceEurekaInfinispan", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "infinispan", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8081", + "serviceDiscoveryType": "eureka", + "skipClient": true, + "skipUserManagement": true, + "testFrameworks": ["gatling"], + "websocket": false + } +} diff --git a/test-integration/samples/ms-micro-eureka-jwt/.yo-rc.json b/test-integration/samples/ms-micro-eureka-jwt/.yo-rc.json new file mode 100644 index 000000000..46d8a170f --- /dev/null +++ b/test-integration/samples/ms-micro-eureka-jwt/.yo-rc.json @@ -0,0 +1,35 @@ +{ + "generator-jhipster": { + "applicationType": "microservice", + "authenticationType": "jwt", + "baseName": "samplesMicroserviceEureka", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "hazelcast", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8081", + "serviceDiscoveryType": "eureka", + "skipClient": true, + "skipUserManagement": true, + "testFrameworks": ["gatling"], + "websocket": false + } +} diff --git a/test-integration/samples/ms-micro-eureka/.yo-rc.json b/test-integration/samples/ms-micro-eureka/.yo-rc.json new file mode 100644 index 000000000..9486f79fb --- /dev/null +++ b/test-integration/samples/ms-micro-eureka/.yo-rc.json @@ -0,0 +1,31 @@ +{ + "generator-jhipster": { + "applicationType": "microservice", + "authenticationType": "jwt", + "baseName": "sampleMicroserviceEureka", + "buildTool": "maven", + "cacheProvider": "hazelcast", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": true, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8081", + "serviceDiscoveryType": "eureka", + "skipClient": true, + "skipUserManagement": true, + "testFrameworks": ["gatling"], + "websocket": false + } +} diff --git a/test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json new file mode 100644 index 000000000..297a36796 --- /dev/null +++ b/test-integration/samples/ms-ngx-gateway-consul/.yo-rc.json @@ -0,0 +1,30 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "jwt", + "baseName": "sampleDefault", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "myPrefix", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "consul", + "testFrameworks": ["gatling"], + "websocket": false + } +} diff --git a/test-integration/samples/ms-ngx-gateway-eureka-jwt/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-eureka-jwt/.yo-rc.json new file mode 100644 index 000000000..c4191d77e --- /dev/null +++ b/test-integration/samples/ms-ngx-gateway-eureka-jwt/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "jwt", + "baseName": "sampleGateway", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "eureka", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ms-ngx-gateway-eureka-oauth2/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-eureka-oauth2/.yo-rc.json new file mode 100644 index 000000000..68b6dad93 --- /dev/null +++ b/test-integration/samples/ms-ngx-gateway-eureka-oauth2/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "oauth2", + "baseName": "sampleGateway", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "eureka", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json b/test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json new file mode 100644 index 000000000..b75770540 --- /dev/null +++ b/test-integration/samples/ms-ngx-gateway-eureka/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "jwt", + "baseName": "sampleGateway", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "eureka", + "testFrameworks": ["gatling"], + "websocket": false + } +} 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 new file mode 100644 index 000000000..1463a6fc1 --- /dev/null +++ b/test-integration/samples/ms-react-gateway-consul-jwt/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "jwt", + "baseName": "sampleGateway", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "consul", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} 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 new file mode 100644 index 000000000..964864e53 --- /dev/null +++ b/test-integration/samples/ms-react-gateway-consul-oauth2/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "oauth2", + "baseName": "sampleGateway", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "consul", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-couchbase/.yo-rc.json b/test-integration/samples/ngx-couchbase/.yo-rc.json new file mode 100644 index 000000000..944580165 --- /dev/null +++ b/test-integration/samples/ngx-couchbase/.yo-rc.json @@ -0,0 +1,30 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleCouchbaseNoCache", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-default/.yo-rc.json b/test-integration/samples/ngx-default/.yo-rc.json new file mode 100644 index 000000000..dc6beba37 --- /dev/null +++ b/test-integration/samples/ngx-default/.yo-rc.json @@ -0,0 +1,83 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipsterSampleApplication", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "cypressCoverage": true, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": true, + "entitySuffix": "Entity", + "jhiPrefix": "myPrefix", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": [ + "en", + "al", + "ar-ly", + "hy", + "by", + "bn", + "bg", + "ca", + "zh-cn", + "zh-tw", + "cs", + "da", + "nl", + "et", + "fa", + "fr", + "gl", + "de", + "el", + "hi", + "hr", + "hu", + "in", + "it", + "ja", + "ko", + "mr", + "my", + "pl", + "pt-br", + "pt-pt", + "ro", + "ru", + "si", + "sk", + "sr", + "es", + "sv", + "tr", + "ta", + "te", + "th", + "ua", + "uz-Cyrl-uz", + "uz-Latn-uz", + "vi" + ], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-gradle-couchbase-search/.yo-rc.json b/test-integration/samples/ngx-gradle-couchbase-search/.yo-rc.json new file mode 100644 index 000000000..daa403880 --- /dev/null +++ b/test-integration/samples/ngx-gradle-couchbase-search/.yo-rc.json @@ -0,0 +1,30 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleCouchbaseNoCache", + "buildTool": "gradle", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "searchEngine": "couchbase", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-gradle-fr/.yo-rc.json b/test-integration/samples/ngx-gradle-fr/.yo-rc.json new file mode 100644 index 000000000..9ac6edcec --- /dev/null +++ b/test-integration/samples/ngx-gradle-fr/.yo-rc.json @@ -0,0 +1,35 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleNgxGradle", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "ehcache", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "fr", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-gradle-h2disk-ws-nocache/.yo-rc.json b/test-integration/samples/ngx-gradle-h2disk-ws-nocache/.yo-rc.json new file mode 100644 index 000000000..4242bbebd --- /dev/null +++ b/test-integration/samples/ngx-gradle-h2disk-ws-nocache/.yo-rc.json @@ -0,0 +1,38 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleWebsocketNocache", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr", "de"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "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/ngx-gradle-mariadb-oauth2-infinispan/.yo-rc.json new file mode 100644 index 000000000..1d64f3428 --- /dev/null +++ b/test-integration/samples/ngx-gradle-mariadb-oauth2-infinispan/.yo-rc.json @@ -0,0 +1,32 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "sampleGradleOauth2Infinispan", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "infinispan", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "mariadb", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": false, + "entitySuffix": "", + "jhiPrefix": "myPrefix", + "messageBroker": false, + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mariadb", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-gradle-mongodb-kafka-cucumber/.yo-rc.json b/test-integration/samples/ngx-gradle-mongodb-kafka-cucumber/.yo-rc.json new file mode 100644 index 000000000..23eacc3c1 --- /dev/null +++ b/test-integration/samples/ngx-gradle-mongodb-kafka-cucumber/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleMongoKafka", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "ehcache", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "myPrefix", + "jwtSecretKey": "OTNiNTU1YzgyNjA3NjUwNDRhYWM1OTBiMGI3YmY1ODk3NWFiZWIyMmZiNzFhM2JiOWY4OWY0OTc1YTllNTkzZWExNjk5NWMzZGQxZTEwODNhZWFlNjc2M2IzNGViODg2NWRlNjM0ZDdkNDkxYjdhZThhODY1ZGJmODRhYWM4OTk=", + "languages": ["en", "fr"], + "messageBroker": "kafka", + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mongodb", + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "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/ngx-gradle-mysql-es-noi18n-mapsid/.yo-rc.json new file mode 100644 index 000000000..7b1825224 --- /dev/null +++ b/test-integration/samples/ngx-gradle-mysql-es-noi18n-mapsid/.yo-rc.json @@ -0,0 +1,34 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "samplePsqlEsNoi18nMapsIdWithNgx", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "hazelcast", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "mysql", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": false, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "messageBroker": false, + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mysql", + "searchEngine": "elasticsearch", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-h2mem-ws-nol2/.yo-rc.json b/test-integration/samples/ngx-h2mem-ws-nol2/.yo-rc.json new file mode 100644 index 000000000..ec297830b --- /dev/null +++ b/test-integration/samples/ngx-h2mem-ws-nol2/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleWebsocket", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Memory", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "myPrefix", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "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/ngx-mariadb-oauth2-infinispan/.yo-rc.json new file mode 100644 index 000000000..c17df9ea4 --- /dev/null +++ b/test-integration/samples/ngx-mariadb-oauth2-infinispan/.yo-rc.json @@ -0,0 +1,32 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "sampleOauth2Infinispan", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "infinispan", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "mariadb", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": false, + "entitySuffix": "", + "jhiPrefix": "myPrefix", + "messageBroker": false, + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mariadb", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-mariadb-oauth2-sass-infinispan/.yo-rc.json b/test-integration/samples/ngx-mariadb-oauth2-sass-infinispan/.yo-rc.json new file mode 100644 index 000000000..53c83e6d7 --- /dev/null +++ b/test-integration/samples/ngx-mariadb-oauth2-sass-infinispan/.yo-rc.json @@ -0,0 +1,27 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "sampleOauth2SassInfinispan", + "buildTool": "maven", + "cacheProvider": "infinispan", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": true, + "enableTranslation": false, + "jhiPrefix": "myPrefix", + "messageBroker": false, + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mariadb", + "rememberMeKey": "448f9a67a8a292c4905a733ec22cc3b78e493c56", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-mongodb-kafka-cucumber/.yo-rc.json b/test-integration/samples/ngx-mongodb-kafka-cucumber/.yo-rc.json new file mode 100644 index 000000000..4288ee39f --- /dev/null +++ b/test-integration/samples/ngx-mongodb-kafka-cucumber/.yo-rc.json @@ -0,0 +1,35 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleMongoKafka", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "myPrefix", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": "kafka", + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mongodb", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cucumber", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-mysql-es-noi18n-mapsid/.yo-rc.json b/test-integration/samples/ngx-mysql-es-noi18n-mapsid/.yo-rc.json new file mode 100644 index 000000000..80914a775 --- /dev/null +++ b/test-integration/samples/ngx-mysql-es-noi18n-mapsid/.yo-rc.json @@ -0,0 +1,34 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "samplePsqlEsNoi18nMapsIdWithNgx", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "hazelcast", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "mysql", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": false, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "messageBroker": false, + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mysql", + "searchEngine": "elasticsearch", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-neo4j/.yo-rc.json b/test-integration/samples/ngx-neo4j/.yo-rc.json new file mode 100644 index 000000000..0cca06401 --- /dev/null +++ b/test-integration/samples/ngx-neo4j/.yo-rc.json @@ -0,0 +1,30 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleNeo4jNoCache", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "neo4j", + "devDatabaseType": "neo4j", + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "neo4j", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/ngx-session-cassandra-fr/.yo-rc.json b/test-integration/samples/ngx-session-cassandra-fr/.yo-rc.json new file mode 100644 index 000000000..cba7416af --- /dev/null +++ b/test-integration/samples/ngx-session-cassandra-fr/.yo-rc.json @@ -0,0 +1,29 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleCassandra", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "cassandra", + "devDatabaseType": "cassandra", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "fr", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "cassandra", + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling"], + "websocket": false + } +} diff --git a/test-integration/samples/react-default/.yo-rc.json b/test-integration/samples/react-default/.yo-rc.json new file mode 100644 index 000000000..574513fc0 --- /dev/null +++ b/test-integration/samples/react-default/.yo-rc.json @@ -0,0 +1,82 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipsterSampleApplication", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableTranslation": true, + "entitySuffix": "Entity", + "jhiPrefix": "myPrefix", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": [ + "en", + "al", + "ar-ly", + "hy", + "by", + "bn", + "bg", + "ca", + "zh-cn", + "zh-tw", + "cs", + "da", + "nl", + "et", + "fa", + "fr", + "gl", + "de", + "el", + "hi", + "hr", + "hu", + "in", + "it", + "ja", + "ko", + "mr", + "my", + "pl", + "pt-br", + "pt-pt", + "ro", + "ru", + "si", + "sk", + "sr", + "es", + "sv", + "tr", + "ta", + "te", + "th", + "ua", + "uz-Cyrl-uz", + "uz-Latn-uz", + "vi" + ], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} 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 new file mode 100644 index 000000000..e5328f002 --- /dev/null +++ b/test-integration/samples/react-gradle-cassandra-session-redis/.yo-rc.json @@ -0,0 +1,37 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleReactCassandraSessionRedis", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "redis", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "cassandra", + "devDatabaseType": "cassandra", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "cassandra", + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json b/test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json new file mode 100644 index 000000000..548fe528b --- /dev/null +++ b/test-integration/samples/react-gradle-couchbase-caffeine/.yo-rc.json @@ -0,0 +1,37 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleReactCouchbaseCaffeine", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "caffeine", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "searchEngine": "couchbase", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json b/test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json new file mode 100644 index 000000000..8dfcbb301 --- /dev/null +++ b/test-integration/samples/react-gradle-h2mem-memcached/.yo-rc.json @@ -0,0 +1,38 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleReactH2memMemcached", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "memcached", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Memory", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false, + "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 new file mode 100644 index 000000000..c242e291c --- /dev/null +++ b/test-integration/samples/react-gradle-mysql-es-noi18n-mapsid/.yo-rc.json @@ -0,0 +1,35 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "samplePsqlEsNoi18nMapsIdWithReact", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "hazelcast", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "mysql", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": false, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "messageBroker": false, + "nativeLanguage": "es", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mysql", + "searchEngine": "elasticsearch", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} 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 new file mode 100644 index 000000000..6760bc98c --- /dev/null +++ b/test-integration/samples/react-maven-cassandra-session-redis/.yo-rc.json @@ -0,0 +1,37 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleReactCassandraSessionRedis", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "redis", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "cassandra", + "devDatabaseType": "cassandra", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "cassandra", + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json b/test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json new file mode 100644 index 000000000..ca97a01dc --- /dev/null +++ b/test-integration/samples/react-maven-couchbase-caffeine/.yo-rc.json @@ -0,0 +1,37 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleReactCouchbaseCaffeine", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "caffeine", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "searchEngine": "couchbase", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json b/test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json new file mode 100644 index 000000000..7ce40e456 --- /dev/null +++ b/test-integration/samples/react-maven-h2mem-memcached/.yo-rc.json @@ -0,0 +1,38 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleReactH2memMemcached", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "memcached", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Memory", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false, + "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 new file mode 100644 index 000000000..eee65bf72 --- /dev/null +++ b/test-integration/samples/react-maven-mysql-es-noi18n-mapsid/.yo-rc.json @@ -0,0 +1,35 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "samplePsqlEsNoi18nMapsIdWithReact", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "hazelcast", + "clientFramework": "react", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "mysql", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": false, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "messageBroker": false, + "nativeLanguage": "es", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mysql", + "searchEngine": "elasticsearch", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} 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 new file mode 100644 index 000000000..094f7861a --- /dev/null +++ b/test-integration/samples/react-noi18n-es-ws-gradle-session/.yo-rc.json @@ -0,0 +1,27 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleReact", + "buildTool": "gradle", + "cacheProvider": "ehcache", + "clientFramework": "react", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": true, + "enableTranslation": false, + "jhiPrefix": "myPrefix", + "messageBroker": false, + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": "elasticsearch", + "serverPort": "8080", + "serviceDiscoveryType": false, + "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 new file mode 100644 index 000000000..c5f91ca03 --- /dev/null +++ b/test-integration/samples/vue-couchbase/.yo-rc.json @@ -0,0 +1,43 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594452153587, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "reactive": false, + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/vue-default/.yo-rc.json b/test-integration/samples/vue-default/.yo-rc.json new file mode 100644 index 000000000..90d68d546 --- /dev/null +++ b/test-integration/samples/vue-default/.yo-rc.json @@ -0,0 +1,43 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipsterVue", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594452153587, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": false, + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/vue-fulli18n-es/.yo-rc.json b/test-integration/samples/vue-fulli18n-es/.yo-rc.json new file mode 100644 index 000000000..d4badec4e --- /dev/null +++ b/test-integration/samples/vue-fulli18n-es/.yo-rc.json @@ -0,0 +1,91 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594459281773, + "databaseType": "sql", + "devDatabaseType": "mysql", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": [ + "en", + "al", + "ar-ly", + "hy", + "by", + "bn", + "bg", + "ca", + "zh-cn", + "zh-tw", + "cs", + "da", + "nl", + "et", + "fa", + "fi", + "fr", + "gl", + "de", + "el", + "hi", + "hr", + "hu", + "in", + "it", + "ja", + "ko", + "mr", + "my", + "pl", + "pt-br", + "pt-pt", + "ro", + "ru", + "sk", + "sr", + "si", + "es", + "sv", + "tr", + "ta", + "te", + "th", + "ua", + "uz-Cyrl-uz", + "uz-Latn-uz", + "vi" + ], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mysql", + "reactive": false, + "searchEngine": "elasticsearch", + "serverPort": "8080", + "serverSideOptions": ["searchEngine:elasticsearch"], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/vue-gateway/.yo-rc.json b/test-integration/samples/vue-gateway/.yo-rc.json new file mode 100644 index 000000000..a3c825750 --- /dev/null +++ b/test-integration/samples/vue-gateway/.yo-rc.json @@ -0,0 +1,43 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "jwt", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594452153587, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/vue-gradle-ws-session/.yo-rc.json b/test-integration/samples/vue-gradle-ws-session/.yo-rc.json new file mode 100644 index 000000000..5cc8b8c15 --- /dev/null +++ b/test-integration/samples/vue-gradle-ws-session/.yo-rc.json @@ -0,0 +1,44 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594452153587, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "NGJiOTZiMWFlMmQ5NmVkNzhmNzA1NjgxYmNlYjI2MzgwZGE3MzAwY2VkZDc0MThmMzM4MjRiODg0ZWVkYTVkNzU1MDNiODM1YjJmMjBhMDJhYzQwZTViNDUwMzA4YjJlOGYxZjhkYzQ1M2RlMGY1ZGQyYmFlOWVmZGYxMjEyODQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": false, + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": "spring-websocket" + } +} diff --git a/test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json b/test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json new file mode 100644 index 000000000..787a52c1c --- /dev/null +++ b/test-integration/samples/vue-mongodb-kafka-cucumber/.yo-rc.json @@ -0,0 +1,44 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594541091665, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "dtoSuffix": "DTO", + "enableHibernateCache": false, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "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, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cucumber", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json b/test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json new file mode 100644 index 000000000..5716df0ce --- /dev/null +++ b/test-integration/samples/vue-noi18n-ws-oauth2/.yo-rc.json @@ -0,0 +1,44 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594540443899, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": false, + "entitySuffix": "", + "jhiPrefix": "", + "jhipsterVersion": "6.10.0", + "jwtSecretKey": "YWQzOWQ1NDg4MTczMTQxMmQxM2FjY2M4NmI4NmE5Mjg3NzYwNGQwMGE4NjAxYTkzOTIxZDgzZDU0N2FlYTY2ODM0NDg0OGZkMjY5ODc2ZGQzYjVlYThlYzAxNzdiMmMzMGRlMzA1NGM4ZmVlMTNlZWEyMjAxNmEzYmMyYTg1Y2M=", + "languages": [], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": false, + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": "spring-websocket" + } +} diff --git a/test-integration/samples/vue-oauth2/.yo-rc.json b/test-integration/samples/vue-oauth2/.yo-rc.json new file mode 100644 index 000000000..967ec576d --- /dev/null +++ b/test-integration/samples/vue-oauth2/.yo-rc.json @@ -0,0 +1,43 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594452153587, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "NGJiOTZiMWFlMmQ5NmVkNzhmNzA1NjgxYmNlYjI2MzgwZGE3MzAwY2VkZDc0MThmMzM4MjRiODg0ZWVkYTVkNzU1MDNiODM1YjJmMjBhMDJhYzQwZTViNDUwMzA4YjJlOGYxZjhkYzQ1M2RlMGY1ZGQyYmFlOWVmZGYxMjEyODQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": false, + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/vue-session-cassandra-fr/.yo-rc.json b/test-integration/samples/vue-session-cassandra-fr/.yo-rc.json new file mode 100644 index 000000000..c4f27d21c --- /dev/null +++ b/test-integration/samples/vue-session-cassandra-fr/.yo-rc.json @@ -0,0 +1,44 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "primary", + "creationTimestamp": 1594452153587, + "databaseType": "cassandra", + "devDatabaseType": "cassandra", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "NGJiOTZiMWFlMmQ5NmVkNzhmNzA1NjgxYmNlYjI2MzgwZGE3MzAwY2VkZDc0MThmMzM4MjRiODg0ZWVkYTVkNzU1MDNiODM1YjJmMjBhMDJhYzQwZTViNDUwMzA4YjJlOGYxZjhkYzQ1M2RlMGY1ZGQyYmFlOWVmZGYxMjEyODQ=", + "languages": ["fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "cassandra", + "reactive": false, + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/vue-ws-theme/.yo-rc.json b/test-integration/samples/vue-ws-theme/.yo-rc.json new file mode 100644 index 000000000..38a8e846a --- /dev/null +++ b/test-integration/samples/vue-ws-theme/.yo-rc.json @@ -0,0 +1,44 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "jhipster", + "blueprints": [], + "buildTool": "maven", + "cacheProvider": "ehcache", + "clientFramework": "vue", + "clientPackageManager": "npm", + "clientTheme": "lux", + "clientThemeVariant": "primary", + "creationTimestamp": 1594452153587, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "dtoSuffix": "DTO", + "enableHibernateCache": true, + "enableSwaggerCodegen": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": false, + "searchEngine": false, + "serverPort": "8080", + "serverSideOptions": [], + "serviceDiscoveryType": false, + "skipCheckLengthOfIdentifier": false, + "skipClient": false, + "skipFakeData": false, + "skipServer": false, + "skipUserManagement": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": "spring-websocket", + "withAdminUi": 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 new file mode 100644 index 000000000..3b97c0e97 --- /dev/null +++ b/test-integration/samples/webflux-couchbase-es-oauth2/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "sampleWebfluxCouchbaseOauth2", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1580314672693, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jhipsterVersion": "6.6.0", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "reactive": true, + "searchEngine": "elasticsearch", + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-couchbase-session/.yo-rc.json b/test-integration/samples/webflux-couchbase-session/.yo-rc.json new file mode 100644 index 000000000..44b391b65 --- /dev/null +++ b/test-integration/samples/webflux-couchbase-session/.yo-rc.json @@ -0,0 +1,28 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleWebfluxCouchbaseSession", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "reactive": true, + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": false, + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-couchbase/.yo-rc.json b/test-integration/samples/webflux-couchbase/.yo-rc.json new file mode 100644 index 000000000..51b96c816 --- /dev/null +++ b/test-integration/samples/webflux-couchbase/.yo-rc.json @@ -0,0 +1,28 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleWebfluxCouchbase", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "couchbase", + "devDatabaseType": "couchbase", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "couchbase", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-gateway-jwt/.yo-rc.json b/test-integration/samples/webflux-gateway-jwt/.yo-rc.json new file mode 100644 index 000000000..5c47a3b5d --- /dev/null +++ b/test-integration/samples/webflux-gateway-jwt/.yo-rc.json @@ -0,0 +1,27 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "jwt", + "baseName": "reactiveGateway", + "buildTool": "maven", + "cacheProvider": "no", + "creationTimestamp": 1596513172471, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "es"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/gateway", + "packageName": "tech.jhipster.gateway", + "prodDatabaseType": "mongodb", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "eureka", + "testFrameworks": ["cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-gateway-oauth2/.yo-rc.json b/test-integration/samples/webflux-gateway-oauth2/.yo-rc.json new file mode 100644 index 000000000..b4d9775da --- /dev/null +++ b/test-integration/samples/webflux-gateway-oauth2/.yo-rc.json @@ -0,0 +1,29 @@ +{ + "generator-jhipster": { + "applicationType": "gateway", + "authenticationType": "oauth2", + "baseName": "reactiveGateway", + "buildTool": "gradle", + "cacheProvider": "no", + "clientFramework": "react", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/gateway", + "packageName": "tech.jhipster.gateway", + "prodDatabaseType": "mongodb", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": "eureka", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} 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 9fa8c8bd1..c759bccfd 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 @@ -1,29 +1,29 @@ { - "generator-jhipster": { - "applicationType": "monolith", - "authenticationType": "session", - "baseName": "sampleWebfluxH2mem", - "buildTool": "gradle", - "cacheProvider": "no", - "clientFramework": "angularX", - "clientPackageManager": "npm", - "creationTimestamp": 1596513172471, - "databaseType": "sql", - "devDatabaseType": "h2Memory", - "enableHibernateCache": false, - "enableSwaggerCodegen": true, - "enableTranslation": true, - "jhiPrefix": "jhi", - "languages": ["en", "fr"], - "nativeLanguage": "en", - "packageFolder": "tech/jhipster/sample", - "packageName": "tech.jhipster.sample", - "prodDatabaseType": "mariadb", - "reactive": true, - "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", - "searchEngine": "elasticsearch", - "serverPort": "8080", - "testFrameworks": ["gatling", "cypress"], - "websocket": false - } + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleWebfluxH2mem", + "buildTool": "gradle", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Memory", + "enableHibernateCache": false, + "enableSwaggerCodegen": true, + "enableTranslation": true, + "jhiPrefix": "jhi", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mariadb", + "reactive": true, + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": "elasticsearch", + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } } diff --git a/test-integration/samples/webflux-mongodb-es-session/.yo-rc.json b/test-integration/samples/webflux-mongodb-es-session/.yo-rc.json new file mode 100644 index 000000000..ed05634ee --- /dev/null +++ b/test-integration/samples/webflux-mongodb-es-session/.yo-rc.json @@ -0,0 +1,28 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "session", + "baseName": "sampleWebfluxMongodbEsSession", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mongodb", + "reactive": true, + "rememberMeKey": "a5e93fdeb16e2ee2dc4a629b5dbdabb30f968e418dfc0483c53afdc695cfac96d06cf5c581cbefb93e3aaa241880857fcafe", + "searchEngine": "elasticsearch", + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json b/test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json new file mode 100644 index 000000000..0b5991e1f --- /dev/null +++ b/test-integration/samples/webflux-mongodb-oauth2/.yo-rc.json @@ -0,0 +1,36 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "sampleWebfluxMongodbOauth2", + "blueprints": [], + "buildTool": "gradle", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "creationTimestamp": 1580314672693, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "dtoSuffix": "DTO", + "embeddableLaunchScript": false, + "enableHibernateCache": false, + "enableTranslation": true, + "entitySuffix": "", + "jhiPrefix": "jhi", + "jhipsterVersion": "6.6.0", + "languages": ["en", "fr"], + "messageBroker": false, + "nativeLanguage": "en", + "otherModules": [], + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mongodb", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-mongodb/.yo-rc.json b/test-integration/samples/webflux-mongodb/.yo-rc.json new file mode 100644 index 000000000..a1091cebb --- /dev/null +++ b/test-integration/samples/webflux-mongodb/.yo-rc.json @@ -0,0 +1,28 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleWebfluxMongodb", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "mongodb", + "devDatabaseType": "mongodb", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mongodb", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-mysql-kafka/.yo-rc.json b/test-integration/samples/webflux-mysql-kafka/.yo-rc.json new file mode 100644 index 000000000..5a3aa5fe2 --- /dev/null +++ b/test-integration/samples/webflux-mysql-kafka/.yo-rc.json @@ -0,0 +1,30 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleWebfluxMySqlKafka", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": false, + "enableSwaggerCodegen": true, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "messageBroker": "kafka", + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "mysql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-nodb-oauth2/.yo-rc.json b/test-integration/samples/webflux-nodb-oauth2/.yo-rc.json new file mode 100644 index 000000000..df1405ae9 --- /dev/null +++ b/test-integration/samples/webflux-nodb-oauth2/.yo-rc.json @@ -0,0 +1,30 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "oauth2", + "baseName": "sampleWebfluxNodb", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1596513172471, + "databaseType": "no", + "devDatabaseType": "no", + "enableHibernateCache": false, + "enableTranslation": true, + "jhiPrefix": "jhi", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "no", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "serviceDiscoveryType": false, + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-psql/.yo-rc.json b/test-integration/samples/webflux-psql/.yo-rc.json new file mode 100644 index 000000000..f0e737782 --- /dev/null +++ b/test-integration/samples/webflux-psql/.yo-rc.json @@ -0,0 +1,29 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleWebfluxPsql", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "angularX", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": false, + "enableSwaggerCodegen": true, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "prodDatabaseType": "postgresql", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} diff --git a/test-integration/samples/webflux-react/.yo-rc.json b/test-integration/samples/webflux-react/.yo-rc.json new file mode 100644 index 000000000..e92b9cce3 --- /dev/null +++ b/test-integration/samples/webflux-react/.yo-rc.json @@ -0,0 +1,28 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "authenticationType": "jwt", + "baseName": "sampleWebfluxMySql", + "buildTool": "maven", + "cacheProvider": "no", + "clientFramework": "react", + "clientPackageManager": "npm", + "creationTimestamp": 1596513172471, + "databaseType": "sql", + "devDatabaseType": "h2Disk", + "enableHibernateCache": false, + "enableSwaggerCodegen": true, + "enableTranslation": true, + "jhiPrefix": "jhi", + "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=", + "languages": ["en", "fr"], + "nativeLanguage": "en", + "packageFolder": "tech/jhipster/sample", + "packageName": "tech.jhipster.sample", + "reactive": true, + "searchEngine": false, + "serverPort": "8080", + "testFrameworks": ["gatling", "cypress"], + "websocket": false + } +} From a9bebef73f360ae737fb834318bf11efd546b3ad Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 13 Jun 2024 17:08:29 -0300 Subject: [PATCH 03/10] update cli --- cli/khipster.js | 93 +++++++++++++------------------------------------ 1 file changed, 25 insertions(+), 68 deletions(-) diff --git a/cli/khipster.js b/cli/khipster.js index d6204423b..09ddd2743 100755 --- a/cli/khipster.js +++ b/cli/khipster.js @@ -17,76 +17,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -const semver = require('semver'); -const path = require('path'); -const { logger } = require('generator-jhipster/cli/utils'); -const packageJson = require('../package.json'); -const currentNodeVersion = process.versions.node; -const minimumNodeVersion = packageJson.engines.node; +const { dirname, basename } = require('path'); +const { version, bin } = require('../package.json'); -if (!semver.satisfies(currentNodeVersion, minimumNodeVersion)) { - /* eslint-disable no-console */ - logger.error( - `You are running Node version ${currentNodeVersion}\nKHipster requires Node version ${minimumNodeVersion}\nPlease update your version of Node.` - ); - /* eslint-enable */ -} +// Get package name to use as namespace. +// Allows blueprints to be aliased. +const packagePath = dirname(__dirname); +const packageFolderName = basename(packagePath); +const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packageFolderName}` : packageFolderName; -let preferLocal = true; +(async () => { + const { runJHipster, done, logger } = await import('generator-jhipster/esm/cli'); + const executableName = Object.keys(bin)[0]; -// Don't use commander for parsing command line to avoid polluting it in cli.js -// --prefer-local: Always resolve node modules locally (useful when using linked module) -if ((process.argv.includes('upgrade') && !process.argv.includes('--prefer-local')) || process.argv.includes('--prefer-global')) { - // Prefer global version for `jhipster upgrade` to get most recent code - preferLocal = false; -} + runJHipster({ + executableName, + executableVersion: version, + defaultCommand: 'app', + blueprints: { + [blueprint]: version, + }, + printLogo: () => {}, + lookups: [{ packagePaths: [packagePath], lookups: ['generators'] }], + }).catch(done); -// Pass in kotlin as a blueprint module. -// User passes in blueprints flag but without Kotlin :> append Kotlin -if (!process.argv.includes('kotlin') && process.argv.includes('--blueprints')) { - for (let i = 0; i < process.argv.length; i++) { - if (process.argv[i] === '--blueprints') { - process.argv[i + 1] = `${process.argv[i + 1].split(',')},kotlin`; - } - } - // User passes in blueprint flag but without Kotlin :> append Kotlin -} else if (!process.argv.includes('kotlin') && process.argv.includes('--blueprint')) { - for (let i = 0; i < process.argv.length; i++) { - if (process.argv[i] === '--blueprint') { - process.argv[i] = '--blueprints'; - process.argv[i + 1] = `${process.argv[i + 1]},kotlin`; - } - } - // User donot pass in blueprints or blueprint flag but without Kotlin :> append Kotlin -} else if (!process.argv.includes('kotlin') && !process.argv.includes('--blueprint') && !process.argv.includes('--blueprints')) { - process.argv.push('--blueprints'); - process.argv.push('kotlin'); -} - -requireCLI(preferLocal); - -/* - * Require cli.js giving priority to local version over global one if it exists. - */ -function requireCLI(preferLocal) { - /* eslint-disable global-require */ - if (preferLocal) { - try { - const localCLI = require.resolve(path.join(process.cwd(), 'node_modules', 'generator-jhipster', 'cli', 'cli.js')); - if (__dirname !== path.dirname(localCLI)) { - // load local version - /* eslint-disable import/no-dynamic-require */ - logger.info("Using KHipster version installed locally in current project's node_modules"); - require(localCLI); - return; - } - } catch (e) { - // Unable to find local version, so global one will be loaded anyway - } - } - // load global version - logger.info('Using JHipster version installed globally'); - require('generator-jhipster/cli/cli'); - /* eslint-enable */ -} + process.on('unhandledRejection', up => { + logger.error('Unhandled promise rejection at:'); + logger.fatal(up); + }); +})(); From d59e2bb92284791330071c3caf7b9da79150fabc Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 13 Jun 2024 17:20:36 -0300 Subject: [PATCH 04/10] run prettier --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/copyright-update.yml | 66 +++---- CHANGELOG.md | 1 - README.md | 3 +- generators/entity-server/cleanup.js | 2 +- generators/server/files.js | 1 - package.json | 18 +- .../workflow-samples/angular.json | 162 +++++++++--------- test-integration/workflow-samples/react.json | 34 ++-- test-integration/workflow-samples/vue.json | 94 +++++----- 10 files changed, 190 insertions(+), 193 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c828c6393..6eebebf4d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -27,7 +27,7 @@ jobs: - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: - languages: javascript + languages: javascript - name: Autobuild uses: github/codeql-action/autobuild@v1 diff --git a/.github/workflows/copyright-update.yml b/.github/workflows/copyright-update.yml index 3a0201481..fcb0d45f5 100644 --- a/.github/workflows/copyright-update.yml +++ b/.github/workflows/copyright-update.yml @@ -1,39 +1,39 @@ name: Copyright Update on: - schedule: - - cron: '0 0 31 12 *' # Repeats December 31st every year + schedule: + - cron: '0 0 31 12 *' # Repeats December 31st every year permissions: - contents: read + contents: read jobs: - build: - permissions: - contents: write # for peter-evans/create-pull-request to create branch - pull-requests: write # for peter-evans/create-pull-request to create a PR - name: copyright update - if: github.repository == 'jhipster/jhipster-kotlin' - runs-on: ubuntu-latest - timeout-minutes: 40 - steps: - # Checkout - - uses: actions/checkout@v3 - with: - ref: main - fetch-depth: 0 - # Update the copyright headers - - name: Find and Replace - run: | - CURRENT_YEAR=$(date +'%Y') - NEW_YEAR=$(($CURRENT_YEAR + 1)) - grep -rlZE "Copyright ([0-9]+)-$CURRENT_YEAR" . | xargs -0 sed -i -E "s/Copyright ([0-9]+)-$CURRENT_YEAR/Copyright \1-$NEW_YEAR/g" - # Create PR - - name: Create Pull Request - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: 'Update copyright headers' - title: 'Update Copyright Headers' - body: 'This is an automated pull request to update the copyright headers' - branch: 'copyright-date-update' - author: 'jhipster-bot ' + build: + permissions: + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR + name: copyright update + if: github.repository == 'jhipster/jhipster-kotlin' + runs-on: ubuntu-latest + timeout-minutes: 40 + steps: + # Checkout + - uses: actions/checkout@v3 + with: + ref: main + fetch-depth: 0 + # Update the copyright headers + - name: Find and Replace + run: | + CURRENT_YEAR=$(date +'%Y') + NEW_YEAR=$(($CURRENT_YEAR + 1)) + grep -rlZE "Copyright ([0-9]+)-$CURRENT_YEAR" . | xargs -0 sed -i -E "s/Copyright ([0-9]+)-$CURRENT_YEAR/Copyright \1-$NEW_YEAR/g" + # Create PR + - name: Create Pull Request + uses: peter-evans/create-pull-request@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: 'Update copyright headers' + title: 'Update Copyright Headers' + body: 'This is an automated pull request to update the copyright headers' + branch: 'copyright-date-update' + author: 'jhipster-bot ' diff --git a/CHANGELOG.md b/CHANGELOG.md index b1242f848..c239f3c67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ - Refer [releases](https://github.com/jhipster/jhipster-kotlin/releases). diff --git a/README.md b/README.md index 85598122a..8599320b5 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,12 @@ Full documentation and information about JHipster is available [here](https://ww [![NPM version][npm-image]][npm-url] [![Dependency Status][daviddm-image]][daviddm-url] - ## 🚀 How to get started Install the package with `npm install -g generator-jhipster-kotlin` 1. Install the package with `npm install -g generator-jhipster-kotlin` -1. Create and navigate to a directory +1. Create and navigate to a directory 1. Generate the application with `khipster` ## Using Docker diff --git a/generators/entity-server/cleanup.js b/generators/entity-server/cleanup.js index d37370fc5..f31966c92 100644 --- a/generators/entity-server/cleanup.js +++ b/generators/entity-server/cleanup.js @@ -27,7 +27,7 @@ function cleanupOldFiles(generator, javaDir, testDir) { if (generator.isJhipsterVersionLessThan('7.6.1')) { if (generator.searchEngineElasticsearch) { - generator.removeFile(`${javaDir}/repository/search/SortToFieldSortBuilderConverter.kt`); + generator.removeFile(`${javaDir}/repository/search/SortToFieldSortBuilderConverter.kt`); } } if (generator.isJhipsterVersionLessThan('7.7.1')) { diff --git a/generators/server/files.js b/generators/server/files.js index dbb646911..2ef4b17ce 100644 --- a/generators/server/files.js +++ b/generators/server/files.js @@ -363,7 +363,6 @@ async function updateGradle(generator) { _this.fs.write(fullPath, content.replace('classes/java/main', 'classes/kotlin/main')); } - module.exports = { writeFiles, serverFiles, diff --git a/package.json b/package.json index 21e0fe408..ea3deb2d9 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,14 @@ }, "license": "Apache-2.0", "author": "Sendil Kumar N (https://sendilkumarn.com)", - "bin": { - "khipster": "cli/khipster.js" - }, "exports": { "./cli/": "./cli/*", "./package.json": "./package.json", "./esm/generators/*": "./generators/*/esm.mjs" }, + "bin": { + "khipster": "cli/khipster.js" + }, "files": [ "cli", "generators", @@ -35,16 +35,16 @@ "!**/*.spec.?(c|m)js" ], "scripts": { - "prettier:format": "prettier --write \"{,**/}*.{js,json,md,yml}\"", "completion": "tabtab install --name jhipster --auto", - "lint": "npm run eslint && npm run ejs-lint", - "lint-fix": "npm run prettier:format && npm run eslint -- --fix", - "eslint": "eslint . --ext .js,.cjs,.mjs", "ejs-lint": "mocha test/ejslint.js", "ejslint": "ejslint", + "eslint": "eslint . --ext .js,.cjs,.mjs", + "lint": "npm run eslint && npm run ejs-lint", + "lint-fix": "npm run prettier:format && npm run eslint -- --fix", + "prettier:format": "prettier --write \"{,**/}*.{js,json,md,yml}\"", "test": "mocha test --no-insight --forbid-only --parallel", - "update-snapshots": "npm run update-snapshot -- test generators", - "update-snapshot": "mocha --no-insight --no-parallel --updateSnapshot --" + "update-snapshot": "mocha --no-insight --no-parallel --updateSnapshot --", + "update-snapshots": "npm run update-snapshot -- test generators" }, "dependencies": { "chalk": "4.1.2", diff --git a/test-integration/workflow-samples/angular.json b/test-integration/workflow-samples/angular.json index a1cb54246..9b723ca20 100644 --- a/test-integration/workflow-samples/angular.json +++ b/test-integration/workflow-samples/angular.json @@ -1,83 +1,83 @@ { - "include": [ - { - "name": "ngx-default", - "app-sample": "ngx-default", - "entity": "sqlfull", - "sonar-analyse": "true" - }, - { - "name": "ngx-default-additional", - "entity": "none", - "app-sample": "ngx-default", - "jdl-entity": "*" - }, - { - "name": "ngx-mongodb-kafka-cucumber", - "app-sample": "ngx-mongodb-kafka-cucumber", - "entity": "mongodb", - "environment": "dev" - }, - { - "name": "ngx-gradle-fr", - "app-sample": "ngx-gradle-fr", - "entity": "sql" - }, - { - "name": "ngx-gradle-h2disk-ws-nocache", - "app-sample": "ngx-gradle-h2disk-ws-nocache", - "entity": "sql", - "environment": "dev", - "war": 1, - "testcontainers": "false" - }, - { - "name": "ngx-webflux-mongodb", - "app-sample": "webflux-mongodb", - "entity": "mongodb" - }, - { - "name": "ngx-webflux-gradle-mongodb-oauth2", - "app-sample": "webflux-mongodb-oauth2", - "entity": "mongodb" - }, - { - "name": "ngx-webflux-psql-default", - "app-sample": "webflux-psql", - "entity": "sql" - }, - { - "name": "ngx-webflux-psql-additional", - "jdl-samples": "webflux-psql,custom-domain" - }, - { - "name": "ngx-webflux-gradle-session-h2mem-es", - "app-sample": "webflux-gradle-session-h2mem-es", - "environment": "dev", - "entity": "sqllight" - }, - { - "name": "ngx-webflux-couchbase", - "app-sample": "webflux-couchbase", - "entity": "couchbase" - }, - { - "name": "ms-ngx-eureka-oauth2-mongodb-caffeine", - "jdl-samples": "ms-ngx-eureka-oauth2-mongodb-caffeine", - "extra-args": "--workspaces --monorepository", - "workspaces": "true" - }, - { - "name": "mf-ngx-eureka-jwt-psql-ehcache", - "jdl-samples": "mf-ngx-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", - "extra-args": "--workspaces --monorepository", - "workspaces": "true" - } - ] + "include": [ + { + "name": "ngx-default", + "app-sample": "ngx-default", + "entity": "sqlfull", + "sonar-analyse": "true" + }, + { + "name": "ngx-default-additional", + "entity": "none", + "app-sample": "ngx-default", + "jdl-entity": "*" + }, + { + "name": "ngx-mongodb-kafka-cucumber", + "app-sample": "ngx-mongodb-kafka-cucumber", + "entity": "mongodb", + "environment": "dev" + }, + { + "name": "ngx-gradle-fr", + "app-sample": "ngx-gradle-fr", + "entity": "sql" + }, + { + "name": "ngx-gradle-h2disk-ws-nocache", + "app-sample": "ngx-gradle-h2disk-ws-nocache", + "entity": "sql", + "environment": "dev", + "war": 1, + "testcontainers": "false" + }, + { + "name": "ngx-webflux-mongodb", + "app-sample": "webflux-mongodb", + "entity": "mongodb" + }, + { + "name": "ngx-webflux-gradle-mongodb-oauth2", + "app-sample": "webflux-mongodb-oauth2", + "entity": "mongodb" + }, + { + "name": "ngx-webflux-psql-default", + "app-sample": "webflux-psql", + "entity": "sql" + }, + { + "name": "ngx-webflux-psql-additional", + "jdl-samples": "webflux-psql,custom-domain" + }, + { + "name": "ngx-webflux-gradle-session-h2mem-es", + "app-sample": "webflux-gradle-session-h2mem-es", + "environment": "dev", + "entity": "sqllight" + }, + { + "name": "ngx-webflux-couchbase", + "app-sample": "webflux-couchbase", + "entity": "couchbase" + }, + { + "name": "ms-ngx-eureka-oauth2-mongodb-caffeine", + "jdl-samples": "ms-ngx-eureka-oauth2-mongodb-caffeine", + "extra-args": "--workspaces --monorepository", + "workspaces": "true" + }, + { + "name": "mf-ngx-eureka-jwt-psql-ehcache", + "jdl-samples": "mf-ngx-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", + "extra-args": "--workspaces --monorepository", + "workspaces": "true" + } + ] } diff --git a/test-integration/workflow-samples/react.json b/test-integration/workflow-samples/react.json index db3b654dc..bb14cd1e5 100644 --- a/test-integration/workflow-samples/react.json +++ b/test-integration/workflow-samples/react.json @@ -1,19 +1,19 @@ { - "include": [ - { - "name": "react-default", - "app-sample": "react-default", - "entity": "sqlfull" - }, - { - "name": "react-maven-h2mem-memcached", - "app-sample": "react-maven-h2mem-memcached", - "entity": "sql" - }, - { - "name": "react-gradle-cassandra-session-redis", - "app-sample": "react-gradle-cassandra-session-redis", - "entity": "cassandra" - } - ] + "include": [ + { + "name": "react-default", + "app-sample": "react-default", + "entity": "sqlfull" + }, + { + "name": "react-maven-h2mem-memcached", + "app-sample": "react-maven-h2mem-memcached", + "entity": "sql" + }, + { + "name": "react-gradle-cassandra-session-redis", + "app-sample": "react-gradle-cassandra-session-redis", + "entity": "cassandra" + } + ] } diff --git a/test-integration/workflow-samples/vue.json b/test-integration/workflow-samples/vue.json index beead8219..f45ccc6c7 100644 --- a/test-integration/workflow-samples/vue.json +++ b/test-integration/workflow-samples/vue.json @@ -1,49 +1,49 @@ { - "include": [ - { - "name": "vue-default", - "app-sample": "vue-default", - "entity": "sqlfull" - }, - { - "name": "vue-noi18n-ws-oauth2", - "app-sample": "vue-noi18n-ws-oauth2", - "entity": "sqlfull" - }, - { - "name": "vue-fulli18n-es", - "app-sample": "vue-fulli18n-es", - "entity": "sql" - }, - { - "name": "vue-gradle-ws-session", - "app-sample": "vue-gradle-ws-session", - "entity": "sql", - "environment": "dev" - }, - { - "name": "vue-ws-theme", - "app-sample": "vue-ws-theme", - "entity": "sql", - "environment": "dev" - }, - { - "name": "vue-session-cassandra-fr", - "app-sample": "vue-session-cassandra-fr", - "entity": "cassandra", - "environment": "dev" - }, - { - "name": "ms-vue-eureka-jwt-couchbase-hazelcast", - "jdl-samples": "ms-vue-eureka-jwt-couchbase-hazelcast", - "extra-args": "--workspaces --monorepository", - "workspaces": "true" - }, - { - "name": "ms-mf-vue-consul-oauth2-mysql-memcached", - "jdl-samples": "ms-mf-vue-consul-oauth2-mysql-memcached", - "extra-args": "--workspaces --monorepository", - "workspaces": "true" - } - ] + "include": [ + { + "name": "vue-default", + "app-sample": "vue-default", + "entity": "sqlfull" + }, + { + "name": "vue-noi18n-ws-oauth2", + "app-sample": "vue-noi18n-ws-oauth2", + "entity": "sqlfull" + }, + { + "name": "vue-fulli18n-es", + "app-sample": "vue-fulli18n-es", + "entity": "sql" + }, + { + "name": "vue-gradle-ws-session", + "app-sample": "vue-gradle-ws-session", + "entity": "sql", + "environment": "dev" + }, + { + "name": "vue-ws-theme", + "app-sample": "vue-ws-theme", + "entity": "sql", + "environment": "dev" + }, + { + "name": "vue-session-cassandra-fr", + "app-sample": "vue-session-cassandra-fr", + "entity": "cassandra", + "environment": "dev" + }, + { + "name": "ms-vue-eureka-jwt-couchbase-hazelcast", + "jdl-samples": "ms-vue-eureka-jwt-couchbase-hazelcast", + "extra-args": "--workspaces --monorepository", + "workspaces": "true" + }, + { + "name": "ms-mf-vue-consul-oauth2-mysql-memcached", + "jdl-samples": "ms-mf-vue-consul-oauth2-mysql-memcached", + "extra-args": "--workspaces --monorepository", + "workspaces": "true" + } + ] } From 2863f126aaefc457ab328bf61f861903d291b6ee Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 13 Jun 2024 17:21:22 -0300 Subject: [PATCH 05/10] remove generator-jhipster repo requirement --- .github/actions/compare-base/action.yml | 109 +++++++++-------- .github/actions/compare/action.yml | 56 ++++----- .github/actions/generate/action.yml | 27 ++--- .github/actions/setup/action.yml | 8 +- .github/workflows/angular.yml | 110 ++++++------------ .github/workflows/generator.yml | 6 +- .github/workflows/react.yml | 70 ++--------- test-integration/scripts/00-init-env.sh | 27 ++--- .../scripts/11-generate-config.sh | 2 +- .../scripts/12-generate-project.sh | 3 +- test-integration/scripts/14-jhipster-info.sh | 2 +- 11 files changed, 155 insertions(+), 265 deletions(-) diff --git a/.github/actions/compare-base/action.yml b/.github/actions/compare-base/action.yml index 5a6823126..a0a562ba9 100644 --- a/.github/actions/compare-base/action.yml +++ b/.github/actions/compare-base/action.yml @@ -20,61 +20,58 @@ name: 'Generate application using merge base commit to compare' description: 'Experimental generate application using merge base commit to compare action' inputs: - application-path: - description: 'Application path' - required: false - default: ${{ github.workspace }}/base/app - extra-args: - description: 'Extra arguments' - required: false - default: '' + application-path: + description: 'Application path' + required: false + default: ${{ github.workspace }}/base/app + extra-args: + description: 'Extra arguments' + required: false + default: '' outputs: - application-path: - description: 'Application path' - value: ${{ steps.base.outputs.application-path }} + application-path: + description: 'Application path' + value: ${{ steps.base.outputs.application-path }} runs: - using: 'composite' - steps: - - name: 'MERGE: Install base generator-jhipster' - run: | - if [[ "$JHI_CLI_PACKAGE" == "" ]]; then - JHI_CLI_PACKAGE=generator-jhipster - fi - mkdir -p "${{ github.workspace }}/base/$JHI_CLI_PACKAGE" - cd "${{ github.workspace }}/base/$JHI_CLI_PACKAGE" - git clone "${{ github.workspace }}/$JHI_CLI_PACKAGE" . - git checkout @~1 - git log - npm uninstall -g $JHI_CLI_PACKAGE - npm install - npm install -g . - shell: bash - - name: 'MERGE: merge base config' - id: base-config - run: $JHI_SCRIPTS/11-generate-config.sh - env: - JHI_FOLDER_APP: ${{ inputs.application-path }} - shell: bash - - name: 'MERGE: quirks' - id: quirks - run: | - # docker-compose is not reproducible, copy old config - ls "$JHI_FOLDER_APP/docker-compose" \ - && mkdir "${{ inputs.application-path }}/docker-compose" \ - && cp "$JHI_FOLDER_APP/docker-compose"/.yo-rc.json "${{ inputs.application-path }}/docker-compose" \ - || true - shell: bash - - name: 'MERGE: merge base project' - id: base - run: | - $JHI_SCRIPTS/12-generate-project.sh --skip-jhipster-dependencies --skip-install --skip-git ${{ inputs.extra-args }} - echo "::set-output name=application-path::${{inputs.application-path}}" - env: - JHI_FOLDER_APP: ${{ inputs.application-path }} - JHI_JDL_SAMPLES: "${{ github.workspace }}/base/${{ env.JHI_CLI_PACKAGE || 'generator-jhipster' }}/test-integration/jdl-samples" - shell: bash - - name: 'MERGE: merge base git' - run: | - # Copy git repository (clone without the files) - cp -a "$JHI_FOLDER_APP/.git" "${{ inputs.application-path }}" - shell: bash + using: 'composite' + steps: + - name: 'MERGE: Install base generator-jhipster' + run: | + mkdir -p "${{ github.workspace }}/base/jhipster-kotlin" + cd "${{ github.workspace }}/base/jhipster-kotlin" + git clone "${{ github.workspace }}/jhipster-kotlin" . + git checkout @~1 + git log + npm install + cp "${{ github.workspace }}/jhipster-kotlin"/cli/khipster.js cli/ + shell: bash + - name: 'MERGE: merge base config' + id: base-config + run: $KHI_SCRIPTS/11-generate-config.sh + env: + JHI_FOLDER_APP: ${{ inputs.application-path }} + KHI_FOLDER_APP: ${{ inputs.application-path }} + shell: bash + - name: 'MERGE: quirks' + id: quirks + run: | + # docker-compose is not reproducible, copy old config + ls "${{ github.workspace }}/app//docker-compose" \ + && mkdir "${{ inputs.application-path }}/docker-compose" \ + && cp "${{ github.workspace }}/app/docker-compose"/.yo-rc.json "${{ inputs.application-path }}/docker-compose" \ + || true + shell: bash + - name: 'MERGE: merge base project' + id: base + run: | + $KHI_SCRIPTS/12-generate-project.sh --skip-jhipster-dependencies --skip-install --skip-git ${{ inputs.extra-args }} + echo "::set-output name=application-path::${{inputs.application-path}}" + env: + JHI_FOLDER_APP: ${{ inputs.application-path }} + KHI_FOLDER_APP: ${{ inputs.application-path }} + shell: bash + - name: 'MERGE: merge base git' + run: | + # Copy git repository (clone without the files) + cp -a "${{ github.workspace }}/app/.git" "${{ inputs.application-path }}" + shell: bash diff --git a/.github/actions/compare/action.yml b/.github/actions/compare/action.yml index 0f7f2be5f..35b312dda 100644 --- a/.github/actions/compare/action.yml +++ b/.github/actions/compare/action.yml @@ -20,33 +20,33 @@ name: 'Compare generated applications' description: 'Experimental compare generated applications action' inputs: - application-path: - description: 'Application path' - required: false - default: ${{ github.workspace }}/base/app + application-path: + description: 'Application path' + required: false + default: ${{ github.workspace }}/base/app outputs: - equals: - description: "Generated source didn't changed" - value: ${{ steps.compare.outputs.equals }} - has-changes: - description: 'Generated source has changed' - value: ${{ steps.compare.outputs.has-changes }} + equals: + description: "Generated source didn't changed" + value: ${{ steps.compare.outputs.equals }} + has-changes: + description: 'Generated source has changed' + value: ${{ steps.compare.outputs.has-changes }} runs: - using: 'composite' - steps: - - name: 'MERGE: merge project diff' - id: compare - working-directory: ${{inputs.application-path}} - run: | - git log - # File keystore.p12 always changes - # File package-lock.json is not generated - # 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/**' - 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' \ - && echo "::set-output name=equals::true" \ - || echo "::set-output name=has-changes::true" - shell: bash + using: 'composite' + steps: + - name: 'MERGE: merge project diff' + id: compare + working-directory: ${{inputs.application-path}} + run: | + git log + # File keystore.p12 always changes + # File package-lock.json is not generated + # 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/**' + 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' \ + && echo "::set-output name=equals::true" \ + || echo "::set-output name=has-changes::true" + shell: bash diff --git a/.github/actions/generate/action.yml b/.github/actions/generate/action.yml index 0adca93ec..434176029 100644 --- a/.github/actions/generate/action.yml +++ b/.github/actions/generate/action.yml @@ -20,19 +20,16 @@ name: 'Generate' description: 'Generate application for test-integration scripts' inputs: - extra-args: - description: 'Extra arguments' - required: false - default: '' + extra-args: + description: 'Extra arguments' + required: false + default: '' runs: - using: 'composite' - steps: - - name: 'GENERATION: install executable' - run: $JHI_SCRIPTS/10-install-jhipster.sh - shell: bash - - name: 'GENERATION: generate config' - run: $JHI_SCRIPTS/11-generate-config.sh - shell: bash - - name: 'GENERATION: project' - run: $JHI_SCRIPTS/12-generate-project.sh --skip-jhipster-dependencies ${{ inputs.extra-args }} - shell: bash + using: 'composite' + steps: + - name: 'GENERATION: generate config' + run: $KHI_SCRIPTS/11-generate-config.sh + shell: bash + - name: 'GENERATION: project' + run: $KHI_SCRIPTS/12-generate-project.sh --skip-jhipster-dependencies ${{ inputs.extra-args }} + shell: bash diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 1d5835310..d20efdf99 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -91,7 +91,7 @@ inputs: executable: description: 'Executable' required: false - default: khipster + default: khipster.js outputs: java-version: description: 'Java version' @@ -123,7 +123,7 @@ runs: echo "KHI_INTEG=$KHI_INTEG" >> $GITHUB_ENV echo "KHI_SCRIPTS=$KHI_SCRIPTS" >> $GITHUB_ENV echo "KHI_HOME=$KHI_HOME" >> $GITHUB_ENV - echo "JHI_SCRIPTS=$JHI_SCRIPTS" >> $GITHUB_ENV + echo "KHI_SCRIPTS=$KHI_SCRIPTS" >> $GITHUB_ENV echo "KHI_CLI_PACKAGE_PATH=$KHI_CLI_PACKAGE_PATH" >> $GITHUB_ENV echo "KHI_CLI_PACKAGE=$KHI_CLI_PACKAGE" >> $GITHUB_ENV echo "JHI_INTEG=$JHI_INTEG" >> $GITHUB_ENV @@ -185,11 +185,11 @@ runs: echo "==============================" shell: bash - name: 'ENV: display variables' - run: $JHI_SCRIPTS/01-display-configuration.sh + run: $KHI_SCRIPTS/01-display-configuration.sh shell: bash - name: 'SETUP: Create required structure' run: mkdir -p $KHI_FOLDER_APP shell: bash - name: 'SETUP: configure git' - run: $JHI_SCRIPTS/04-git-config.sh + run: $KHI_SCRIPTS/04-git-config.sh shell: bash diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index bb25039c3..b6acefc3b 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -24,13 +24,8 @@ concurrency: cancel-in-progress: true on: push: - branches-ignore: - - 'dependabot/**' - - 'skip_ci*' - paths-ignore: - - 'package*.json' - - 'generators/*client/templates/react/**' - - 'generators/*client/templates/vue/**' + branches: + - main pull_request: types: [closed, opened, synchronize, reopened] branches: @@ -55,7 +50,7 @@ jobs: id: build uses: ./.github/actions/build-matrix with: - workflow-samples-file: angular + workflow-samples-file: angular applications: name: ${{ matrix.name }} runs-on: ${{ matrix.os || 'ubuntu-20.04' }} @@ -88,12 +83,17 @@ jobs: with: path: jhipster-kotlin fetch-depth: 2 - - name: Checkout JHipster repo - uses: actions/checkout@v3 + - run: npm install + working-directory: jhipster-kotlin + # workspaces fork the process and lookup blueprints again, link globally to be findable + - run: npm link + if: matrix.workspaces == 'true' + working-directory: jhipster-kotlin + - uses: jhipster/actions/setup-runner@v0 with: - repository: jhipster/generator-jhipster - path: generator-jhipster - ref: v7.9.3 + node-version: 16 + java-version: 11 + binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli - name: 'SETUP: environment' id: setup uses: ./jhipster-kotlin/.github/actions/setup @@ -104,56 +104,10 @@ jobs: jdl-sample: ${{ matrix.jdl-samples || '' }} application-environment: ${{ matrix.environment || 'prod' }} application-packaging: ${{ (matrix.war == 1 && 'war') || 'jar' }} - - uses: actions/setup-node@v3 - with: - node-version: ${{ steps.setup.outputs.node-version }} - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ steps.setup.outputs.java-version }} - - name: 'SETUP: load npm cache' - uses: actions/cache@v3 - with: - path: | - ~/.npm - ~/.cache/Cypress/ - key: ${{ runner.os }}-node-${{ steps.setup.outputs.date }}-${{ matrix.npm-cache || 'angular' }}-${{ hashFiles('jhipster-kotlin/package-lock.json', 'jhipster-kotlin/**/package.json') }} - restore-keys: | - ${{ runner.os }}-node-${{ steps.setup.outputs.date }}-${{ matrix.npm-cache || 'angular' }}- - ${{ runner.os }}-node-${{ steps.setup.outputs.date }}- - ${{ runner.os }}-node-${{ steps.setup.outputs.date }} - - name: 'SETUP: load maven cache' - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ steps.setup.outputs.date }}-${{ hashFiles('jhipster-kotlin/**/pom.xml.ejs') }} - restore-keys: | - ${{ runner.os }}-maven-${{ steps.setup.outputs.date }}- - ${{ runner.os }}-maven-${{ steps.setup.outputs.date }} - - name: 'SETUP: load gradle cache' - if: matrix.workspaces == 'true' || matrix.gradle == 1 || contains(matrix.name, 'gradle') - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ steps.setup.outputs.date }}-${{ hashFiles('jhipster-kotlin/**/build.gradle.ejs') }} - restore-keys: | - ${{ runner.os }}-gradle-${{ steps.setup.outputs.date }}- - ${{ runner.os }}-gradle-${{ steps.setup.outputs.date }} - - name: 'TOOLS: configure tools installed by the system' - run: $KHI_SCRIPTS/03-system.sh - - name: 'TOOLS: configure git' - run: $KHI_SCRIPTS/04-git-config.sh # Update global NPM for workspaces support - - name: 'Install required NPM version' - if: matrix.workspaces == 'true' - run: npm install -g npm@${{ steps.setup.outputs.npm-version }} || true #---------------------------------------------------------------------- # Install JHipster and generate project+entities #---------------------------------------------------------------------- - - name: 'GENERATION: install JHipster' - run: $KHI_SCRIPTS/10-install-jhipster.sh - name: 'GENERATION: config' run: $KHI_SCRIPTS/11-generate-config.sh - name: 'GENERATION: project' @@ -174,14 +128,14 @@ jobs: if: >- github.event.pull_request && !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare') - uses: ./generator-jhipster-kotlin/.github/actions/compare-base + uses: ./jhipster-kotlin/.github/actions/compare-base with: extra-args: '--skip-jhipster-dependencies ${{ matrix.extra-args }}' - name: 'MERGE: compare changes' continue-on-error: true id: compare if: steps.base-app.outcome == 'success' - uses: ./generator-jhipster-kotlin/.github/actions/compare + uses: ./jhipster-kotlin/.github/actions/compare with: application-path: ${{ steps.base-app.outputs.application-path }} #---------------------------------------------------------------------- @@ -190,24 +144,30 @@ jobs: - name: 'PREPARE: npm install' if: steps.compare.outputs.equals != 'true' run: ${{ (matrix.workspaces == 'true' && 'npm') || './npmw' }} install + timeout-minutes: 7 - name: 'TESTS: backend' id: backend if: steps.compare.outputs.equals != 'true' && matrix.skip-backend-tests != 1 && needs.build-matrix.outputs.server != 'false' 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: packaging' if: steps.compare.outputs.equals != 'true' run: npm run ci:e2e:package + timeout-minutes: 7 - name: 'TESTS: Start docker-compose containers for e2e tests' if: steps.compare.outputs.equals != 'true' run: npm run ci:e2e:prepare + timeout-minutes: 5 - name: 'E2E: Run' id: e2e if: steps.compare.outputs.equals != 'true' run: npm run ci:e2e:run --if-present + timeout-minutes: 20 - name: 'BACKEND: Store failure logs' uses: actions/upload-artifact@v3 if: always() && steps.backend.outcome == 'failure' @@ -225,21 +185,21 @@ jobs: uses: jwalton/gh-docker-logs@v2 - name: 'ANALYSIS: Sonar analysis' if: >- - github.event_name == 'push' && - github.repository == 'jhipster/generator-jhipster' && - matrix.sonar-analyse == 'true' && - steps.compare.outputs.equals != 'true' && - matrix.workspaces != 'true' && - matrix.skip-frontend-tests != 1 && - needs.build-matrix.outputs.client != 'false' && - matrix.skip-backend-tests != 1 && - needs.build-matrix.outputs.server != 'false' + github.event_name == 'push' && + github.repository == 'jhipster/generator-jhipster' && + matrix.sonar-analyse == 'true' && + steps.compare.outputs.equals != 'true' && + matrix.workspaces != 'true' && + matrix.skip-frontend-tests != 1 && + needs.build-matrix.outputs.client != 'false' && + matrix.skip-backend-tests != 1 && + needs.build-matrix.outputs.server != 'false' run: | - ./mvnw -ntp --batch-mode initialize org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar \ - -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.projectKey=jhipster-sample-application \ - -Dsonar.organization=jhipster \ - -Dsonar.login=$SONAR_TOKEN + ./mvnw -ntp --batch-mode initialize org.jacoco:jacoco-maven-plugin:prepare-agent sonar:sonar \ + -Dsonar.host.url=https://sonarcloud.io \ + -Dsonar.projectKey=jhipster-sample-application \ + -Dsonar.organization=jhipster \ + -Dsonar.login=$SONAR_TOKEN env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} check-angular: diff --git a/.github/workflows/generator.yml b/.github/workflows/generator.yml index 029595d61..a8b7e9194 100644 --- a/.github/workflows/generator.yml +++ b/.github/workflows/generator.yml @@ -53,14 +53,12 @@ jobs: restore-keys: | ${{ runner.os }}-node-${{ steps.get-date.outputs.date }}- ${{ runner.os }}-node-${{ steps.get-date.outputs.date }} - - name: 'install required npm version' - run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);") - run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit shell: bash - name: Config git variables env: - JHI_SCRIPTS: ./test-integration/scripts - run: $JHI_SCRIPTS/04-git-config.sh + KHI_SCRIPTS: ./test-integration/scripts + run: $KHI_SCRIPTS/04-git-config.sh shell: bash - run: npm ci - run: npm i -g . diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index 8f1bba441..5597e6c1c 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -24,13 +24,8 @@ concurrency: cancel-in-progress: true on: push: - branches-ignore: - - 'dependabot/**' - - 'skip_ci*' - paths-ignore: - - 'package*.json' - - 'generators/*client/templates/angular/**' - - 'generators/*client/templates/vue/**' + branches: + - main pull_request: types: [closed, opened, synchronize, reopened] branches: @@ -89,12 +84,13 @@ jobs: with: path: jhipster-kotlin fetch-depth: 2 - - name: Checkout JHipster repo - uses: actions/checkout@v3 + - run: npm install + working-directory: jhipster-kotlin + - uses: jhipster/actions/setup-runner@v0 with: - repository: jhipster/generator-jhipster - path: generator-jhipster - ref: v7.9.3 + node-version: 16 + java-version: 11 + binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli - name: 'SETUP: environment' id: setup uses: ./jhipster-kotlin/.github/actions/setup @@ -105,56 +101,10 @@ jobs: jdl-sample: ${{ matrix.jdl-samples || '' }} application-environment: ${{ matrix.environment || 'prod' }} application-packaging: ${{ (matrix.war == 1 && 'war') || 'jar' }} - - uses: actions/setup-node@v3 - with: - node-version: ${{ steps.setup.outputs.node-version }} - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ steps.setup.outputs.java-version }} - - name: 'SETUP: load npm cache' - uses: actions/cache@v3 - with: - path: | - ~/.npm - ~/.cache/Cypress/ - key: ${{ runner.os }}-node-${{ steps.setup.outputs.date }}-${{ matrix.npm-cache || 'react' }}-${{ hashFiles('jhipster-kotlin/package-lock.json', 'jhipster-kotlin/**/package.json') }} - restore-keys: | - ${{ runner.os }}-node-${{ steps.setup.outputs.date }}-${{ matrix.npm-cache || 'react' }}- - ${{ runner.os }}-node-${{ steps.setup.outputs.date }}- - ${{ runner.os }}-node-${{ steps.setup.outputs.date }} - - name: 'SETUP: load maven cache' - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ steps.setup.outputs.date }}-${{ hashFiles('jhipster-kotlin/**/pom.xml.ejs') }} - restore-keys: | - ${{ runner.os }}-maven-${{ steps.setup.outputs.date }}- - ${{ runner.os }}-maven-${{ steps.setup.outputs.date }} - - name: 'SETUP: load gradle cache' - if: matrix.workspaces == 'true' || matrix.gradle == 1 || contains(matrix.name, 'gradle') - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ steps.setup.outputs.date }}-${{ hashFiles('jhipster-kotlin/**/build.gradle.ejs') }} - restore-keys: | - ${{ runner.os }}-gradle-${{ steps.setup.outputs.date }}- - ${{ runner.os }}-gradle-${{ steps.setup.outputs.date }} - - name: 'TOOLS: configure tools installed by the system' - run: $KHI_SCRIPTS/03-system.sh - - name: 'TOOLS: configure git' - run: $KHI_SCRIPTS/04-git-config.sh # Update global NPM for workspaces support - - name: 'Install required NPM version' - if: matrix.workspaces == 'true' - run: npm install -g npm@${{ steps.setup.outputs.npm-version }} || true #---------------------------------------------------------------------- # Install JHipster and generate project+entities #---------------------------------------------------------------------- - - name: 'GENERATION: install JHipster' - run: $KHI_SCRIPTS/10-install-jhipster.sh - name: 'GENERATION: config' run: $KHI_SCRIPTS/11-generate-config.sh - name: 'GENERATION: project' @@ -201,7 +151,7 @@ jobs: - 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: 15 + timeout-minutes: 8 - name: 'TESTS: packaging' if: steps.compare.outputs.equals != 'true' run: npm run ci:e2e:package @@ -214,7 +164,7 @@ jobs: id: e2e if: steps.compare.outputs.equals != 'true' run: npm run ci:e2e:run --if-present - timeout-minutes: 30 + timeout-minutes: 20 - name: 'BACKEND: Store failure logs' uses: actions/upload-artifact@v3 if: always() && steps.backend.outcome == 'failure' diff --git a/test-integration/scripts/00-init-env.sh b/test-integration/scripts/00-init-env.sh index f71438a35..1d55046cd 100755 --- a/test-integration/scripts/00-init-env.sh +++ b/test-integration/scripts/00-init-env.sh @@ -56,7 +56,7 @@ if [[ "$KHI_INTEG" == "" ]]; then fi if [[ "$JHI_SAMPLES" == "" ]]; then - JHI_SAMPLES="$JHI_INTEG"/samples + JHI_SAMPLES="$KHI_INTEG"/samples fi if [[ -d "$JHI_SAMPLES"/.jhipster ]]; then @@ -67,7 +67,7 @@ fi # folder for jdls samples if [[ "$JHI_JDL_SAMPLES" == "" ]]; then - JHI_JDL_SAMPLES="$JHI_INTEG"/jdl-samples + JHI_JDL_SAMPLES="$KHI_INTEG"/jdl-samples fi # folder for scripts @@ -81,12 +81,7 @@ if [[ "$KHI_FOLDER_APP" == "" ]]; then fi if [[ "$KHI_CLI" == "" ]]; then - KHI_CLI=khipster -fi - -# jdk version -if [[ "$JHI_JDK" == "" ]]; then - JHI_JDK=$(grep -o "JAVA_VERSION = '[^']*'" $JHI_CLONED_HOME/generators/generator-constants.js | cut -f2 -d "'") + KHI_CLI=khipster.js fi # set correct OpenJDK version @@ -94,27 +89,21 @@ if [[ "$JHI_JDK" == "11" && "$JHI_GITHUB_CI" != "true" ]]; then JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::") fi -# node version -JHI_NODE_VERSION=$(grep -o "NODE_VERSION = '[^']*'" $JHI_CLONED_HOME/generators/generator-constants.js | cut -f2 -d "'") - -# npm version -JHI_NPM_VERSION=$(grep -o '"npm": "[^"]*"' $JHI_CLONED_HOME/generators/common/templates/package.json | cut -f4 -d '"') - # folder for generator-jhipster test-integration if [[ "$JHI_INTEG" == "" ]]; then - JHI_INTEG="$JHI_CLONED_HOME"/test-integration + JHI_INTEG="$JHI_HOME"/test-integration fi # folder for generator-jhipster samples if [[ "$JHI_SAMPLES" == "" ]]; then - JHI_SAMPLES="$JHI_INTEG"/samples + JHI_SAMPLES="$KHI_INTEG"/samples fi # folder for generator-jhipster scripts -if [[ "$JHI_SCRIPTS" == "" ]]; then - JHI_SCRIPTS="$JHI_INTEG"/scripts +if [[ "$KHI_SCRIPTS" == "" ]]; then + KHI_SCRIPTS="$KHI_INTEG"/scripts fi # generator-jhipster version -JHI_VERSION=$(grep -o '"version": "[^"]*"' $JHI_HOME/package.json | cut -f4 -d '"') +# JHI_VERSION=$(grep -o '"version": "[^"]*"' $JHI_HOME/package.json | cut -f4 -d '"') diff --git a/test-integration/scripts/11-generate-config.sh b/test-integration/scripts/11-generate-config.sh index e73bce7e7..1eb8a6d69 100755 --- a/test-integration/scripts/11-generate-config.sh +++ b/test-integration/scripts/11-generate-config.sh @@ -189,7 +189,7 @@ fi # Generate jdl entities #------------------------------------------------------------------------------- if [[ "$JHI_JDL_ENTITY" != "" && "$JHI_JDL_ENTITY" != "none" ]]; then - khipster --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$JHI_JDL_ENTITY.jdl --json-only + khipster.js --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$JHI_JDL_ENTITY.jdl --json-only fi #------------------------------------------------------------------------------- diff --git a/test-integration/scripts/12-generate-project.sh b/test-integration/scripts/12-generate-project.sh index 8b68bfca1..50cb4be65 100755 --- a/test-integration/scripts/12-generate-project.sh +++ b/test-integration/scripts/12-generate-project.sh @@ -53,8 +53,7 @@ elif [[ "$JHI_APP" == "jdl" ]]; then ls -la "$KHI_FOLDER_APP"/ cd "$KHI_FOLDER_APP" - npm link generator-jhipster-kotlin - eval "$KHI_CLI import-jdl *.jdl --no-insight $@" + eval "$KHI_CLI jdl *.jdl --no-insight $@" else diff --git a/test-integration/scripts/14-jhipster-info.sh b/test-integration/scripts/14-jhipster-info.sh index 045316ab6..cb3d1f898 100755 --- a/test-integration/scripts/14-jhipster-info.sh +++ b/test-integration/scripts/14-jhipster-info.sh @@ -4,4 +4,4 @@ set -e source $(dirname $0)/00-init-env.sh cd "$KHI_FOLDER_APP" -khipster info +khipster.js info From 5bbb17583549d4456f54415e95e8465e76305dd6 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 13 Jun 2024 20:22:28 -0300 Subject: [PATCH 06/10] rename cli to cli.cjs to match generate-blueprint for easier maintenace --- .github/actions/compare-base/action.yml | 2 +- .github/actions/setup/action.yml | 2 +- cli/{khipster.js => cli.cjs} | 0 package-lock.json | 2 +- package.json | 2 +- test-integration/scripts/00-init-env.sh | 2 +- test-integration/scripts/11-generate-config.sh | 2 +- test-integration/scripts/14-jhipster-info.sh | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename cli/{khipster.js => cli.cjs} (100%) diff --git a/.github/actions/compare-base/action.yml b/.github/actions/compare-base/action.yml index a0a562ba9..67f136d34 100644 --- a/.github/actions/compare-base/action.yml +++ b/.github/actions/compare-base/action.yml @@ -43,7 +43,7 @@ runs: git checkout @~1 git log npm install - cp "${{ github.workspace }}/jhipster-kotlin"/cli/khipster.js cli/ + cp "${{ github.workspace }}/jhipster-kotlin"/cli/cli.cjs cli/ shell: bash - name: 'MERGE: merge base config' id: base-config diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index d20efdf99..04ce23a53 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -91,7 +91,7 @@ inputs: executable: description: 'Executable' required: false - default: khipster.js + default: cli.cjs outputs: java-version: description: 'Java version' diff --git a/cli/khipster.js b/cli/cli.cjs similarity index 100% rename from cli/khipster.js rename to cli/cli.cjs diff --git a/package-lock.json b/package-lock.json index 5a6f404ef..8a8ad50c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "yeoman-generator": "5.7.0" }, "bin": { - "khipster": "cli/khipster.js" + "khipster": "cli/cli.cjs" }, "devDependencies": { "chai": "4.3.6", diff --git a/package.json b/package.json index ea3deb2d9..70b889b53 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "./esm/generators/*": "./generators/*/esm.mjs" }, "bin": { - "khipster": "cli/khipster.js" + "khipster": "cli/cli.cjs" }, "files": [ "cli", diff --git a/test-integration/scripts/00-init-env.sh b/test-integration/scripts/00-init-env.sh index 1d55046cd..ae1f69662 100755 --- a/test-integration/scripts/00-init-env.sh +++ b/test-integration/scripts/00-init-env.sh @@ -81,7 +81,7 @@ if [[ "$KHI_FOLDER_APP" == "" ]]; then fi if [[ "$KHI_CLI" == "" ]]; then - KHI_CLI=khipster.js + KHI_CLI=cli.cjs fi # set correct OpenJDK version diff --git a/test-integration/scripts/11-generate-config.sh b/test-integration/scripts/11-generate-config.sh index 1eb8a6d69..2b95ea090 100755 --- a/test-integration/scripts/11-generate-config.sh +++ b/test-integration/scripts/11-generate-config.sh @@ -189,7 +189,7 @@ fi # Generate jdl entities #------------------------------------------------------------------------------- if [[ "$JHI_JDL_ENTITY" != "" && "$JHI_JDL_ENTITY" != "none" ]]; then - khipster.js --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$JHI_JDL_ENTITY.jdl --json-only + cli.cjs --no-insight jdl "$JHI_SAMPLES"/jdl-entities/$JHI_JDL_ENTITY.jdl --json-only fi #------------------------------------------------------------------------------- diff --git a/test-integration/scripts/14-jhipster-info.sh b/test-integration/scripts/14-jhipster-info.sh index cb3d1f898..683e4c281 100755 --- a/test-integration/scripts/14-jhipster-info.sh +++ b/test-integration/scripts/14-jhipster-info.sh @@ -4,4 +4,4 @@ set -e source $(dirname $0)/00-init-env.sh cd "$KHI_FOLDER_APP" -khipster.js info +cli.cjs info From 5b474467395a92f1816ac28c9627db63ac74f892 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 14 Jun 2024 13:34:34 -0300 Subject: [PATCH 07/10] rework compare-base action --- .github/actions/compare-base/action.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/actions/compare-base/action.yml b/.github/actions/compare-base/action.yml index 67f136d34..7c476205f 100644 --- a/.github/actions/compare-base/action.yml +++ b/.github/actions/compare-base/action.yml @@ -37,13 +37,10 @@ runs: steps: - name: 'MERGE: Install base generator-jhipster' run: | - mkdir -p "${{ github.workspace }}/base/jhipster-kotlin" - cd "${{ github.workspace }}/base/jhipster-kotlin" - git clone "${{ github.workspace }}/jhipster-kotlin" . - git checkout @~1 - git log + cd "${{ github.workspace }}/jhipster-kotlin" + git restore -s @~1 . npm install - cp "${{ github.workspace }}/jhipster-kotlin"/cli/cli.cjs cli/ + git checkout cli/cli.cjs shell: bash - name: 'MERGE: merge base config' id: base-config From 9b1c15e928eebaca61aac10e8725fc49f7bfa7d8 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 14 Jun 2024 13:47:34 -0300 Subject: [PATCH 08/10] Update action.yml --- .github/actions/compare-base/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/compare-base/action.yml b/.github/actions/compare-base/action.yml index 7c476205f..a6184c088 100644 --- a/.github/actions/compare-base/action.yml +++ b/.github/actions/compare-base/action.yml @@ -40,7 +40,8 @@ runs: cd "${{ github.workspace }}/jhipster-kotlin" git restore -s @~1 . npm install - git checkout cli/cli.cjs + # use updated cli, scripts and samples + git checkout cli/cli.cjs test-integration shell: bash - name: 'MERGE: merge base config' id: base-config From 408c1efba239cfef2b6dbe0562fcc1cca6a879c5 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 14 Jun 2024 13:58:14 -0300 Subject: [PATCH 09/10] skip ktlint in samples --- test-integration/scripts/12-generate-project.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-integration/scripts/12-generate-project.sh b/test-integration/scripts/12-generate-project.sh index 50cb4be65..58889b0c6 100755 --- a/test-integration/scripts/12-generate-project.sh +++ b/test-integration/scripts/12-generate-project.sh @@ -23,7 +23,7 @@ if [[ "$JHI_ENTITY" == "jdl" ]]; then done cd "$KHI_FOLDER_APP" ls -la "$KHI_FOLDER_APP"/ - eval "$KHI_CLI import-jdl *.jdl --no-insight $@" + eval "$KHI_CLI import-jdl *.jdl --no-insight --skip-ktlint-format $@" elif [[ "$JHI_APP" == "jdl" ]]; then #------------------------------------------------------------------------------- @@ -53,7 +53,7 @@ elif [[ "$JHI_APP" == "jdl" ]]; then ls -la "$KHI_FOLDER_APP"/ cd "$KHI_FOLDER_APP" - eval "$KHI_CLI jdl *.jdl --no-insight $@" + eval "$KHI_CLI jdl *.jdl --no-insight --skip-ktlint-format $@" else @@ -67,7 +67,7 @@ else echo "skipping config file" fi cd "$KHI_FOLDER_APP" - eval "$KHI_CLI --force --no-insight --skip-checks --with-entities $@" + eval "$KHI_CLI --force --no-insight --skip-checks --with-entities --skip-ktlint-format $@" fi From 3aeca2be35b4a531d2b7449b98505104d3b94c2e Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 17 Jun 2024 15:24:44 -0300 Subject: [PATCH 10/10] run prettier in entities samples --- .prettierignore | 1 - test-integration/samples/.jhipster/Album.json | 69 +++--- .../samples/.jhipster/Artist.json | 28 +-- .../samples/.jhipster/BankAccount.json | 66 +++--- .../samples/.jhipster/CassBankAccount.json | 40 ++-- .../samples/.jhipster/Division.json | 70 +++--- .../.jhipster/DocumentBankAccount.json | 54 ++--- .../samples/.jhipster/EmbeddedOperation.json | 42 ++-- .../samples/.jhipster/EntityWithDTO.json | 16 +- .../.jhipster/EntityWithPaginationAndDTO.json | 16 +- .../EntityWithServiceClassAndPagination.json | 16 +- ...ntityWithServiceClassPaginationAndDTO.json | 16 +- .../EntityWithServiceImplAndDTO.json | 16 +- .../EntityWithServiceImplAndPagination.json | 16 +- ...EntityWithServiceImplPaginationAndDTO.json | 16 +- .../samples/.jhipster/FieldTestEntity.json | 209 +++++++++--------- .../.jhipster/FieldTestEnumWithValue.json | 36 +-- .../FieldTestInfiniteScrollEntity.json | 195 ++++++++-------- ...eldTestMapstructAndServiceClassEntity.json | 185 ++++++++-------- .../.jhipster/FieldTestPaginationEntity.json | 195 ++++++++-------- ...TestServiceClassAndJpaFilteringEntity.json | 187 ++++++++-------- .../.jhipster/FieldTestServiceImplEntity.json | 195 ++++++++-------- test-integration/samples/.jhipster/Genre.json | 28 +-- .../.jhipster/JpaFilteringOtherSide.json | 110 ++++----- .../.jhipster/JpaFilteringRelationship.json | 146 ++++++------ test-integration/samples/.jhipster/Label.json | 43 ++-- .../.jhipster/MapsIdChildEntityWithDTO.json | 58 ++--- .../MapsIdChildEntityWithoutDTO.json | 58 ++--- .../MapsIdGrandchildEntityWithDTO.json | 44 ++-- .../MapsIdGrandchildEntityWithoutDTO.json | 44 ++-- .../.jhipster/MapsIdParentEntityWithDTO.json | 40 ++-- .../MapsIdParentEntityWithoutDTO.json | 40 ++-- .../.jhipster/MapsIdUserProfileWithDTO.json | 44 ++-- .../.jhipster/MicroserviceBankAccount.json | 56 ++--- .../samples/.jhipster/MicroserviceLabel.json | 36 +-- .../.jhipster/MicroserviceOperation.json | 54 ++--- .../samples/.jhipster/Operation.json | 56 ++--- test-integration/samples/.jhipster/Place.json | 64 +++--- .../.jhipster/SuperMegaLargeTestEntity.json | 116 +++++----- .../.jhipster/TestCustomTableName.json | 118 +++++----- .../samples/.jhipster/TestEntity.json | 116 +++++----- .../samples/.jhipster/TestInfiniteScroll.json | 88 ++++---- .../.jhipster/TestManyRelPaginDTO.json | 100 ++++----- .../samples/.jhipster/TestManyToMany.json | 130 +++++------ .../samples/.jhipster/TestManyToOne.json | 116 +++++----- .../samples/.jhipster/TestMapstruct.json | 126 +++++------ .../samples/.jhipster/TestOneToOne.json | 130 +++++------ .../samples/.jhipster/TestPagination.json | 88 ++++---- .../samples/.jhipster/TestServiceClass.json | 90 ++++---- .../samples/.jhipster/TestServiceImpl.json | 90 ++++---- .../TestTwoRelationshipsSameEntity.json | 84 +++---- test-integration/samples/.jhipster/Track.json | 44 ++-- 52 files changed, 2055 insertions(+), 1986 deletions(-) diff --git a/.prettierignore b/.prettierignore index adacca64d..b79b7970f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,6 +2,5 @@ node_modules travis docs .git -.jhipster .vscode **/templates/**/ diff --git a/test-integration/samples/.jhipster/Album.json b/test-integration/samples/.jhipster/Album.json index 1d2fef46d..5e5bfa353 100644 --- a/test-integration/samples/.jhipster/Album.json +++ b/test-integration/samples/.jhipster/Album.json @@ -1,34 +1,39 @@ { - "applications": "*", - "changelogDate": "20200417191023", - "clientRootFolder": "", - "dto": "no", - "embedded": false, - "entityTableName": "album", - "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "name": "Album", - "pagination": "no", - "readOnly": false, - "relationships": [ - { - "otherEntityField": "name", - "otherEntityName": "artist", - "otherEntityRelationshipName": "album", - "ownerSide": true, - "relationshipName": "artist", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "name", - "otherEntityName": "genre", - "otherEntityRelationshipName": "album", - "ownerSide": true, - "relationshipName": "genre", - "relationshipType": "one-to-one" - }, - { "otherEntityName": "track", "otherEntityRelationshipName": "album", "relationshipName": "track", "relationshipType": "one-to-many" } - ], - "service": "no" + "applications": "*", + "changelogDate": "20200417191023", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "album", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Album", + "pagination": "no", + "readOnly": false, + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "artist", + "otherEntityRelationshipName": "album", + "ownerSide": true, + "relationshipName": "artist", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "name", + "otherEntityName": "genre", + "otherEntityRelationshipName": "album", + "ownerSide": true, + "relationshipName": "genre", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "track", + "otherEntityRelationshipName": "album", + "relationshipName": "track", + "relationshipType": "one-to-many" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/Artist.json b/test-integration/samples/.jhipster/Artist.json index ee7bf1f6d..3970f8071 100644 --- a/test-integration/samples/.jhipster/Artist.json +++ b/test-integration/samples/.jhipster/Artist.json @@ -1,16 +1,16 @@ { - "applications": "*", - "changelogDate": "20200417190723", - "clientRootFolder": "", - "dto": "no", - "embedded": false, - "entityTableName": "artist", - "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "name": "Artist", - "pagination": "no", - "readOnly": false, - "relationships": [], - "service": "no" + "applications": "*", + "changelogDate": "20200417190723", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "artist", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Artist", + "pagination": "no", + "readOnly": false, + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/BankAccount.json b/test-integration/samples/.jhipster/BankAccount.json index 3ceca5f14..4c4c21064 100644 --- a/test-integration/samples/.jhipster/BankAccount.json +++ b/test-integration/samples/.jhipster/BankAccount.json @@ -1,35 +1,35 @@ { - "angularJSSuffix": "mySuffix", - "changelogDate": "20200804163352", - "clientRootFolder": "test-root", - "dto": "no", - "fields": [ - { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "guid", "fieldType": "UUID" }, - { "fieldName": "bankNumber", "fieldType": "Integer" }, - { "fieldName": "agencyNumber", "fieldType": "Long" }, - { "fieldName": "lastOperationDuration", "fieldType": "Float" }, - { "fieldName": "meanOperationDuration", "fieldType": "Double" }, - { "fieldName": "meanQueueDuration", "fieldType": "Duration" }, - { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "openingDay", "fieldType": "LocalDate" }, - { "fieldName": "lastOperationDate", "fieldType": "Instant" }, - { "fieldName": "active", "fieldType": "Boolean" }, - { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, - { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } - ], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "no", - "relationships": [ - { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "user", "relationshipType": "many-to-one" }, - { - "otherEntityName": "operation", - "otherEntityRelationshipName": "bankAccount", - "relationshipName": "operation", - "relationshipType": "one-to-many" - } - ], - "service": "serviceImpl" + "angularJSSuffix": "mySuffix", + "changelogDate": "20200804163352", + "clientRootFolder": "test-root", + "dto": "no", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "guid", "fieldType": "UUID" }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "meanQueueDuration", "fieldType": "Duration" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "openingDay", "fieldType": "LocalDate" }, + { "fieldName": "lastOperationDate", "fieldType": "Instant" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, + { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "user", "relationshipType": "many-to-one" }, + { + "otherEntityName": "operation", + "otherEntityRelationshipName": "bankAccount", + "relationshipName": "operation", + "relationshipType": "one-to-many" + } + ], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/CassBankAccount.json b/test-integration/samples/.jhipster/CassBankAccount.json index 933c77e4f..c03ee3141 100644 --- a/test-integration/samples/.jhipster/CassBankAccount.json +++ b/test-integration/samples/.jhipster/CassBankAccount.json @@ -1,22 +1,22 @@ { - "angularJSSuffix": "mySuffix", - "changelogDate": "20150805124839", - "dto": "mapstruct", - "fields": [ - { "fieldName": "userId", "fieldType": "UUID" }, - { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "bankNumber", "fieldType": "Integer" }, - { "fieldName": "agencyNumber", "fieldType": "Long" }, - { "fieldName": "lastOperationDuration", "fieldType": "Float" }, - { "fieldName": "meanOperationDuration", "fieldType": "Double" }, - { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "lastOperationDate", "fieldType": "Date" }, - { "fieldName": "active", "fieldType": "Boolean" }, - { "fieldName": "picture", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, - { "fieldName": "operationsFile", "fieldType": "byte[]" }, - { "fieldName": "accountType", "fieldType": "AccountTypeEnum", "fieldValues": "STANDARD,PREMIUM" } - ], - "fluentMethods": true, - "pagination": "no", - "service": "serviceImpl" + "angularJSSuffix": "mySuffix", + "changelogDate": "20150805124839", + "dto": "mapstruct", + "fields": [ + { "fieldName": "userId", "fieldType": "UUID" }, + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "lastOperationDate", "fieldType": "Date" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "picture", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { "fieldName": "operationsFile", "fieldType": "byte[]" }, + { "fieldName": "accountType", "fieldType": "AccountTypeEnum", "fieldValues": "STANDARD,PREMIUM" } + ], + "fluentMethods": true, + "pagination": "no", + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/Division.json b/test-integration/samples/.jhipster/Division.json index d0d5ca3d6..0c9d109a8 100644 --- a/test-integration/samples/.jhipster/Division.json +++ b/test-integration/samples/.jhipster/Division.json @@ -1,37 +1,37 @@ { - "changelogDate": "20170626061520", - "clientRootFolder": "test-root", - "dto": "no", - "entityTableName": "division", - "fields": [ - { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required", "unique"] }, - { "fieldName": "shortName", "fieldType": "String", "fieldValidateRules": ["unique"] }, - { "fieldName": "numberOfPeople", "fieldType": "Long" }, - { - "fieldName": "divisionType", - "fieldType": "DivisionType", - "fieldValidateRules": ["required"], - "fieldValues": "SCHOOL,CLASS,SUBGROUP" - }, - { "fieldName": "colorBackground", "fieldType": "String" }, - { "fieldName": "colorText", "fieldType": "String" } - ], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "place", - "otherEntityRelationshipName": "owner", - "relationshipName": "divisionsPlace", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "place", - "otherEntityRelationshipName": "preferredDivision", - "ownerSide": false, - "relationshipName": "preferredPlace", - "relationshipType": "many-to-many" - } - ], - "service": "no" + "changelogDate": "20170626061520", + "clientRootFolder": "test-root", + "dto": "no", + "entityTableName": "division", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required", "unique"] }, + { "fieldName": "shortName", "fieldType": "String", "fieldValidateRules": ["unique"] }, + { "fieldName": "numberOfPeople", "fieldType": "Long" }, + { + "fieldName": "divisionType", + "fieldType": "DivisionType", + "fieldValidateRules": ["required"], + "fieldValues": "SCHOOL,CLASS,SUBGROUP" + }, + { "fieldName": "colorBackground", "fieldType": "String" }, + { "fieldName": "colorText", "fieldType": "String" } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "place", + "otherEntityRelationshipName": "owner", + "relationshipName": "divisionsPlace", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "place", + "otherEntityRelationshipName": "preferredDivision", + "ownerSide": false, + "relationshipName": "preferredPlace", + "relationshipType": "many-to-many" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/DocumentBankAccount.json b/test-integration/samples/.jhipster/DocumentBankAccount.json index 64d4aa7ae..00dd50f63 100644 --- a/test-integration/samples/.jhipster/DocumentBankAccount.json +++ b/test-integration/samples/.jhipster/DocumentBankAccount.json @@ -1,29 +1,29 @@ { - "changelogDate": "20150805124838", - "dto": "mapstruct", - "fields": [ - { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "bankNumber", "fieldType": "Integer" }, - { "fieldName": "agencyNumber", "fieldType": "Long" }, - { "fieldName": "lastOperationDuration", "fieldType": "Float" }, - { "fieldName": "meanOperationDuration", "fieldType": "Double" }, - { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "openingDay", "fieldType": "LocalDate" }, - { "fieldName": "lastOperationDate", "fieldType": "Instant" }, - { "fieldName": "active", "fieldType": "Boolean" }, - { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, - { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } - ], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "embeddedOperation", - "otherEntityRelationshipName": "documentBankAccount", - "relationshipName": "embeddedOperation", - "relationshipType": "one-to-many" - } - ], - "service": "serviceImpl" + "changelogDate": "20150805124838", + "dto": "mapstruct", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "openingDay", "fieldType": "LocalDate" }, + { "fieldName": "lastOperationDate", "fieldType": "Instant" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, + { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "embeddedOperation", + "otherEntityRelationshipName": "documentBankAccount", + "relationshipName": "embeddedOperation", + "relationshipType": "one-to-many" + } + ], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/EmbeddedOperation.json b/test-integration/samples/.jhipster/EmbeddedOperation.json index c1943ec3d..cd5586c19 100644 --- a/test-integration/samples/.jhipster/EmbeddedOperation.json +++ b/test-integration/samples/.jhipster/EmbeddedOperation.json @@ -1,23 +1,23 @@ { - "changelogDate": "20200804163351", - "clientRootFolder": "test-root", - "dto": "mapstruct", - "embedded": true, - "fields": [ - { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "description", "fieldType": "String" }, - { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "infinite-scroll", - "relationships": [ - { - "otherEntityField": "name", - "otherEntityName": "documentBankAccount", - "otherEntityRelationshipName": "embeddedOperation", - "relationshipName": "documentBankAccount", - "relationshipType": "many-to-one" - } - ], - "service": "no" + "changelogDate": "20200804163351", + "clientRootFolder": "test-root", + "dto": "mapstruct", + "embedded": true, + "fields": [ + { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "description", "fieldType": "String" }, + { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "documentBankAccount", + "otherEntityRelationshipName": "embeddedOperation", + "relationshipName": "documentBankAccount", + "relationshipType": "many-to-one" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/EntityWithDTO.json b/test-integration/samples/.jhipster/EntityWithDTO.json index 224898865..52eccdcf5 100644 --- a/test-integration/samples/.jhipster/EntityWithDTO.json +++ b/test-integration/samples/.jhipster/EntityWithDTO.json @@ -1,10 +1,10 @@ { - "changelogDate": "20160806123735", - "dto": "mapstruct", - "entityTableName": "entity_with_dto", - "fields": [{ "fieldName": "emma", "fieldType": "String" }], - "fluentMethods": true, - "pagination": "no", - "relationships": [], - "service": "no" + "changelogDate": "20160806123735", + "dto": "mapstruct", + "entityTableName": "entity_with_dto", + "fields": [{ "fieldName": "emma", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json b/test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json index 8bb38bd78..8f2dca1ff 100644 --- a/test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json +++ b/test-integration/samples/.jhipster/EntityWithPaginationAndDTO.json @@ -1,10 +1,10 @@ { - "changelogDate": "20160806123743", - "dto": "mapstruct", - "entityTableName": "entity_with_pagination_and_dto", - "fields": [{ "fieldName": "lea", "fieldType": "String" }], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [], - "service": "no" + "changelogDate": "20160806123743", + "dto": "mapstruct", + "entityTableName": "entity_with_pagination_and_dto", + "fields": [{ "fieldName": "lea", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json b/test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json index 44fcb32be..448d651f5 100644 --- a/test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json +++ b/test-integration/samples/.jhipster/EntityWithServiceClassAndPagination.json @@ -1,10 +1,10 @@ { - "changelogDate": "20160806123739", - "dto": "no", - "entityTableName": "entity_with_service_class_and_pagination", - "fields": [{ "fieldName": "enzo", "fieldType": "String" }], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [], - "service": "serviceClass" + "changelogDate": "20160806123739", + "dto": "no", + "entityTableName": "entity_with_service_class_and_pagination", + "fields": [{ "fieldName": "enzo", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceClass" } diff --git a/test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json b/test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json index 621633396..f6fa78af1 100644 --- a/test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json +++ b/test-integration/samples/.jhipster/EntityWithServiceClassPaginationAndDTO.json @@ -1,10 +1,10 @@ { - "changelogDate": "20160806123744", - "dto": "mapstruct", - "entityTableName": "entity_with_service_class_pagination_and_dto", - "fields": [{ "fieldName": "lena", "fieldType": "String" }], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [], - "service": "serviceClass" + "changelogDate": "20160806123744", + "dto": "mapstruct", + "entityTableName": "entity_with_service_class_pagination_and_dto", + "fields": [{ "fieldName": "lena", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceClass" } diff --git a/test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json b/test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json index 15cc2404a..55b901a8c 100644 --- a/test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json +++ b/test-integration/samples/.jhipster/EntityWithServiceImplAndDTO.json @@ -1,10 +1,10 @@ { - "changelogDate": "20160806123742", - "dto": "mapstruct", - "entityTableName": "entity_with_service_impl_and_dto", - "fields": [{ "fieldName": "louis", "fieldType": "String" }], - "fluentMethods": true, - "pagination": "no", - "relationships": [], - "service": "serviceImpl" + "changelogDate": "20160806123742", + "dto": "mapstruct", + "entityTableName": "entity_with_service_impl_and_dto", + "fields": [{ "fieldName": "louis", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json b/test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json index 9995b7fda..9b237a714 100644 --- a/test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json +++ b/test-integration/samples/.jhipster/EntityWithServiceImplAndPagination.json @@ -1,10 +1,10 @@ { - "changelogDate": "20160806123740", - "dto": "no", - "entityTableName": "entity_with_service_impl_and_pagination", - "fields": [{ "fieldName": "hugo", "fieldType": "String" }], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [], - "service": "serviceImpl" + "changelogDate": "20160806123740", + "dto": "no", + "entityTableName": "entity_with_service_impl_and_pagination", + "fields": [{ "fieldName": "hugo", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json b/test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json index 26b053747..943817f76 100644 --- a/test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json +++ b/test-integration/samples/.jhipster/EntityWithServiceImplPaginationAndDTO.json @@ -1,10 +1,10 @@ { - "changelogDate": "20160806123845", - "dto": "mapstruct", - "entityTableName": "entity_with_service_impl_pagination_and_dto", - "fields": [{ "fieldName": "theo", "fieldType": "String" }], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [], - "service": "serviceImpl" + "changelogDate": "20160806123845", + "dto": "mapstruct", + "entityTableName": "entity_with_service_impl_pagination_and_dto", + "fields": [{ "fieldName": "theo", "fieldType": "String" }], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/FieldTestEntity.json b/test-integration/samples/.jhipster/FieldTestEntity.json index 1c80d6f6d..182cbb8d6 100644 --- a/test-integration/samples/.jhipster/FieldTestEntity.json +++ b/test-integration/samples/.jhipster/FieldTestEntity.json @@ -1,104 +1,109 @@ { - "changelogDate": "20160208184035", - "dto": "no", - "fields": [ - { "fieldName": "stringTom", "fieldType": "String" }, - { "fieldName": "stringRequiredTom", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "stringMinlengthTom", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, - { "fieldName": "stringMaxlengthTom", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, - { - "fieldName": "stringPatternTom", - "fieldType": "String", - "fieldValidateRules": ["pattern"], - "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", - "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" - }, - { - "fieldName": "numberPatternTom", - "fieldType": "String", - "fieldValidateRules": ["pattern"], - "fieldValidateRulesPattern": "^\\d+$" - }, - { - "fieldName": "numberPatternRequiredTom", - "fieldType": "String", - "fieldValidateRules": ["pattern", "required"], - "fieldValidateRulesPattern": "^\\d+$" - }, - { "fieldName": "integerTom", "fieldType": "Integer" }, - { "fieldName": "integerRequiredTom", "fieldType": "Integer", "fieldValidateRules": ["required"] }, - { "fieldName": "integerMinTom", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "integerMaxTom", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "longTom", "fieldType": "Long" }, - { "fieldName": "longRequiredTom", "fieldType": "Long", "fieldValidateRules": ["required"] }, - { "fieldName": "longMinTom", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "longMaxTom", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "floatTom", "fieldType": "Float" }, - { "fieldName": "floatRequiredTom", "fieldType": "Float", "fieldValidateRules": ["required"] }, - { "fieldName": "floatMinTom", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "floatMaxTom", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "doubleRequiredTom", "fieldType": "Double", "fieldValidateRules": ["required"] }, - { "fieldName": "doubleMinTom", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "doubleMaxTom", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "bigDecimalRequiredTom", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "bigDecimalMinTom", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "bigDecimalMaxTom", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "localDateTom", "fieldType": "LocalDate" }, - { "fieldName": "localDateRequiredTom", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, - { "fieldName": "instantTom", "fieldType": "Instant" }, - { "fieldName": "instantRequiredTom", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "zonedDateTimeTom", "fieldType": "ZonedDateTime" }, - { "fieldName": "zonedDateTimeRequiredTom", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, - { "fieldName": "durationTom", "fieldType": "Duration" }, - { "fieldName": "durationRequiredTom", "fieldType": "Duration", "fieldValidateRules": ["required"] }, - { "fieldName": "booleanTom", "fieldType": "Boolean" }, - { "fieldName": "booleanRequiredTom", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, - { "fieldName": "enumTom", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, - { - "fieldName": "enumRequiredTom", - "fieldType": "EnumRequiredFieldClass", - "fieldValidateRules": ["required"], - "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" - }, - { "fieldName": "uuidTom", "fieldType": "UUID" }, - { "fieldName": "uuidRequiredTom", "fieldType": "UUID", "fieldValidateRules": ["required"] }, - { "fieldName": "byteImageTom", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, - { "fieldName": "byteImageRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteImageMinbytesTom", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteImageMaxbytesTom", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteAnyTom", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "byteAnyRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteAnyMinbytesTom", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteAnyMaxbytesTom", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteTextTom", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, - { "fieldName": "byteTextRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "no", - "relationships": [], - "service": "no" + "changelogDate": "20160208184035", + "dto": "no", + "fields": [ + { "fieldName": "stringTom", "fieldType": "String" }, + { "fieldName": "stringRequiredTom", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthTom", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { + "fieldName": "stringMaxlengthTom", + "fieldType": "String", + "fieldValidateRules": ["maxlength"], + "fieldValidateRulesMaxlength": 20 + }, + { + "fieldName": "stringPatternTom", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { + "fieldName": "numberPatternTom", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^\\d+$" + }, + { + "fieldName": "numberPatternRequiredTom", + "fieldType": "String", + "fieldValidateRules": ["pattern", "required"], + "fieldValidateRulesPattern": "^\\d+$" + }, + { "fieldName": "integerTom", "fieldType": "Integer" }, + { "fieldName": "integerRequiredTom", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinTom", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxTom", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longTom", "fieldType": "Long" }, + { "fieldName": "longRequiredTom", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinTom", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxTom", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatTom", "fieldType": "Float" }, + { "fieldName": "floatRequiredTom", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinTom", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxTom", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredTom", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinTom", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxTom", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredTom", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinTom", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxTom", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateTom", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredTom", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantTom", "fieldType": "Instant" }, + { "fieldName": "instantRequiredTom", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeTom", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredTom", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationTom", "fieldType": "Duration" }, + { "fieldName": "durationRequiredTom", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanTom", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredTom", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumTom", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredTom", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidTom", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredTom", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageTom", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyTom", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesTom", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextTom", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredTom", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/FieldTestEnumWithValue.json b/test-integration/samples/.jhipster/FieldTestEnumWithValue.json index 904a73e71..f6460b18a 100644 --- a/test-integration/samples/.jhipster/FieldTestEnumWithValue.json +++ b/test-integration/samples/.jhipster/FieldTestEnumWithValue.json @@ -1,20 +1,20 @@ { - "applications": "*", - "changelogDate": "20200415193919", - "clientRootFolder": "", - "dto": "no", - "embedded": false, - "entityTableName": "entity_with_enums", - "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)" } - ], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "name": "FieldTestEnumWithValue", - "pagination": "no", - "readOnly": false, - "relationships": [], - "service": "no" + "applications": "*", + "changelogDate": "20200415193919", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "entity_with_enums", + "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)" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "FieldTestEnumWithValue", + "pagination": "no", + "readOnly": false, + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json b/test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json index feb0c19b5..05adddf1c 100644 --- a/test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json +++ b/test-integration/samples/.jhipster/FieldTestInfiniteScrollEntity.json @@ -1,92 +1,107 @@ { - "changelogDate": "20160208184036", - "dto": "no", - "fields": [ - { "fieldName": "stringHugo", "fieldType": "String" }, - { "fieldName": "stringRequiredHugo", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "stringMinlengthHugo", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, - { "fieldName": "stringMaxlengthHugo", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, - { - "fieldName": "stringPatternHugo", - "fieldType": "String", - "fieldValidateRules": ["pattern"], - "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", - "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" - }, - { "fieldName": "integerHugo", "fieldType": "Integer" }, - { "fieldName": "integerRequiredHugo", "fieldType": "Integer", "fieldValidateRules": ["required"] }, - { "fieldName": "integerMinHugo", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "integerMaxHugo", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "longHugo", "fieldType": "Long" }, - { "fieldName": "longRequiredHugo", "fieldType": "Long", "fieldValidateRules": ["required"] }, - { "fieldName": "longMinHugo", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "longMaxHugo", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "floatHugo", "fieldType": "Float" }, - { "fieldName": "floatRequiredHugo", "fieldType": "Float", "fieldValidateRules": ["required"] }, - { "fieldName": "floatMinHugo", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "floatMaxHugo", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "doubleRequiredHugo", "fieldType": "Double", "fieldValidateRules": ["required"] }, - { "fieldName": "doubleMinHugo", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "doubleMaxHugo", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "bigDecimalRequiredHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "bigDecimalMinHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "bigDecimalMaxHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "localDateHugo", "fieldType": "LocalDate" }, - { "fieldName": "localDateRequiredHugo", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, - { "fieldName": "instantHugo", "fieldType": "Instant" }, - { "fieldName": "instanteRequiredHugo", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "zonedDateTimeHugo", "fieldType": "ZonedDateTime" }, - { "fieldName": "zonedDateTimeRequiredHugo", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, - { "fieldName": "durationHugo", "fieldType": "Duration" }, - { "fieldName": "durationRequiredHugo", "fieldType": "Duration", "fieldValidateRules": ["required"] }, - { "fieldName": "booleanHugo", "fieldType": "Boolean" }, - { "fieldName": "booleanRequiredHugo", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, - { "fieldName": "enumHugo", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, - { - "fieldName": "enumRequiredHugo", - "fieldType": "EnumRequiredFieldClass", - "fieldValidateRules": ["required"], - "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" - }, - { "fieldName": "uuidHugo", "fieldType": "UUID" }, - { "fieldName": "uuidRequiredHugo", "fieldType": "UUID", "fieldValidateRules": ["required"] }, - { "fieldName": "byteImageHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, - { "fieldName": "byteImageRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteImageMinbytesHugo", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteImageMaxbytesHugo", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteAnyHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "byteAnyRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteAnyMinbytesHugo", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteAnyMaxbytesHugo", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteTextHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, - { "fieldName": "byteTextRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "infinite-scroll", - "relationships": [], - "service": "no" + "changelogDate": "20160208184036", + "dto": "no", + "fields": [ + { "fieldName": "stringHugo", "fieldType": "String" }, + { "fieldName": "stringRequiredHugo", "fieldType": "String", "fieldValidateRules": ["required"] }, + { + "fieldName": "stringMinlengthHugo", + "fieldType": "String", + "fieldValidateRules": ["minlength"], + "fieldValidateRulesMinlength": 0 + }, + { + "fieldName": "stringMaxlengthHugo", + "fieldType": "String", + "fieldValidateRules": ["maxlength"], + "fieldValidateRulesMaxlength": 20 + }, + { + "fieldName": "stringPatternHugo", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerHugo", "fieldType": "Integer" }, + { "fieldName": "integerRequiredHugo", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinHugo", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxHugo", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longHugo", "fieldType": "Long" }, + { "fieldName": "longRequiredHugo", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinHugo", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxHugo", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatHugo", "fieldType": "Float" }, + { "fieldName": "floatRequiredHugo", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinHugo", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxHugo", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredHugo", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinHugo", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxHugo", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxHugo", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateHugo", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredHugo", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantHugo", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredHugo", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeHugo", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredHugo", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationHugo", "fieldType": "Duration" }, + { "fieldName": "durationRequiredHugo", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanHugo", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredHugo", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumHugo", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredHugo", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidHugo", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredHugo", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { + "fieldName": "byteImageRequiredHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["required"] + }, + { + "fieldName": "byteImageMinbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesHugo", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredHugo", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json b/test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json index 4ba349669..5860aa000 100644 --- a/test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json +++ b/test-integration/samples/.jhipster/FieldTestMapstructAndServiceClassEntity.json @@ -1,92 +1,97 @@ { - "changelogDate": "20160208184037", - "dto": "mapstruct", - "fields": [ - { "fieldName": "stringEva", "fieldType": "String" }, - { "fieldName": "stringRequiredEva", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "stringMinlengthEva", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, - { "fieldName": "stringMaxlengthEva", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, - { - "fieldName": "stringPatternEva", - "fieldType": "String", - "fieldValidateRules": ["pattern"], - "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", - "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" - }, - { "fieldName": "integerEva", "fieldType": "Integer" }, - { "fieldName": "integerRequiredEva", "fieldType": "Integer", "fieldValidateRules": ["required"] }, - { "fieldName": "integerMinEva", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "integerMaxEva", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "longEva", "fieldType": "Long" }, - { "fieldName": "longRequiredEva", "fieldType": "Long", "fieldValidateRules": ["required"] }, - { "fieldName": "longMinEva", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "longMaxEva", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "floatEva", "fieldType": "Float" }, - { "fieldName": "floatRequiredEva", "fieldType": "Float", "fieldValidateRules": ["required"] }, - { "fieldName": "floatMinEva", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "floatMaxEva", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "doubleRequiredEva", "fieldType": "Double", "fieldValidateRules": ["required"] }, - { "fieldName": "doubleMinEva", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "doubleMaxEva", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "bigDecimalRequiredEva", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "bigDecimalMinEva", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "bigDecimalMaxEva", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "localDateEva", "fieldType": "LocalDate" }, - { "fieldName": "localDateRequiredEva", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, - { "fieldName": "instantEva", "fieldType": "Instant" }, - { "fieldName": "instanteRequiredEva", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "zonedDateTimeEva", "fieldType": "ZonedDateTime" }, - { "fieldName": "zonedDateTimeRequiredEva", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, - { "fieldName": "durationEva", "fieldType": "Duration" }, - { "fieldName": "durationRequiredEva", "fieldType": "Duration", "fieldValidateRules": ["required"] }, - { "fieldName": "booleanEva", "fieldType": "Boolean" }, - { "fieldName": "booleanRequiredEva", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, - { "fieldName": "enumEva", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, - { - "fieldName": "enumRequiredEva", - "fieldType": "EnumRequiredFieldClass", - "fieldValidateRules": ["required"], - "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" - }, - { "fieldName": "uuidEva", "fieldType": "UUID" }, - { "fieldName": "uuidRequiredEva", "fieldType": "UUID", "fieldValidateRules": ["required"] }, - { "fieldName": "byteImageEva", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, - { "fieldName": "byteImageRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteImageMinbytesEva", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteImageMaxbytesEva", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteAnyEva", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "byteAnyRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteAnyMinbytesEva", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteAnyMaxbytesEva", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteTextEva", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, - { "fieldName": "byteTextRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "no", - "relationships": [], - "service": "serviceClass" + "changelogDate": "20160208184037", + "dto": "mapstruct", + "fields": [ + { "fieldName": "stringEva", "fieldType": "String" }, + { "fieldName": "stringRequiredEva", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthEva", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { + "fieldName": "stringMaxlengthEva", + "fieldType": "String", + "fieldValidateRules": ["maxlength"], + "fieldValidateRulesMaxlength": 20 + }, + { + "fieldName": "stringPatternEva", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerEva", "fieldType": "Integer" }, + { "fieldName": "integerRequiredEva", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinEva", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxEva", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longEva", "fieldType": "Long" }, + { "fieldName": "longRequiredEva", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinEva", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxEva", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatEva", "fieldType": "Float" }, + { "fieldName": "floatRequiredEva", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinEva", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxEva", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredEva", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinEva", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxEva", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredEva", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinEva", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxEva", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateEva", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredEva", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantEva", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredEva", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeEva", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredEva", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationEva", "fieldType": "Duration" }, + { "fieldName": "durationRequiredEva", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanEva", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredEva", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumEva", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredEva", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidEva", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredEva", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageEva", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyEva", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesEva", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextEva", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredEva", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "serviceClass" } diff --git a/test-integration/samples/.jhipster/FieldTestPaginationEntity.json b/test-integration/samples/.jhipster/FieldTestPaginationEntity.json index 5c0ef2b05..2d34eb11f 100644 --- a/test-integration/samples/.jhipster/FieldTestPaginationEntity.json +++ b/test-integration/samples/.jhipster/FieldTestPaginationEntity.json @@ -1,92 +1,107 @@ { - "changelogDate": "20160208184038", - "dto": "no", - "fields": [ - { "fieldName": "stringAlice", "fieldType": "String" }, - { "fieldName": "stringRequiredAlice", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "stringMinlengthAlice", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, - { "fieldName": "stringMaxlengthAlice", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, - { - "fieldName": "stringPatternAlice", - "fieldType": "String", - "fieldValidateRules": ["pattern"], - "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", - "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" - }, - { "fieldName": "integerAlice", "fieldType": "Integer" }, - { "fieldName": "integerRequiredAlice", "fieldType": "Integer", "fieldValidateRules": ["required"] }, - { "fieldName": "integerMinAlice", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "integerMaxAlice", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "longAlice", "fieldType": "Long" }, - { "fieldName": "longRequiredAlice", "fieldType": "Long", "fieldValidateRules": ["required"] }, - { "fieldName": "longMinAlice", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "longMaxAlice", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "floatAlice", "fieldType": "Float" }, - { "fieldName": "floatRequiredAlice", "fieldType": "Float", "fieldValidateRules": ["required"] }, - { "fieldName": "floatMinAlice", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "floatMaxAlice", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "doubleRequiredAlice", "fieldType": "Double", "fieldValidateRules": ["required"] }, - { "fieldName": "doubleMinAlice", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "doubleMaxAlice", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "bigDecimalRequiredAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "bigDecimalMinAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "bigDecimalMaxAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "localDateAlice", "fieldType": "LocalDate" }, - { "fieldName": "localDateRequiredAlice", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, - { "fieldName": "instantAlice", "fieldType": "Instant" }, - { "fieldName": "instanteRequiredAlice", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "zonedDateTimeAlice", "fieldType": "ZonedDateTime" }, - { "fieldName": "zonedDateTimeRequiredAlice", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, - { "fieldName": "durationAlice", "fieldType": "Duration" }, - { "fieldName": "durationRequiredAlice", "fieldType": "Duration", "fieldValidateRules": ["required"] }, - { "fieldName": "booleanAlice", "fieldType": "Boolean" }, - { "fieldName": "booleanRequiredAlice", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, - { "fieldName": "enumAlice", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, - { - "fieldName": "enumRequiredAlice", - "fieldType": "EnumRequiredFieldClass", - "fieldValidateRules": ["required"], - "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" - }, - { "fieldName": "uuidAlice", "fieldType": "UUID" }, - { "fieldName": "uuidRequiredAlice", "fieldType": "UUID", "fieldValidateRules": ["required"] }, - { "fieldName": "byteImageAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, - { "fieldName": "byteImageRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteImageMinbytesAlice", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteImageMaxbytesAlice", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteAnyAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "byteAnyRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteAnyMinbytesAlice", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteAnyMaxbytesAlice", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteTextAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, - { "fieldName": "byteTextRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [], - "service": "no" + "changelogDate": "20160208184038", + "dto": "no", + "fields": [ + { "fieldName": "stringAlice", "fieldType": "String" }, + { "fieldName": "stringRequiredAlice", "fieldType": "String", "fieldValidateRules": ["required"] }, + { + "fieldName": "stringMinlengthAlice", + "fieldType": "String", + "fieldValidateRules": ["minlength"], + "fieldValidateRulesMinlength": 0 + }, + { + "fieldName": "stringMaxlengthAlice", + "fieldType": "String", + "fieldValidateRules": ["maxlength"], + "fieldValidateRulesMaxlength": 20 + }, + { + "fieldName": "stringPatternAlice", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerAlice", "fieldType": "Integer" }, + { "fieldName": "integerRequiredAlice", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinAlice", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxAlice", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longAlice", "fieldType": "Long" }, + { "fieldName": "longRequiredAlice", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinAlice", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxAlice", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatAlice", "fieldType": "Float" }, + { "fieldName": "floatRequiredAlice", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinAlice", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxAlice", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredAlice", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinAlice", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxAlice", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxAlice", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateAlice", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredAlice", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantAlice", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredAlice", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeAlice", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredAlice", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationAlice", "fieldType": "Duration" }, + { "fieldName": "durationRequiredAlice", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanAlice", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredAlice", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumAlice", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredAlice", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidAlice", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredAlice", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { + "fieldName": "byteImageRequiredAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["required"] + }, + { + "fieldName": "byteImageMinbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesAlice", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredAlice", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json b/test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json index 291229c52..3e6029cb3 100644 --- a/test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json +++ b/test-integration/samples/.jhipster/FieldTestServiceClassAndJpaFilteringEntity.json @@ -1,93 +1,98 @@ { - "changelogDate": "20160208184039", - "dto": "no", - "fields": [ - { "fieldName": "stringBob", "fieldType": "String" }, - { "fieldName": "stringRequiredBob", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "stringMinlengthBob", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, - { "fieldName": "stringMaxlengthBob", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, - { - "fieldName": "stringPatternBob", - "fieldType": "String", - "fieldValidateRules": ["pattern"], - "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", - "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" - }, - { "fieldName": "integerBob", "fieldType": "Integer" }, - { "fieldName": "integerRequiredBob", "fieldType": "Integer", "fieldValidateRules": ["required"] }, - { "fieldName": "integerMinBob", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "integerMaxBob", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "longBob", "fieldType": "Long" }, - { "fieldName": "longRequiredBob", "fieldType": "Long", "fieldValidateRules": ["required"] }, - { "fieldName": "longMinBob", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "longMaxBob", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "floatBob", "fieldType": "Float" }, - { "fieldName": "floatRequiredBob", "fieldType": "Float", "fieldValidateRules": ["required"] }, - { "fieldName": "floatMinBob", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "floatMaxBob", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "doubleRequiredBob", "fieldType": "Double", "fieldValidateRules": ["required"] }, - { "fieldName": "doubleMinBob", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "doubleMaxBob", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "bigDecimalRequiredBob", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "bigDecimalMinBob", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "bigDecimalMaxBob", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "localDateBob", "fieldType": "LocalDate" }, - { "fieldName": "localDateRequiredBob", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, - { "fieldName": "instantBob", "fieldType": "Instant" }, - { "fieldName": "instanteRequiredBob", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "zonedDateTimeBob", "fieldType": "ZonedDateTime" }, - { "fieldName": "zonedDateTimeRequiredBob", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, - { "fieldName": "durationBob", "fieldType": "Duration" }, - { "fieldName": "durationRequiredBob", "fieldType": "Duration", "fieldValidateRules": ["required"] }, - { "fieldName": "booleanBob", "fieldType": "Boolean" }, - { "fieldName": "booleanRequiredBob", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, - { "fieldName": "enumBob", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, - { - "fieldName": "enumRequiredBob", - "fieldType": "EnumRequiredFieldClass", - "fieldValidateRules": ["required"], - "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" - }, - { "fieldName": "uuidBob", "fieldType": "UUID" }, - { "fieldName": "uuidRequiredBob", "fieldType": "UUID", "fieldValidateRules": ["required"] }, - { "fieldName": "byteImageBob", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, - { "fieldName": "byteImageRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteImageMinbytesBob", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteImageMaxbytesBob", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteAnyBob", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "byteAnyRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteAnyMinbytesBob", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteAnyMaxbytesBob", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteTextBob", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, - { "fieldName": "byteTextRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "no", - "relationships": [], - "service": "serviceClass" + "changelogDate": "20160208184039", + "dto": "no", + "fields": [ + { "fieldName": "stringBob", "fieldType": "String" }, + { "fieldName": "stringRequiredBob", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "stringMinlengthBob", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, + { + "fieldName": "stringMaxlengthBob", + "fieldType": "String", + "fieldValidateRules": ["maxlength"], + "fieldValidateRulesMaxlength": 20 + }, + { + "fieldName": "stringPatternBob", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerBob", "fieldType": "Integer" }, + { "fieldName": "integerRequiredBob", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinBob", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxBob", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longBob", "fieldType": "Long" }, + { "fieldName": "longRequiredBob", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinBob", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxBob", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatBob", "fieldType": "Float" }, + { "fieldName": "floatRequiredBob", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinBob", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxBob", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredBob", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinBob", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxBob", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredBob", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinBob", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxBob", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateBob", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredBob", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantBob", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredBob", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeBob", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredBob", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationBob", "fieldType": "Duration" }, + { "fieldName": "durationRequiredBob", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanBob", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredBob", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumBob", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredBob", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidBob", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredBob", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageBob", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { "fieldName": "byteImageRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteImageMinbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyBob", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesBob", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextBob", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredBob", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [], + "service": "serviceClass" } diff --git a/test-integration/samples/.jhipster/FieldTestServiceImplEntity.json b/test-integration/samples/.jhipster/FieldTestServiceImplEntity.json index 8680b5427..d91ce248e 100644 --- a/test-integration/samples/.jhipster/FieldTestServiceImplEntity.json +++ b/test-integration/samples/.jhipster/FieldTestServiceImplEntity.json @@ -1,92 +1,107 @@ { - "changelogDate": "20160208184040", - "dto": "no", - "fields": [ - { "fieldName": "stringMika", "fieldType": "String" }, - { "fieldName": "stringRequiredMika", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "stringMinlengthMika", "fieldType": "String", "fieldValidateRules": ["minlength"], "fieldValidateRulesMinlength": 0 }, - { "fieldName": "stringMaxlengthMika", "fieldType": "String", "fieldValidateRules": ["maxlength"], "fieldValidateRulesMaxlength": 20 }, - { - "fieldName": "stringPatternMika", - "fieldType": "String", - "fieldValidateRules": ["pattern"], - "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", - "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" - }, - { "fieldName": "integerMika", "fieldType": "Integer" }, - { "fieldName": "integerRequiredMika", "fieldType": "Integer", "fieldValidateRules": ["required"] }, - { "fieldName": "integerMinMika", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "integerMaxMika", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "longMika", "fieldType": "Long" }, - { "fieldName": "longRequiredMika", "fieldType": "Long", "fieldValidateRules": ["required"] }, - { "fieldName": "longMinMika", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "longMaxMika", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "floatMika", "fieldType": "Float" }, - { "fieldName": "floatRequiredMika", "fieldType": "Float", "fieldValidateRules": ["required"] }, - { "fieldName": "floatMinMika", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "floatMaxMika", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "doubleRequiredMika", "fieldType": "Double", "fieldValidateRules": ["required"] }, - { "fieldName": "doubleMinMika", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "doubleMaxMika", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "bigDecimalRequiredMika", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "bigDecimalMinMika", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, - { "fieldName": "bigDecimalMaxMika", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, - { "fieldName": "localDateMika", "fieldType": "LocalDate" }, - { "fieldName": "localDateRequiredMika", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, - { "fieldName": "instantMika", "fieldType": "Instant" }, - { "fieldName": "instanteRequiredMika", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "zonedDateTimeMika", "fieldType": "ZonedDateTime" }, - { "fieldName": "zonedDateTimeRequiredMika", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, - { "fieldName": "durationMika", "fieldType": "Duration" }, - { "fieldName": "durationRequiredMika", "fieldType": "Duration", "fieldValidateRules": ["required"] }, - { "fieldName": "booleanMika", "fieldType": "Boolean" }, - { "fieldName": "booleanRequiredMika", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, - { "fieldName": "enumMika", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, - { - "fieldName": "enumRequiredMika", - "fieldType": "EnumRequiredFieldClass", - "fieldValidateRules": ["required"], - "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" - }, - { "fieldName": "uuidMika", "fieldType": "UUID" }, - { "fieldName": "uuidRequiredMika", "fieldType": "UUID", "fieldValidateRules": ["required"] }, - { "fieldName": "byteImageMika", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, - { "fieldName": "byteImageRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "image", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteImageMinbytesMika", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteImageMaxbytesMika", - "fieldType": "byte[]", - "fieldTypeBlobContent": "image", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteAnyMika", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "byteAnyRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, - { - "fieldName": "byteAnyMinbytesMika", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["minbytes"], - "fieldValidateRulesMinbytes": 0 - }, - { - "fieldName": "byteAnyMaxbytesMika", - "fieldType": "byte[]", - "fieldTypeBlobContent": "any", - "fieldValidateRules": ["maxbytes"], - "fieldValidateRulesMaxbytes": 10000 - }, - { "fieldName": "byteTextMika", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, - { "fieldName": "byteTextRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "no", - "relationships": [], - "service": "serviceImpl" + "changelogDate": "20160208184040", + "dto": "no", + "fields": [ + { "fieldName": "stringMika", "fieldType": "String" }, + { "fieldName": "stringRequiredMika", "fieldType": "String", "fieldValidateRules": ["required"] }, + { + "fieldName": "stringMinlengthMika", + "fieldType": "String", + "fieldValidateRules": ["minlength"], + "fieldValidateRulesMinlength": 0 + }, + { + "fieldName": "stringMaxlengthMika", + "fieldType": "String", + "fieldValidateRules": ["maxlength"], + "fieldValidateRulesMaxlength": 20 + }, + { + "fieldName": "stringPatternMika", + "fieldType": "String", + "fieldValidateRules": ["pattern"], + "fieldValidateRulesPattern": "^[a-zA-Z0-9]*$", + "fieldValidateRulesPatternJava": "^[a-zA-Z0-9]*$" + }, + { "fieldName": "integerMika", "fieldType": "Integer" }, + { "fieldName": "integerRequiredMika", "fieldType": "Integer", "fieldValidateRules": ["required"] }, + { "fieldName": "integerMinMika", "fieldType": "Integer", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "integerMaxMika", "fieldType": "Integer", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "longMika", "fieldType": "Long" }, + { "fieldName": "longRequiredMika", "fieldType": "Long", "fieldValidateRules": ["required"] }, + { "fieldName": "longMinMika", "fieldType": "Long", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "longMaxMika", "fieldType": "Long", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "floatMika", "fieldType": "Float" }, + { "fieldName": "floatRequiredMika", "fieldType": "Float", "fieldValidateRules": ["required"] }, + { "fieldName": "floatMinMika", "fieldType": "Float", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "floatMaxMika", "fieldType": "Float", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "doubleRequiredMika", "fieldType": "Double", "fieldValidateRules": ["required"] }, + { "fieldName": "doubleMinMika", "fieldType": "Double", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "doubleMaxMika", "fieldType": "Double", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "bigDecimalRequiredMika", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "bigDecimalMinMika", "fieldType": "BigDecimal", "fieldValidateRules": ["min"], "fieldValidateRulesMin": 0 }, + { "fieldName": "bigDecimalMaxMika", "fieldType": "BigDecimal", "fieldValidateRules": ["max"], "fieldValidateRulesMax": 100 }, + { "fieldName": "localDateMika", "fieldType": "LocalDate" }, + { "fieldName": "localDateRequiredMika", "fieldType": "LocalDate", "fieldValidateRules": ["required"] }, + { "fieldName": "instantMika", "fieldType": "Instant" }, + { "fieldName": "instanteRequiredMika", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "zonedDateTimeMika", "fieldType": "ZonedDateTime" }, + { "fieldName": "zonedDateTimeRequiredMika", "fieldType": "ZonedDateTime", "fieldValidateRules": ["required"] }, + { "fieldName": "durationMika", "fieldType": "Duration" }, + { "fieldName": "durationRequiredMika", "fieldType": "Duration", "fieldValidateRules": ["required"] }, + { "fieldName": "booleanMika", "fieldType": "Boolean" }, + { "fieldName": "booleanRequiredMika", "fieldType": "Boolean", "fieldValidateRules": ["required"] }, + { "fieldName": "enumMika", "fieldType": "EnumFieldClass", "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" }, + { + "fieldName": "enumRequiredMika", + "fieldType": "EnumRequiredFieldClass", + "fieldValidateRules": ["required"], + "fieldValues": "ENUM_VALUE_1,ENUM_VALUE_2,ENUM_VALUE_3" + }, + { "fieldName": "uuidMika", "fieldType": "UUID" }, + { "fieldName": "uuidRequiredMika", "fieldType": "UUID", "fieldValidateRules": ["required"] }, + { "fieldName": "byteImageMika", "fieldType": "byte[]", "fieldTypeBlobContent": "image" }, + { + "fieldName": "byteImageRequiredMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["required"] + }, + { + "fieldName": "byteImageMinbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteImageMaxbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "image", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteAnyMika", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "byteAnyRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "any", "fieldValidateRules": ["required"] }, + { + "fieldName": "byteAnyMinbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["minbytes"], + "fieldValidateRulesMinbytes": 0 + }, + { + "fieldName": "byteAnyMaxbytesMika", + "fieldType": "byte[]", + "fieldTypeBlobContent": "any", + "fieldValidateRules": ["maxbytes"], + "fieldValidateRulesMaxbytes": 10000 + }, + { "fieldName": "byteTextMika", "fieldType": "byte[]", "fieldTypeBlobContent": "text" }, + { "fieldName": "byteTextRequiredMika", "fieldType": "byte[]", "fieldTypeBlobContent": "text", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "no", + "relationships": [], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/Genre.json b/test-integration/samples/.jhipster/Genre.json index 5bf784bea..e6deae689 100644 --- a/test-integration/samples/.jhipster/Genre.json +++ b/test-integration/samples/.jhipster/Genre.json @@ -1,16 +1,16 @@ { - "applications": "*", - "changelogDate": "20200417190823", - "clientRootFolder": "", - "dto": "no", - "embedded": false, - "entityTableName": "genre", - "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "name": "Genre", - "pagination": "no", - "readOnly": false, - "relationships": [], - "service": "no" + "applications": "*", + "changelogDate": "20200417190823", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "genre", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Genre", + "pagination": "no", + "readOnly": false, + "relationships": [], + "service": "no" } diff --git a/test-integration/samples/.jhipster/JpaFilteringOtherSide.json b/test-integration/samples/.jhipster/JpaFilteringOtherSide.json index 460a3df75..f25d16fc1 100644 --- a/test-integration/samples/.jhipster/JpaFilteringOtherSide.json +++ b/test-integration/samples/.jhipster/JpaFilteringOtherSide.json @@ -1,57 +1,57 @@ { - "applications": ["jhipster"], - "changelogDate": "20200820222459", - "dto": "mapstruct", - "embedded": false, - "entityTableName": "jpa_filtering_other_side", - "fields": [ - { "fieldName": "createdBy", "fieldType": "String" }, - { "fieldName": "createdOn", "fieldType": "Instant" } - ], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "name": "JpaFilteringOtherSide", - "pagination": "pagination", - "readOnly": false, - "relationships": [ - { - "otherEntityName": "jpaFilteringRelationship", - "otherEntityRelationshipName": "requiredOneToOne", - "ownerSide": false, - "relationshipName": "requiredOneToOneOtherSide", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "jpaFilteringRelationship", - "otherEntityRelationshipName": "oneToOne", - "ownerSide": false, - "relationshipName": "oneToOneOtherSide", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringRelationship", - "otherEntityRelationshipName": "oneToMany", - "relationshipName": "oneToManyOtherSide", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringRelationship", - "otherEntityRelationshipName": "requiredManyToMany", - "ownerSide": false, - "relationshipName": "requiredManyToManyOtherSide", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringRelationship", - "otherEntityRelationshipName": "manyToMany", - "ownerSide": false, - "relationshipName": "manyToManyOtherSide", - "relationshipType": "many-to-many" - } - ], - "service": "serviceClass", - "skipUiGrouping": false + "applications": ["jhipster"], + "changelogDate": "20200820222459", + "dto": "mapstruct", + "embedded": false, + "entityTableName": "jpa_filtering_other_side", + "fields": [ + { "fieldName": "createdBy", "fieldType": "String" }, + { "fieldName": "createdOn", "fieldType": "Instant" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "name": "JpaFilteringOtherSide", + "pagination": "pagination", + "readOnly": false, + "relationships": [ + { + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "requiredOneToOne", + "ownerSide": false, + "relationshipName": "requiredOneToOneOtherSide", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "oneToOne", + "ownerSide": false, + "relationshipName": "oneToOneOtherSide", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "oneToMany", + "relationshipName": "oneToManyOtherSide", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "requiredManyToMany", + "ownerSide": false, + "relationshipName": "requiredManyToManyOtherSide", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringRelationship", + "otherEntityRelationshipName": "manyToMany", + "ownerSide": false, + "relationshipName": "manyToManyOtherSide", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass", + "skipUiGrouping": false } diff --git a/test-integration/samples/.jhipster/JpaFilteringRelationship.json b/test-integration/samples/.jhipster/JpaFilteringRelationship.json index 36b3c4aa2..d06547c90 100644 --- a/test-integration/samples/.jhipster/JpaFilteringRelationship.json +++ b/test-integration/samples/.jhipster/JpaFilteringRelationship.json @@ -1,75 +1,75 @@ { - "applications": ["jhipster"], - "changelogDate": "20200820222306", - "dto": "mapstruct", - "embedded": false, - "entityTableName": "jpa_filtering_relationship", - "fields": [ - { "fieldName": "createdBy", "fieldType": "String" }, - { "fieldName": "createdOn", "fieldType": "Instant" } - ], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "name": "JpaFilteringRelationship", - "pagination": "pagination", - "readOnly": false, - "relationships": [ - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "requiredOneToOneOtherSide", - "ownerSide": true, - "relationshipName": "requiredOneToOne", - "relationshipType": "one-to-one", - "relationshipValidateRules": "required" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "oneToOneOtherSide", - "ownerSide": true, - "relationshipName": "oneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "oneToManyOtherSide", - "relationshipName": "oneToMany", - "relationshipType": "one-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "jpaFilteringRelationship", - "relationshipName": "requiredManyToOne", - "relationshipType": "many-to-one", - "relationshipValidateRules": "required" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "jpaFilteringRelationship", - "relationshipName": "manyToOne", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "requiredManyToManyOtherSide", - "ownerSide": true, - "relationshipName": "requiredManyToMany", - "relationshipType": "many-to-many", - "relationshipValidateRules": "required" - }, - { - "otherEntityField": "id", - "otherEntityName": "jpaFilteringOtherSide", - "otherEntityRelationshipName": "manyToManyOtherSide", - "ownerSide": true, - "relationshipName": "manyToMany", - "relationshipType": "many-to-many" - } - ], - "service": "serviceClass", - "skipUiGrouping": false + "applications": ["jhipster"], + "changelogDate": "20200820222306", + "dto": "mapstruct", + "embedded": false, + "entityTableName": "jpa_filtering_relationship", + "fields": [ + { "fieldName": "createdBy", "fieldType": "String" }, + { "fieldName": "createdOn", "fieldType": "Instant" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "name": "JpaFilteringRelationship", + "pagination": "pagination", + "readOnly": false, + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "requiredOneToOneOtherSide", + "ownerSide": true, + "relationshipName": "requiredOneToOne", + "relationshipType": "one-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "oneToOneOtherSide", + "ownerSide": true, + "relationshipName": "oneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "oneToManyOtherSide", + "relationshipName": "oneToMany", + "relationshipType": "one-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "jpaFilteringRelationship", + "relationshipName": "requiredManyToOne", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "jpaFilteringRelationship", + "relationshipName": "manyToOne", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "requiredManyToManyOtherSide", + "ownerSide": true, + "relationshipName": "requiredManyToMany", + "relationshipType": "many-to-many", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "jpaFilteringOtherSide", + "otherEntityRelationshipName": "manyToManyOtherSide", + "ownerSide": true, + "relationshipName": "manyToMany", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass", + "skipUiGrouping": false } diff --git a/test-integration/samples/.jhipster/Label.json b/test-integration/samples/.jhipster/Label.json index e3676faff..0ae079eb0 100644 --- a/test-integration/samples/.jhipster/Label.json +++ b/test-integration/samples/.jhipster/Label.json @@ -1,21 +1,26 @@ { - "changelogDate": "20200804163353", - "clientRootFolder": "test-root", - "dto": "no", - "fields": [ - { "fieldName": "labelName", "fieldType": "String", "fieldValidateRules": ["required", "minlength"], "fieldValidateRulesMinlength": "3" } - ], - "fluentMethods": true, - "pagination": "pagination", - "readOnly": true, - "relationships": [ - { - "otherEntityName": "operation", - "otherEntityRelationshipName": "label", - "ownerSide": false, - "relationshipName": "operation", - "relationshipType": "many-to-many" - } - ], - "service": "serviceClass" + "changelogDate": "20200804163353", + "clientRootFolder": "test-root", + "dto": "no", + "fields": [ + { + "fieldName": "labelName", + "fieldType": "String", + "fieldValidateRules": ["required", "minlength"], + "fieldValidateRulesMinlength": "3" + } + ], + "fluentMethods": true, + "pagination": "pagination", + "readOnly": true, + "relationships": [ + { + "otherEntityName": "operation", + "otherEntityRelationshipName": "label", + "ownerSide": false, + "relationshipName": "operation", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass" } diff --git a/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json index 6232067b3..dc50aca3b 100644 --- a/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdChildEntityWithDTO.json @@ -1,31 +1,31 @@ { - "changelogDate": "20190117075155", - "clientRootFolder": "", - "databaseType": "sql", - "dto": "mapstruct", - "entityTableName": "maps_id_child_with_dto", - "fields": [{ "fieldName": "date", "fieldType": "Instant" }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "pagination": "no", - "relationships": [ - { - "id": true, - "otherEntityField": "id", - "otherEntityName": "mapsIdParentEntityWithDTO", - "otherEntityRelationshipName": "mapsIdChildEntityWithDTO", - "ownerSide": true, - "relationshipName": "mapsIdParentEntityWithDTO", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "mapsIdGrandchildEntityWithDTO", - "otherEntityRelationshipName": "mapsIdChildEntityWithDTO", - "ownerSide": false, - "relationshipName": "mapsIdGrandchildEntityWithDTO", - "relationshipType": "one-to-one" - } - ], - "searchEngine": false, - "service": "serviceImpl" + "changelogDate": "20190117075155", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_child_with_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdParentEntityWithDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithDTO", + "ownerSide": true, + "relationshipName": "mapsIdParentEntityWithDTO", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "mapsIdGrandchildEntityWithDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithDTO", + "ownerSide": false, + "relationshipName": "mapsIdGrandchildEntityWithDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json index 3a784c321..8f03aa6da 100644 --- a/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json +++ b/test-integration/samples/.jhipster/MapsIdChildEntityWithoutDTO.json @@ -1,31 +1,31 @@ { - "changelogDate": "20190117074746", - "clientRootFolder": "", - "databaseType": "sql", - "dto": "no", - "entityTableName": "maps_id_child_wo_dto", - "fields": [{ "fieldName": "date", "fieldType": "Instant" }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "pagination": "no", - "relationships": [ - { - "id": true, - "otherEntityField": "id", - "otherEntityName": "mapsIdParentEntityWithoutDTO", - "otherEntityRelationshipName": "mapsIdChildEntityWithoutDTO", - "ownerSide": true, - "relationshipName": "mapsIdParentEntityWithoutDTO", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "mapsIdGrandchildEntityWithoutDTO", - "otherEntityRelationshipName": "mapsIdChildEntityWithoutDTO", - "ownerSide": false, - "relationshipName": "mapsIdGrandchildEntityWithoutDTO", - "relationshipType": "one-to-one" - } - ], - "searchEngine": false, - "service": "no" + "changelogDate": "20190117074746", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "no", + "entityTableName": "maps_id_child_wo_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdParentEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithoutDTO", + "ownerSide": true, + "relationshipName": "mapsIdParentEntityWithoutDTO", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "mapsIdGrandchildEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdChildEntityWithoutDTO", + "ownerSide": false, + "relationshipName": "mapsIdGrandchildEntityWithoutDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "no" } diff --git a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json index 166a575a2..8b039f9d2 100644 --- a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithDTO.json @@ -1,24 +1,24 @@ { - "changelogDate": "20220313234025", - "clientRootFolder": "", - "databaseType": "sql", - "dto": "mapstruct", - "entityTableName": "maps_id_grandchild_with_dto", - "fields": [{ "fieldName": "date", "fieldType": "Instant" }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "pagination": "no", - "relationships": [ - { - "id": true, - "otherEntityField": "id", - "otherEntityName": "mapsIdChildEntityWithDTO", - "otherEntityRelationshipName": "mapsIdGrandchildEntityWithDTO", - "ownerSide": true, - "relationshipName": "mapsIdChildEntityWithDTO", - "relationshipType": "one-to-one" - } - ], - "searchEngine": false, - "service": "serviceImpl" + "changelogDate": "20220313234025", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_grandchild_with_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdChildEntityWithDTO", + "otherEntityRelationshipName": "mapsIdGrandchildEntityWithDTO", + "ownerSide": true, + "relationshipName": "mapsIdChildEntityWithDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json index 44b372c14..3451510d1 100644 --- a/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json +++ b/test-integration/samples/.jhipster/MapsIdGrandchildEntityWithoutDTO.json @@ -1,24 +1,24 @@ { - "changelogDate": "20220313234416", - "clientRootFolder": "", - "databaseType": "sql", - "dto": "no", - "entityTableName": "maps_id_grandchild_wo_dto", - "fields": [{ "fieldName": "date", "fieldType": "Instant" }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "pagination": "no", - "relationships": [ - { - "id": true, - "otherEntityField": "id", - "otherEntityName": "mapsIdChildEntityWithoutDTO", - "otherEntityRelationshipName": "mapsIdGrandchildEntityWithoutDTO", - "ownerSide": true, - "relationshipName": "mapsIdChildEntityWithoutDTO", - "relationshipType": "one-to-one" - } - ], - "searchEngine": false, - "service": "no" + "changelogDate": "20220313234416", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "no", + "entityTableName": "maps_id_grandchild_wo_dto", + "fields": [{ "fieldName": "date", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "id", + "otherEntityName": "mapsIdChildEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdGrandchildEntityWithoutDTO", + "ownerSide": true, + "relationshipName": "mapsIdChildEntityWithoutDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "no" } diff --git a/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json b/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json index d56f201a3..3611cb4d5 100644 --- a/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdParentEntityWithDTO.json @@ -1,22 +1,22 @@ { - "changelogDate": "20190117075042", - "clientRootFolder": "", - "databaseType": "sql", - "dto": "mapstruct", - "entityTableName": "maps_id_parent_with_dto", - "fields": [{ "fieldName": "name", "fieldType": "String" }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "mapsIdChildEntityWithDTO", - "otherEntityRelationshipName": "mapsIdParentEntityWithDTO", - "ownerSide": false, - "relationshipName": "mapsIdChildEntityWithDTO", - "relationshipType": "one-to-one" - } - ], - "searchEngine": false, - "service": "serviceImpl" + "changelogDate": "20190117075042", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_parent_with_dto", + "fields": [{ "fieldName": "name", "fieldType": "String" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "mapsIdChildEntityWithDTO", + "otherEntityRelationshipName": "mapsIdParentEntityWithDTO", + "ownerSide": false, + "relationshipName": "mapsIdChildEntityWithDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json b/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json index 78c400ec6..fe91ddb75 100644 --- a/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json +++ b/test-integration/samples/.jhipster/MapsIdParentEntityWithoutDTO.json @@ -1,22 +1,22 @@ { - "changelogDate": "20190117074315", - "clientRootFolder": "", - "databaseType": "sql", - "dto": "no", - "entityTableName": "maps_id_parent_wo_dto", - "fields": [{ "fieldName": "name", "fieldType": "String" }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "mapsIdChildEntityWithoutDTO", - "otherEntityRelationshipName": "mapsIdParentEntityWithoutDTO", - "ownerSide": false, - "relationshipName": "mapsIdChildEntityWithoutDTO", - "relationshipType": "one-to-one" - } - ], - "searchEngine": false, - "service": "no" + "changelogDate": "20190117074315", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "no", + "entityTableName": "maps_id_parent_wo_dto", + "fields": [{ "fieldName": "name", "fieldType": "String" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "mapsIdChildEntityWithoutDTO", + "otherEntityRelationshipName": "mapsIdParentEntityWithoutDTO", + "ownerSide": false, + "relationshipName": "mapsIdChildEntityWithoutDTO", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "no" } diff --git a/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json b/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json index 2c26d97dd..4cba8dd63 100644 --- a/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json +++ b/test-integration/samples/.jhipster/MapsIdUserProfileWithDTO.json @@ -1,24 +1,24 @@ { - "changelogDate": "20190117080030", - "clientRootFolder": "", - "databaseType": "sql", - "dto": "mapstruct", - "entityTableName": "maps_id_user_profile_with_dto", - "fields": [{ "fieldName": "dateOfBirth", "fieldType": "Instant" }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "pagination": "no", - "relationships": [ - { - "id": true, - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "mapsIdUserProfileWithDTO", - "ownerSide": true, - "relationshipName": "user", - "relationshipType": "one-to-one" - } - ], - "searchEngine": false, - "service": "serviceImpl" + "changelogDate": "20190117080030", + "clientRootFolder": "", + "databaseType": "sql", + "dto": "mapstruct", + "entityTableName": "maps_id_user_profile_with_dto", + "fields": [{ "fieldName": "dateOfBirth", "fieldType": "Instant" }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "pagination": "no", + "relationships": [ + { + "id": true, + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "mapsIdUserProfileWithDTO", + "ownerSide": true, + "relationshipName": "user", + "relationshipType": "one-to-one" + } + ], + "searchEngine": false, + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MicroserviceBankAccount.json b/test-integration/samples/.jhipster/MicroserviceBankAccount.json index 033940e17..2536a721f 100644 --- a/test-integration/samples/.jhipster/MicroserviceBankAccount.json +++ b/test-integration/samples/.jhipster/MicroserviceBankAccount.json @@ -1,30 +1,30 @@ { - "changelogDate": "20200804163350", - "dto": "mapstruct", - "fields": [ - { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "bankNumber", "fieldType": "Integer" }, - { "fieldName": "agencyNumber", "fieldType": "Long" }, - { "fieldName": "lastOperationDuration", "fieldType": "Float" }, - { "fieldName": "meanOperationDuration", "fieldType": "Double" }, - { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, - { "fieldName": "openingDay", "fieldType": "LocalDate" }, - { "fieldName": "lastOperationDate", "fieldType": "Instant" }, - { "fieldName": "active", "fieldType": "Boolean" }, - { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, - { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, - { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } - ], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "microserviceOperation", - "otherEntityRelationshipName": "bankAccount", - "relationshipName": "operation", - "relationshipType": "one-to-many" - } - ], - "service": "serviceImpl" + "changelogDate": "20200804163350", + "dto": "mapstruct", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "bankNumber", "fieldType": "Integer" }, + { "fieldName": "agencyNumber", "fieldType": "Long" }, + { "fieldName": "lastOperationDuration", "fieldType": "Float" }, + { "fieldName": "meanOperationDuration", "fieldType": "Double" }, + { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] }, + { "fieldName": "openingDay", "fieldType": "LocalDate" }, + { "fieldName": "lastOperationDate", "fieldType": "Instant" }, + { "fieldName": "active", "fieldType": "Boolean" }, + { "fieldName": "accountType", "fieldType": "BankAccountType", "fieldValues": "CHECKING,SAVINGS,LOAN" }, + { "fieldName": "attachment", "fieldType": "byte[]", "fieldTypeBlobContent": "any" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "microserviceOperation", + "otherEntityRelationshipName": "bankAccount", + "relationshipName": "operation", + "relationshipType": "one-to-many" + } + ], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/MicroserviceLabel.json b/test-integration/samples/.jhipster/MicroserviceLabel.json index df16953ed..1b2b2713d 100644 --- a/test-integration/samples/.jhipster/MicroserviceLabel.json +++ b/test-integration/samples/.jhipster/MicroserviceLabel.json @@ -1,20 +1,20 @@ { - "changelogDate": "20150805124936", - "dto": "no", - "fields": [ - { "fieldName": "label", "fieldType": "String", "fieldValidateRules": ["required", "minlength"], "fieldValidateRulesMinlength": "3" } - ], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "pagination", - "relationships": [ - { - "otherEntityName": "microserviceOperation", - "otherEntityRelationshipName": "label", - "ownerSide": false, - "relationshipName": "operation", - "relationshipType": "many-to-many" - } - ], - "service": "serviceClass" + "changelogDate": "20150805124936", + "dto": "no", + "fields": [ + { "fieldName": "label", "fieldType": "String", "fieldValidateRules": ["required", "minlength"], "fieldValidateRulesMinlength": "3" } + ], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityName": "microserviceOperation", + "otherEntityRelationshipName": "label", + "ownerSide": false, + "relationshipName": "operation", + "relationshipType": "many-to-many" + } + ], + "service": "serviceClass" } diff --git a/test-integration/samples/.jhipster/MicroserviceOperation.json b/test-integration/samples/.jhipster/MicroserviceOperation.json index 09795915c..d4ed0d034 100644 --- a/test-integration/samples/.jhipster/MicroserviceOperation.json +++ b/test-integration/samples/.jhipster/MicroserviceOperation.json @@ -1,29 +1,29 @@ { - "changelogDate": "20150805125054", - "dto": "no", - "fields": [ - { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "description", "fieldType": "String" }, - { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "infinite-scroll", - "relationships": [ - { - "otherEntityField": "name", - "otherEntityName": "microserviceBankAccount", - "otherEntityRelationshipName": "operation", - "relationshipName": "bankAccount", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "label", - "otherEntityName": "microserviceLabel", - "otherEntityRelationshipName": "operation", - "ownerSide": true, - "relationshipName": "label", - "relationshipType": "many-to-many" - } - ], - "service": "no" + "changelogDate": "20150805125054", + "dto": "no", + "fields": [ + { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "description", "fieldType": "String" }, + { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "microserviceBankAccount", + "otherEntityRelationshipName": "operation", + "relationshipName": "bankAccount", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "label", + "otherEntityName": "microserviceLabel", + "otherEntityRelationshipName": "operation", + "ownerSide": true, + "relationshipName": "label", + "relationshipType": "many-to-many" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/Operation.json b/test-integration/samples/.jhipster/Operation.json index 32477fab3..5d44e1aba 100644 --- a/test-integration/samples/.jhipster/Operation.json +++ b/test-integration/samples/.jhipster/Operation.json @@ -1,30 +1,30 @@ { - "changelogDate": "20150805125055", - "clientRootFolder": "test-root", - "dto": "no", - "fields": [ - { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, - { "fieldName": "description", "fieldType": "String" }, - { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } - ], - "fluentMethods": true, - "pagination": "infinite-scroll", - "relationships": [ - { - "otherEntityField": "name", - "otherEntityName": "bankAccount", - "otherEntityRelationshipName": "operation", - "relationshipName": "bankAccount", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "labelName", - "otherEntityName": "label", - "otherEntityRelationshipName": "operation", - "ownerSide": true, - "relationshipName": "label", - "relationshipType": "many-to-many" - } - ], - "service": "no" + "changelogDate": "20150805125055", + "clientRootFolder": "test-root", + "dto": "no", + "fields": [ + { "fieldName": "date", "fieldType": "Instant", "fieldValidateRules": ["required"] }, + { "fieldName": "description", "fieldType": "String" }, + { "fieldName": "amount", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] } + ], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "bankAccount", + "otherEntityRelationshipName": "operation", + "relationshipName": "bankAccount", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "labelName", + "otherEntityName": "label", + "otherEntityRelationshipName": "operation", + "ownerSide": true, + "relationshipName": "label", + "relationshipType": "many-to-many" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/Place.json b/test-integration/samples/.jhipster/Place.json index 49d86d32f..a4a9a55e3 100644 --- a/test-integration/samples/.jhipster/Place.json +++ b/test-integration/samples/.jhipster/Place.json @@ -1,34 +1,34 @@ { - "changelogDate": "20170626061521", - "clientRootFolder": "test-root", - "dto": "no", - "entityTableName": "place", - "fields": [ - { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, - { "fieldName": "numberOfSeats", "fieldType": "Long" }, - { "fieldName": "shortName", "fieldType": "String" }, - { "fieldName": "colorBackground", "fieldType": "String" }, - { "fieldName": "colorText", "fieldType": "String" }, - { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } - ], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [ - { - "otherEntityField": "name", - "otherEntityName": "division", - "otherEntityRelationshipName": "preferredPlace", - "ownerSide": true, - "relationshipName": "preferredDivision", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "name", - "otherEntityName": "division", - "otherEntityRelationshipName": "divisionsPlace", - "relationshipName": "owner", - "relationshipType": "many-to-one" - } - ], - "service": "no" + "changelogDate": "20170626061521", + "clientRootFolder": "test-root", + "dto": "no", + "entityTableName": "place", + "fields": [ + { "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }, + { "fieldName": "numberOfSeats", "fieldType": "Long" }, + { "fieldName": "shortName", "fieldType": "String" }, + { "fieldName": "colorBackground", "fieldType": "String" }, + { "fieldName": "colorText", "fieldType": "String" }, + { "fieldName": "description", "fieldType": "byte[]", "fieldTypeBlobContent": "text" } + ], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "division", + "otherEntityRelationshipName": "preferredPlace", + "ownerSide": true, + "relationshipName": "preferredDivision", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "name", + "otherEntityName": "division", + "otherEntityRelationshipName": "divisionsPlace", + "relationshipName": "owner", + "relationshipType": "many-to-one" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json b/test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json index 941035687..27de9cff5 100644 --- a/test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json +++ b/test-integration/samples/.jhipster/SuperMegaLargeTestEntity.json @@ -1,60 +1,60 @@ { - "angularJSSuffix": "mySuffixAlt", - "changelogDate": "20181120190609", - "dto": "no", - "fields": [], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "testManyToOne", - "otherEntityRelationshipName": "superMegaLargeTestEntity", - "relationshipName": "superMegaLargeTestManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testManyToMany", - "otherEntityRelationshipName": "superMegaLargeTestEntity", - "ownerSide": false, - "relationshipName": "superMegaLargeTestManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testOneToOne", - "otherEntityRelationshipName": "superMegaLargeTestEntity", - "ownerSide": false, - "relationshipName": "superMegaLargeTestOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "relationshipName": "superMegaLargeUserOneToMany", - "relationshipType": "many-to-one", - "relationshipValidateRules": "required" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "superMegaLargeUserManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "parent", - "ownerSide": true, - "relationshipName": "superMegaLargeUserOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "testCustomTableName", - "otherEntityRelationshipName": "superMegaLargeTestEntity", - "relationshipName": "superMegaLargeTestCustomTableName", - "relationshipType": "one-to-many" - } - ], - "service": "no" + "angularJSSuffix": "mySuffixAlt", + "changelogDate": "20181120190609", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "relationshipName": "superMegaLargeTestManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "ownerSide": false, + "relationshipName": "superMegaLargeTestManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "ownerSide": false, + "relationshipName": "superMegaLargeTestOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "relationshipName": "superMegaLargeUserOneToMany", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "superMegaLargeUserManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "superMegaLargeUserOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "superMegaLargeTestEntity", + "relationshipName": "superMegaLargeTestCustomTableName", + "relationshipType": "one-to-many" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestCustomTableName.json b/test-integration/samples/.jhipster/TestCustomTableName.json index 14254548e..1447e8f2a 100644 --- a/test-integration/samples/.jhipster/TestCustomTableName.json +++ b/test-integration/samples/.jhipster/TestCustomTableName.json @@ -1,61 +1,61 @@ { - "changelogDate": "20160208210109", - "dto": "no", - "entityTableName": "test_custom_table_name_entity", - "fields": [], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "testManyToOne", - "otherEntityRelationshipName": "testCustomTableName", - "relationshipName": "testManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testManyToMany", - "otherEntityRelationshipName": "testCustomTableName", - "ownerSide": false, - "relationshipName": "testManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testOneToOne", - "otherEntityRelationshipName": "testCustomTableName", - "ownerSide": false, - "relationshipName": "testOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testEntity", - "relationshipName": "testEntity", - "relationshipType": "many-to-one", - "relationshipValidateRules": "required" - }, - { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "parent", - "ownerSide": true, - "relationshipName": "userOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "superMegaLargeTestEntity", - "relationshipName": "superMegaLargeTestEntity", - "relationshipType": "many-to-one", - "relationshipValidateRules": "required" - } - ], - "service": "no" + "changelogDate": "20160208210109", + "dto": "no", + "entityTableName": "test_custom_table_name_entity", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testCustomTableName", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testCustomTableName", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testCustomTableName", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "relationshipName": "testEntity", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestEntity.json b/test-integration/samples/.jhipster/TestEntity.json index 71d6b26f0..34c390d0d 100644 --- a/test-integration/samples/.jhipster/TestEntity.json +++ b/test-integration/samples/.jhipster/TestEntity.json @@ -1,60 +1,60 @@ { - "angularJSSuffix": "mySuffixAlt", - "changelogDate": "20160208210110", - "dto": "no", - "fields": [], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "testManyToOne", - "otherEntityRelationshipName": "testEntity", - "relationshipName": "testManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testManyToMany", - "otherEntityRelationshipName": "testEntity", - "ownerSide": false, - "relationshipName": "testManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testOneToOne", - "otherEntityRelationshipName": "testEntity", - "ownerSide": false, - "relationshipName": "testOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "relationshipName": "userOneToMany", - "relationshipType": "many-to-one", - "relationshipValidateRules": "required" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "parent", - "ownerSide": true, - "relationshipName": "userOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "testCustomTableName", - "otherEntityRelationshipName": "testEntity", - "relationshipName": "testCustomTableName", - "relationshipType": "one-to-many" - } - ], - "service": "no" + "angularJSSuffix": "mySuffixAlt", + "changelogDate": "20160208210110", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testEntity", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testEntity", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testEntity", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "relationshipName": "userOneToMany", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testEntity", + "relationshipName": "testCustomTableName", + "relationshipType": "one-to-many" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestInfiniteScroll.json b/test-integration/samples/.jhipster/TestInfiniteScroll.json index c63cf8c37..6f5fa2ce0 100644 --- a/test-integration/samples/.jhipster/TestInfiniteScroll.json +++ b/test-integration/samples/.jhipster/TestInfiniteScroll.json @@ -1,46 +1,46 @@ { - "changelogDate": "20160208210111", - "dto": "no", - "fields": [], - "fluentMethods": true, - "pagination": "infinite-scroll", - "relationships": [ - { - "otherEntityName": "testManyToOne", - "otherEntityRelationshipName": "testInfiniteScroll", - "relationshipName": "testManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testManyToMany", - "otherEntityRelationshipName": "testInfiniteScroll", - "ownerSide": false, - "relationshipName": "testManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testOneToOne", - "otherEntityRelationshipName": "testInfiniteScroll", - "ownerSide": false, - "relationshipName": "testOneToOne", - "relationshipType": "one-to-one" - }, - { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "parent", - "ownerSide": true, - "relationshipName": "userOneToOne", - "relationshipType": "one-to-one" - } - ], - "service": "no" + "changelogDate": "20160208210111", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "infinite-scroll", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testInfiniteScroll", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testInfiniteScroll", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testInfiniteScroll", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestManyRelPaginDTO.json b/test-integration/samples/.jhipster/TestManyRelPaginDTO.json index b605b8804..bdb8afbf6 100644 --- a/test-integration/samples/.jhipster/TestManyRelPaginDTO.json +++ b/test-integration/samples/.jhipster/TestManyRelPaginDTO.json @@ -1,52 +1,52 @@ { - "angularJSSuffix": "mySuffix", - "changelogDate": "20160208210534", - "dto": "mapstruct", - "entityTableName": "test_many_many_pagination_dto", - "fields": [], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [ - { - "otherEntityName": "testMapstruct", - "otherEntityRelationshipName": "testMapstructOwnerOneToOne", - "ownerSide": false, - "relationshipName": "backTestMapstructOwnerOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "testMapstruct", - "otherEntityRelationshipName": "testMapstructOwnerManyToMany", - "ownerSide": false, - "relationshipName": "backTestMapstructOwnerManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testMapstruct", - "otherEntityRelationshipName": "testMapstructOwnerManyToOne", - "relationshipName": "backTestMapstructOwnerManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testMapstruct", - "otherEntityRelationshipName": "testMapstructBackOneToOne", - "ownerSide": true, - "relationshipName": "backTestMapstructBackOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "testMapstruct", - "otherEntityRelationshipName": "testMapstructBackManyToMany", - "ownerSide": true, - "relationshipName": "backTestMapstructBackManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testMapstruct", - "otherEntityRelationshipName": "testMapstructBackManyToOne", - "relationshipName": "backTestMapstructBackManyToOne", - "relationshipType": "many-to-one" - } - ], - "service": "serviceImpl" + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208210534", + "dto": "mapstruct", + "entityTableName": "test_many_many_pagination_dto", + "fields": [], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructOwnerOneToOne", + "ownerSide": false, + "relationshipName": "backTestMapstructOwnerOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructOwnerManyToMany", + "ownerSide": false, + "relationshipName": "backTestMapstructOwnerManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructOwnerManyToOne", + "relationshipName": "backTestMapstructOwnerManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructBackOneToOne", + "ownerSide": true, + "relationshipName": "backTestMapstructBackOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructBackManyToMany", + "ownerSide": true, + "relationshipName": "backTestMapstructBackManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testMapstruct", + "otherEntityRelationshipName": "testMapstructBackManyToOne", + "relationshipName": "backTestMapstructBackManyToOne", + "relationshipType": "many-to-one" + } + ], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/TestManyToMany.json b/test-integration/samples/.jhipster/TestManyToMany.json index aee8d4235..a045ff515 100644 --- a/test-integration/samples/.jhipster/TestManyToMany.json +++ b/test-integration/samples/.jhipster/TestManyToMany.json @@ -1,67 +1,67 @@ { - "angularJSSuffix": "mySuffix", - "changelogDate": "20160208210535", - "dto": "no", - "fields": [], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityField": "id", - "otherEntityName": "testEntity", - "otherEntityRelationshipName": "testManyToMany", - "ownerSide": true, - "relationshipName": "testEntity", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "testServiceClass", - "otherEntityRelationshipName": "testManyToMany", - "ownerSide": true, - "relationshipName": "testServiceClass", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "testServiceImpl", - "otherEntityRelationshipName": "testManyToMany", - "ownerSide": true, - "relationshipName": "testServiceImpl", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "testInfiniteScroll", - "otherEntityRelationshipName": "testManyToMany", - "ownerSide": true, - "relationshipName": "testInfiniteScroll", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "testPagination", - "otherEntityRelationshipName": "testManyToMany", - "ownerSide": true, - "relationshipName": "testPagination", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "testCustomTableName", - "otherEntityRelationshipName": "testManyToMany", - "ownerSide": true, - "relationshipName": "testCustomTableName", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "id", - "otherEntityName": "superMegaLargeTestEntity", - "otherEntityRelationshipName": "superMegaLargeTestManyToMany", - "ownerSide": true, - "relationshipName": "superMegaLargeTestEntity", - "relationshipType": "many-to-many" - } - ], - "service": "no" + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208210535", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testEntity", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceClass", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testServiceClass", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceImpl", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testServiceImpl", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testInfiniteScroll", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testInfiniteScroll", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testPagination", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testPagination", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testManyToMany", + "ownerSide": true, + "relationshipName": "testCustomTableName", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "otherEntityRelationshipName": "superMegaLargeTestManyToMany", + "ownerSide": true, + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "many-to-many" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestManyToOne.json b/test-integration/samples/.jhipster/TestManyToOne.json index a69d8274b..00294ef91 100644 --- a/test-integration/samples/.jhipster/TestManyToOne.json +++ b/test-integration/samples/.jhipster/TestManyToOne.json @@ -1,60 +1,60 @@ { - "angularJSSuffix": "mySuffix", - "changelogDate": "20160208211440", - "dto": "no", - "fields": [], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityField": "id", - "otherEntityName": "testEntity", - "otherEntityRelationshipName": "testManyToOne", - "relationshipName": "testEntity", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testServiceClass", - "otherEntityRelationshipName": "testManyToOne", - "relationshipName": "testServiceClass", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testServiceImpl", - "otherEntityRelationshipName": "testManyToOne", - "relationshipName": "testServiceImpl", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testInfiniteScroll", - "otherEntityRelationshipName": "testManyToOne", - "relationshipName": "testInfiniteScroll", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testPagination", - "otherEntityRelationshipName": "testManyToOne", - "relationshipName": "testPagination", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testCustomTableName", - "otherEntityRelationshipName": "testManyToOne", - "relationshipName": "testCustomTableName", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "superMegaLargeTestEntity", - "otherEntityRelationshipName": "superMegaLargeTestManyToOne", - "relationshipName": "superMegaLargeTestEntity", - "relationshipType": "many-to-one" - } - ], - "service": "no" + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208211440", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testEntity", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceClass", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testServiceClass", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceImpl", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testServiceImpl", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testInfiniteScroll", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testInfiniteScroll", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testPagination", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testPagination", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testManyToOne", + "relationshipName": "testCustomTableName", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "otherEntityRelationshipName": "superMegaLargeTestManyToOne", + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "many-to-one" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestMapstruct.json b/test-integration/samples/.jhipster/TestMapstruct.json index 9436e3a4c..442b732ac 100644 --- a/test-integration/samples/.jhipster/TestMapstruct.json +++ b/test-integration/samples/.jhipster/TestMapstruct.json @@ -1,65 +1,65 @@ { - "changelogDate": "20160208210112", - "dto": "mapstruct", - "fields": [], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "testManyRelPaginDTO", - "otherEntityRelationshipName": "backTestMapstructOwnerOneToOne", - "ownerSide": true, - "relationshipName": "testMapstructOwnerOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "testManyRelPaginDTO", - "otherEntityRelationshipName": "backTestMapstructOwnerManyToMany", - "ownerSide": true, - "relationshipName": "testMapstructOwnerManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testManyRelPaginDTO", - "otherEntityRelationshipName": "backTestMapstructOwnerManyToOne", - "relationshipName": "testMapstructOwnerManyToOne", - "relationshipType": "many-to-one" - }, - { - "otherEntityName": "testManyRelPaginDTO", - "otherEntityRelationshipName": "backTestMapstructBackOneToOne", - "ownerSide": false, - "relationshipName": "testMapstructBackOneToOne", - "relationshipType": "one-to-one" - }, - { - "otherEntityName": "testManyRelPaginDTO", - "otherEntityRelationshipName": "backTestMapstructBackManyToMany", - "ownerSide": false, - "relationshipName": "testMapstructBackManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testManyRelPaginDTO", - "otherEntityRelationshipName": "backTestMapstructBackManyToOne", - "relationshipName": "testMapstructBackManyToOne", - "relationshipType": "one-to-many" - }, - { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userManyToOne", "relationshipType": "many-to-one" }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userOneToOne", - "relationshipType": "one-to-one" - } - ], - "service": "no" + "changelogDate": "20160208210112", + "dto": "mapstruct", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructOwnerOneToOne", + "ownerSide": true, + "relationshipName": "testMapstructOwnerOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructOwnerManyToMany", + "ownerSide": true, + "relationshipName": "testMapstructOwnerManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructOwnerManyToOne", + "relationshipName": "testMapstructOwnerManyToOne", + "relationshipType": "many-to-one" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructBackOneToOne", + "ownerSide": false, + "relationshipName": "testMapstructBackOneToOne", + "relationshipType": "one-to-one" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructBackManyToMany", + "ownerSide": false, + "relationshipName": "testMapstructBackManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testManyRelPaginDTO", + "otherEntityRelationshipName": "backTestMapstructBackManyToOne", + "relationshipName": "testMapstructBackManyToOne", + "relationshipType": "one-to-many" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userManyToOne", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestOneToOne.json b/test-integration/samples/.jhipster/TestOneToOne.json index 83af31676..8c6244c69 100644 --- a/test-integration/samples/.jhipster/TestOneToOne.json +++ b/test-integration/samples/.jhipster/TestOneToOne.json @@ -1,67 +1,67 @@ { - "angularJSSuffix": "mySuffix", - "changelogDate": "20160208211541", - "dto": "no", - "fields": [], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityField": "id", - "otherEntityName": "testEntity", - "otherEntityRelationshipName": "testOneToOne", - "ownerSide": true, - "relationshipName": "testEntity", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testServiceClass", - "otherEntityRelationshipName": "testOneToOne", - "ownerSide": true, - "relationshipName": "testServiceClass", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testServiceImpl", - "otherEntityRelationshipName": "testOneToOne", - "ownerSide": true, - "relationshipName": "testServiceImpl", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testInfiniteScroll", - "otherEntityRelationshipName": "testOneToOne", - "ownerSide": true, - "relationshipName": "testInfiniteScroll", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testPagination", - "otherEntityRelationshipName": "testOneToOne", - "ownerSide": true, - "relationshipName": "testPagination", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testCustomTableName", - "otherEntityRelationshipName": "testOneToOne", - "ownerSide": true, - "relationshipName": "testCustomTableName", - "relationshipType": "one-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "superMegaLargeTestEntity", - "otherEntityRelationshipName": "superMegaLargeTestOneToOne", - "ownerSide": true, - "relationshipName": "superMegaLargeTestEntity", - "relationshipType": "one-to-one" - } - ], - "service": "no" + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208211541", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testEntity", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceClass", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testServiceClass", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testServiceImpl", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testServiceImpl", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testInfiniteScroll", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testInfiniteScroll", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testPagination", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testPagination", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testCustomTableName", + "otherEntityRelationshipName": "testOneToOne", + "ownerSide": true, + "relationshipName": "testCustomTableName", + "relationshipType": "one-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "superMegaLargeTestEntity", + "otherEntityRelationshipName": "superMegaLargeTestOneToOne", + "ownerSide": true, + "relationshipName": "superMegaLargeTestEntity", + "relationshipType": "one-to-one" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestPagination.json b/test-integration/samples/.jhipster/TestPagination.json index bd9166206..59eff33e7 100644 --- a/test-integration/samples/.jhipster/TestPagination.json +++ b/test-integration/samples/.jhipster/TestPagination.json @@ -1,46 +1,46 @@ { - "changelogDate": "20160208210113", - "dto": "no", - "fields": [], - "fluentMethods": true, - "pagination": "pagination", - "relationships": [ - { - "otherEntityName": "testManyToOne", - "otherEntityRelationshipName": "testPagination", - "relationshipName": "testManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testManyToMany", - "otherEntityRelationshipName": "testPagination", - "ownerSide": false, - "relationshipName": "testManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testOneToOne", - "otherEntityRelationshipName": "testPagination", - "ownerSide": false, - "relationshipName": "testOneToOne", - "relationshipType": "one-to-one" - }, - { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "parent", - "ownerSide": true, - "relationshipName": "userOneToOne", - "relationshipType": "one-to-one" - } - ], - "service": "no" + "changelogDate": "20160208210113", + "dto": "no", + "fields": [], + "fluentMethods": true, + "pagination": "pagination", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testPagination", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testPagination", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testPagination", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/TestServiceClass.json b/test-integration/samples/.jhipster/TestServiceClass.json index 2edd177d2..565136bd7 100644 --- a/test-integration/samples/.jhipster/TestServiceClass.json +++ b/test-integration/samples/.jhipster/TestServiceClass.json @@ -1,47 +1,47 @@ { - "changelogDate": "20160208210114", - "dto": "no", - "fields": [], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "testManyToOne", - "otherEntityRelationshipName": "testServiceClass", - "relationshipName": "testManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testManyToMany", - "otherEntityRelationshipName": "testServiceClass", - "ownerSide": false, - "relationshipName": "testManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testOneToOne", - "otherEntityRelationshipName": "testServiceClass", - "ownerSide": false, - "relationshipName": "testOneToOne", - "relationshipType": "one-to-one" - }, - { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "parent", - "ownerSide": true, - "relationshipName": "userOneToOne", - "relationshipType": "one-to-one" - } - ], - "service": "serviceClass" + "changelogDate": "20160208210114", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testServiceClass", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testServiceClass", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testServiceClass", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "serviceClass" } diff --git a/test-integration/samples/.jhipster/TestServiceImpl.json b/test-integration/samples/.jhipster/TestServiceImpl.json index 0d0abba6e..b7204d90c 100644 --- a/test-integration/samples/.jhipster/TestServiceImpl.json +++ b/test-integration/samples/.jhipster/TestServiceImpl.json @@ -1,47 +1,47 @@ { - "changelogDate": "20160208210115", - "dto": "no", - "fields": [], - "fluentMethods": true, - "jpaMetamodelFiltering": true, - "pagination": "no", - "relationships": [ - { - "otherEntityName": "testManyToOne", - "otherEntityRelationshipName": "testServiceImpl", - "relationshipName": "testManyToOne", - "relationshipType": "one-to-many" - }, - { - "otherEntityName": "testManyToMany", - "otherEntityRelationshipName": "testServiceImpl", - "ownerSide": false, - "relationshipName": "testManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityName": "testOneToOne", - "otherEntityRelationshipName": "testServiceImpl", - "ownerSide": false, - "relationshipName": "testOneToOne", - "relationshipType": "one-to-one" - }, - { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "ownerSide": true, - "relationshipName": "userManyToMany", - "relationshipType": "many-to-many" - }, - { - "otherEntityField": "login", - "otherEntityName": "user", - "otherEntityRelationshipName": "parent", - "ownerSide": true, - "relationshipName": "userOneToOne", - "relationshipType": "one-to-one" - } - ], - "service": "serviceImpl" + "changelogDate": "20160208210115", + "dto": "no", + "fields": [], + "fluentMethods": true, + "jpaMetamodelFiltering": true, + "pagination": "no", + "relationships": [ + { + "otherEntityName": "testManyToOne", + "otherEntityRelationshipName": "testServiceImpl", + "relationshipName": "testManyToOne", + "relationshipType": "one-to-many" + }, + { + "otherEntityName": "testManyToMany", + "otherEntityRelationshipName": "testServiceImpl", + "ownerSide": false, + "relationshipName": "testManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityName": "testOneToOne", + "otherEntityRelationshipName": "testServiceImpl", + "ownerSide": false, + "relationshipName": "testOneToOne", + "relationshipType": "one-to-one" + }, + { "otherEntityField": "login", "otherEntityName": "user", "relationshipName": "userOneToMany", "relationshipType": "many-to-one" }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "ownerSide": true, + "relationshipName": "userManyToMany", + "relationshipType": "many-to-many" + }, + { + "otherEntityField": "login", + "otherEntityName": "user", + "otherEntityRelationshipName": "parent", + "ownerSide": true, + "relationshipName": "userOneToOne", + "relationshipType": "one-to-one" + } + ], + "service": "serviceImpl" } diff --git a/test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json b/test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json index 2f69cd586..1b9b759c6 100644 --- a/test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json +++ b/test-integration/samples/.jhipster/TestTwoRelationshipsSameEntity.json @@ -1,44 +1,44 @@ { - "angularJSSuffix": "mySuffix", - "changelogDate": "20160208210116", - "dto": "no", - "entityTableName": "test_multiple_rel", - "fields": [], - "fluentMethods": true, - "pagination": "no", - "relationships": [ - { - "otherEntityField": "id", - "otherEntityName": "testEntity", - "otherEntityRelationshipName": "firstTestTwoRelationshipsSameEntity", - "relationshipName": "firstRelationship", - "relationshipType": "many-to-one" - }, - { - "otherEntityField": "id", - "otherEntityName": "testEntity", - "otherEntityRelationshipName": "secondTestTwoRelationshipsSameEntity", - "relationshipName": "secondRelationship", - "relationshipType": "many-to-one" - }, - { "otherEntityName": "user", "ownerSide": true, "relationshipName": "userOne", "relationshipType": "one-to-one" }, - { "otherEntityName": "user", "ownerSide": true, "relationshipName": "userTwo", "relationshipType": "one-to-one" }, - { - "otherEntityField": "id", - "otherEntityName": "division", - "otherEntityRelationshipName": "firstTestTwoRelationshipsSameEntity", - "relationshipName": "firstUniqueRequiredRelation", - "relationshipType": "many-to-one", - "relationshipValidateRules": "required" - }, - { - "otherEntityField": "id", - "otherEntityName": "division", - "otherEntityRelationshipName": "secondTestTwoRelationshipsSameEntity", - "relationshipName": "secondUniqueRequiredRelation", - "relationshipType": "many-to-one", - "relationshipValidateRules": "required" - } - ], - "service": "no" + "angularJSSuffix": "mySuffix", + "changelogDate": "20160208210116", + "dto": "no", + "entityTableName": "test_multiple_rel", + "fields": [], + "fluentMethods": true, + "pagination": "no", + "relationships": [ + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "firstTestTwoRelationshipsSameEntity", + "relationshipName": "firstRelationship", + "relationshipType": "many-to-one" + }, + { + "otherEntityField": "id", + "otherEntityName": "testEntity", + "otherEntityRelationshipName": "secondTestTwoRelationshipsSameEntity", + "relationshipName": "secondRelationship", + "relationshipType": "many-to-one" + }, + { "otherEntityName": "user", "ownerSide": true, "relationshipName": "userOne", "relationshipType": "one-to-one" }, + { "otherEntityName": "user", "ownerSide": true, "relationshipName": "userTwo", "relationshipType": "one-to-one" }, + { + "otherEntityField": "id", + "otherEntityName": "division", + "otherEntityRelationshipName": "firstTestTwoRelationshipsSameEntity", + "relationshipName": "firstUniqueRequiredRelation", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + }, + { + "otherEntityField": "id", + "otherEntityName": "division", + "otherEntityRelationshipName": "secondTestTwoRelationshipsSameEntity", + "relationshipName": "secondUniqueRequiredRelation", + "relationshipType": "many-to-one", + "relationshipValidateRules": "required" + } + ], + "service": "no" } diff --git a/test-integration/samples/.jhipster/Track.json b/test-integration/samples/.jhipster/Track.json index ca662c941..bdb0fb9d3 100644 --- a/test-integration/samples/.jhipster/Track.json +++ b/test-integration/samples/.jhipster/Track.json @@ -1,24 +1,24 @@ { - "applications": "*", - "changelogDate": "20200417190923", - "clientRootFolder": "", - "dto": "no", - "embedded": false, - "entityTableName": "track", - "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], - "fluentMethods": true, - "jpaMetamodelFiltering": false, - "name": "Track", - "pagination": "no", - "readOnly": false, - "relationships": [ - { - "otherEntityField": "name", - "otherEntityName": "album", - "otherEntityRelationshipName": "track", - "relationshipName": "album", - "relationshipType": "many-to-one" - } - ], - "service": "no" + "applications": "*", + "changelogDate": "20200417190923", + "clientRootFolder": "", + "dto": "no", + "embedded": false, + "entityTableName": "track", + "fields": [{ "fieldName": "name", "fieldType": "String", "fieldValidateRules": ["required"] }], + "fluentMethods": true, + "jpaMetamodelFiltering": false, + "name": "Track", + "pagination": "no", + "readOnly": false, + "relationships": [ + { + "otherEntityField": "name", + "otherEntityName": "album", + "otherEntityRelationshipName": "track", + "relationshipName": "album", + "relationshipType": "many-to-one" + } + ], + "service": "no" }