Merge pull request #164 from jhipster/gh-141

Upgrade to JHipster 6.1.2

Author: sendilkumarn

.travis.yml

@@ -19,8 +19,10 @@
 
 os:
     - linux
+dist: xenial
 services:
     - docker
+    - xvfb
 language: node_js
 node_js:
     - '10.16.0'
@@ -45,14 +47,15 @@ env:
         - JHI_LIB_BRANCH=release
         # if JHI_GEN_BRANCH value is release, use the release from NPM
         - JHI_GEN_REPO=https://github.com/jhipster/generator-jhipster.git
-        - JHI_GEN_BRANCH=v6.0.1
+        - JHI_GEN_BRANCH=v6.1.2
         # specific config
         - SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
         - SPRING_JPA_SHOW_SQL=false
         - JHI_DISABLE_WEBPACK_LOGS=true
         - JHI_E2E_HEADLESS=true
         - JHI_SCRIPTS=$HOME/generator-jhipster/test-integration/scripts
         - KOTLIN_JHI_SCRIPTS=$TRAVIS_BUILD_DIR/test-integration/scripts
+        - NG_CLI_ANALYTICS="false"
     matrix:
         - JHI_APP=ngx-default JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sql JHI_SONAR=1
         - JHI_APP=ngx-psql-es-noi18n-mapsid JHI_PROFILE=prod JHI_PROTRACTOR=1 JHI_ENTITY=sqlfull
@@ -86,7 +89,7 @@ before_install:
     - sudo /etc/init.d/postgresql stop
     # Use this for Protractor
     - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
+    # - sh -e /etc/init.d/xvfb start
     # Update NPM
     - npm install -g npm
     # Install Yarn

azure-pipelines.yml

@@ -31,17 +31,23 @@ jobs:
           JHI_LIB_BRANCH: release
           # if JHI_GEN_BRANCH value is release, use the release from NPM
           JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git
-          JHI_GEN_BRANCH: v6.0.1
+          JHI_GEN_BRANCH: v6.1.2
           # specific config
           SPRING_OUTPUT_ANSI_ENABLED: NEVER
           SPRING_JPA_SHOW_SQL: false
           JHI_DISABLE_WEBPACK_LOGS: true
           JHI_E2E_HEADLESS: true
           JHI_SCRIPTS: $HOME/generator-jhipster/test-integration/scripts
           KOTLIN_JHI_SCRIPTS: $(Build.Repository.LocalPath)/test-integration/scripts
+          NG_CLI_ANALYTICS: false
 
       strategy:
           matrix:
+              ngx-default:
+                  JHI_APP: ngx-default
+                  JHI_ENTITY: sql
+                  JHI_PROFILE: prod
+                  JHI_PROTRACTOR: 1
               jdl-default:
                   JHI_APP: kotlin-jdl-default
                   JHI_ENTITY: jdl

generators/entity-server/templates/src/main/kotlin/package/domain/Entity.kt.ejs

@@ -22,10 +22,12 @@ let importJsonIgnore = false;
 let importJsonIgnoreProperties = false;
 let importSet = false;
 let hasDto = dto === 'mapstruct';
+let isUsingMapsId = false;
+let hasTextBlob = false;
+let hasRelationship = relationships.length !== 0;
 let fieldsContainEnum = false;
 let fieldsContainManyToMany = false;
 let fieldsContainOneToOne = false;
-let isUsingMapsId = false;
 const uniqueEnums = {}; %><%- include imports -%>
 <%_
     //todo: maybe move to generator-jhipster/generators/entity/index.js
@@ -50,6 +52,12 @@ const uniqueEnums = {}; %><%- include imports -%>
         }
         isUsingMapsId = false;
     }
+    for (idx in fields) {
+        if ((prodDatabaseType === 'postgresql' || devDatabaseType === 'postgresql') && fields[idx].fieldTypeBlobContent === 'text') {
+            hasTextBlob = true;
+            break;
+        }
+    }
 _%>
 
 <%_ if (databaseType === 'cassandra') { _%>
@@ -69,6 +77,8 @@ import io.swagger.annotations.ApiModelProperty
 <%_ } if (enableHibernateCache) { _%>
 import org.hibernate.annotations.Cache
 import org.hibernate.annotations.CacheConcurrencyStrategy
+<%_ } if (hasTextBlob === true || (fieldsContainUUID === true && ['mysql', 'mariadb'].includes(prodDatabaseType))) { _%>
+import org.hibernate.annotations.Type
 <%_ } if (databaseType === 'mongodb') { _%>
 import org.springframework.data.annotation.Id
 import org.springframework.data.mongodb.core.mapping.Field
@@ -147,7 +157,7 @@ import java.time.ZonedDateTime
 <%_ } if (fieldsContainDuration === true) { _%>
 import java.time.Duration
 <%_ } _%>
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseType === 'cassandra' || fieldsContainUUID === true) { _%>
 import java.util.UUID
 <%_ }
 Object.keys(uniqueEnums).forEach(function(element) { _%>
@@ -242,11 +252,17 @@ for (var idx in fields) {
         <%_ }  _%>
         <%_ if (fieldType === 'byte[]') { _%>
     @Lob
-        <%_ }  _%>
-        <%_if (['Instant', 'ZonedDateTime', 'LocalDate', 'Duration'].includes(fieldType)) { _%>
+        <%_ if ((prodDatabaseType === 'postgresql' || devDatabaseType === 'postgresql') && fieldTypeBlobContent === 'text' ) { _%>
+        @Type(type = "org.hibernate.type.TextType")
+        <%_ }
+        }
+        if (['Instant', 'ZonedDateTime', 'LocalDate', 'Duration'].includes(fieldType)) { _%>
     @Column(name = "<%-fieldNameAsDatabaseColumn %>"<% if (required) { %>, nullable = false<% } %><% if (unique) { %>, unique = true<% } %>)
         <%_ } else if (fieldType === 'BigDecimal') { _%>
     @Column(name = "<%-fieldNameAsDatabaseColumn %>", precision = 21, scale = 2<% if (required) { %>, nullable = false<% } %><% if (unique) { %>, unique = true<% } %>)
+        <%_ } else if (fieldType === 'UUID' && ['mysql', 'mariadb'].includes(prodDatabaseType)) { _%>
+    @Type(type = "uuid-char")
+    @Column(name = "<%-fieldNameAsDatabaseColumn %>", length = 36<% if (required) { %>, nullable = false<% } %><% if (unique) { %>, unique = true<% } %>)
         <%_ } else { _%>
     @Column(name = "<%-fieldNameAsDatabaseColumn %>"<% if (fieldValidate === true) { %><% if (fieldValidateRules.includes('maxlength')) { %>, length = <%= fieldValidateRulesMaxlength %><% } %><% if (required) { %>, nullable = false<% } %><% if (unique) { %>, unique = true<% } %><% } %>)
         <%_ } _%>
@@ -442,26 +458,23 @@ for (var idx in fields) {
         return id == other.id
     }
 
-    override fun hashCode(): Int {
-        return 31
-    }
+    override fun hashCode() = 31
 
-    override fun toString(): String {
-        return "<%= asEntity(entityClass) %>{" +
-            "id=$id" +
-            <%_ for (idx in fields) {
-                const fieldType = fields[idx].fieldType;
-                const fieldTypeBlobContent = fields[idx].fieldTypeBlobContent;
-                const fieldName = fields[idx].fieldName;
-                const fieldInJavaBeanMethod = fields[idx].fieldInJavaBeanMethod;
-                const isNumeric = ['integer', 'long', 'float', 'double', 'bigdecimal'].includes(fieldType.toLowerCase());_%>
-            ", <%= fieldName %>=<% if (! isNumeric) { %>'<% } %>$<%= fieldName %><% if (! isNumeric) { %>'<% } %>" +
-                <%_ if ((fieldType === 'byte[]' || fieldType === 'ByteBuffer') && fieldTypeBlobContent !== 'text') { _%>
-            ", <%= fieldName %>ContentType='$<%= fieldName %>ContentType'" +
-                <%_ } _%>
+    override fun toString() = "<%= asEntity(entityClass) %>{" +
+        "id=$id" +
+        <%_ for (idx in fields) {
+            const fieldType = fields[idx].fieldType;
+            const fieldTypeBlobContent = fields[idx].fieldTypeBlobContent;
+            const fieldName = fields[idx].fieldName;
+            const fieldInJavaBeanMethod = fields[idx].fieldInJavaBeanMethod;
+            const isNumeric = ['integer', 'long', 'float', 'double', 'bigdecimal'].includes(fieldType.toLowerCase());_%>
+        ", <%= fieldName %>=<% if (! isNumeric) { %>'<% } %>$<%= fieldName %><% if (! isNumeric) { %>'<% } %>" +
+            <%_ if ((fieldType === 'byte[]' || fieldType === 'ByteBuffer') && fieldTypeBlobContent !== 'text') { _%>
+        ", <%= fieldName %>ContentType='$<%= fieldName %>ContentType'" +
             <%_ } _%>
-            "}"
-    }
+        <%_ } _%>
+        "}"
+
 
     companion object {
         private const val serialVersionUID = 1L

generators/entity-server/templates/src/main/kotlin/package/domain/imports.ejs

@@ -35,9 +35,7 @@ if (!importApiModelProperty) {
 }
 
 for (idx in relationships) {
-    if (relationships[idx].relationshipType === 'one-to-many'
-        || relationships[idx].relationshipType === 'one-to-one' && relationships[idx].ownerSide === false
-        || relationships[idx].relationshipType === 'many-to-many' && relationships[idx].ownerSide === false) {
+    if (relationships[idx].ownerSide === false && ['one-to-many', 'one-to-one', 'many-to-many'].includes(relationships[idx].relationshipType)) {
         importJsonIgnore = true;
     } else if (relationships[idx].relationshipType === 'many-to-one') {
         importJsonIgnoreProperties = true;

generators/entity-server/templates/src/main/kotlin/package/service/EntityQueryService.kt.ejs

@@ -125,7 +125,9 @@ class <%= serviceClassName %>(
     }
 
     /**
-     * Function to convert [<%= criteria %>] to a [Specification].
+     * Function to convert ConsumerCriteria to a [Specification].
+     * @param criteria The object which holds all the filters, which the entities should match.
+     * @return the matching [Specification] of the entity.
      */
     private fun createSpecification(criteria: <%= criteria %>?): Specification<<%= asEntity(entityClass) %>?> {
         var specification: Specification<<%= asEntity(entityClass) %>?> = Specification.where(null)

generators/entity-server/templates/src/main/kotlin/package/service/dto/EntityCriteria.kt.ejs

@@ -19,9 +19,6 @@
 package <%= packageName %>.service.dto
 
 import java.io.Serializable
-<%_ if (fieldsContainDuration === true) { _%>
-import java.time.Duration
-<%_ } _%>
 import io.github.jhipster.service.Criteria
 <%_ for (idx in fields) { if (fields[idx].fieldIsEnum === true) { _%>
 import <%= packageName %>.domain.enumeration.<%= fields[idx].fieldType %>
@@ -36,14 +33,17 @@ import io.github.jhipster.service.filter.StringFilter
 <%_ if (fieldsContainBigDecimal === true) { _%>
 import io.github.jhipster.service.filter.BigDecimalFilter
 <%_ } _%>
+<%_ if (fieldsContainDuration === true) { _%>
+import io.github.jhipster.service.filter.DurationFilter
+<%_ } _%>
 <%_ if (fieldsContainInstant === true) { _%>
 import io.github.jhipster.service.filter.InstantFilter
 <%_ } _%>
 <%_ if (fieldsContainLocalDate === true) { _%>
 import io.github.jhipster.service.filter.LocalDateFilter
 <%_ } _%>
-<%_ if (fieldsContainDuration === true) { _%>
-import io.github.jhipster.service.filter.RangeFilter
+<%_ if (fieldsContainUUID === true) { _%>
+import io.github.jhipster.service.filter.UUIDFilter
 <%_ } _%>
 <%_ if (fieldsContainZonedDateTime === true) { _%>
 import io.github.jhipster.service.filter.ZonedDateTimeFilter
@@ -53,14 +53,14 @@ import io.github.jhipster.service.filter.ZonedDateTimeFilter
   const referenceFilterType = '' + pkType + 'Filter';
   var filterVariables = [{name:'id', type: pkType, filterType:referenceFilterType,fieldInJavaBeanMethod:'Id' } ];
   var extraFilters = {};
-  fields.forEach((field, index) => {
+  fields.forEach((field) => {
     const fieldType = field.fieldType;
     if (isFilterableType(fieldType)) {
       var filterType;
       if (field.fieldIsEnum == true) {
         filterType = fieldType + 'Filter';
-        extraFilters[fieldType] = {type : filterType, superType: 'Filter<' + fieldType + '>', fieldType:fieldType};
-      } else if (['Duration', 'LocalDate', 'ZonedDateTime', 'Instant', 'String', 'Long', 'Integer', 'Float', 'Double', 'BigDecimal', 'Boolean'].includes(fieldType)) {
+        extraFilters[fieldType] = {type: filterType, superType: 'Filter<' + fieldType + '>', fieldType: fieldType};
+      } else if (['Duration', 'UUID', 'LocalDate', 'ZonedDateTime', 'Instant', 'String', 'Long', 'Integer', 'Float', 'Double', 'BigDecimal', 'Boolean'].includes(fieldType)) {
         filterType = fieldType + 'Filter';
       } else {
         filterType = 'Filter<' + fieldType + '>';
@@ -71,10 +71,7 @@ import io.github.jhipster.service.filter.ZonedDateTimeFilter
             fieldInJavaBeanMethod: field.fieldInJavaBeanMethod });
     }
   });
-  if (fieldsContainDuration === true) {
-    extraFilters['java.time.Duration'] = {type : 'DurationFilter', superType: 'RangeFilter<Duration>', fieldType: 'Duration'};
-  }
-  relationships.forEach((relationship, index) => {
+  relationships.forEach((relationship) => {
     const relationshipType = relationship.relationshipType;
     // user has a String PK when using OAuth, so change relationships accordingly
     let oauthAwareReferenceFilterType = referenceFilterType;
@@ -125,15 +122,11 @@ _%>
 
         constructor(filter: <%= extraFilter.type %>) : super(filter)
 
-        override fun copy(): <%= extraFilter.type %> {
-            return <%= extraFilter.type %>(this)
-        }
+        override fun copy() = <%= extraFilter.type %>(this)
     }
 <%_ }); _%>
 
-    override fun copy(): <%= entityClass %>Criteria {
-        return <%= entityClass %>Criteria(this)
-    }
+    override fun copy() = <%= entityClass %>Criteria(this)
 
     companion object {
         private const val serialVersionUID: Long = 1L

generators/entity-server/templates/src/main/kotlin/package/service/dto/EntityDTO.kt.ejs

@@ -57,7 +57,7 @@ import java.math.BigDecimal
 <%_ if (fieldsContainBlob && databaseType === 'cassandra') { _%>
 import java.nio.ByteBuffer
 <%_ } _%>
-<%_ if (databaseType === 'cassandra') { _%>
+<%_ if (databaseType === 'cassandra' || fieldsContainUUID === true) { _%>
 import java.util.UUID
 <%_ } _%>
 <%_ if (fieldsContainBlob && databaseType === 'sql') { _%>
@@ -165,7 +165,5 @@ data class <%= asDto(entityClass) %>(
         return id == other.id
     }
 
-    override fun hashCode(): Int {
-        return id.hashCode()
-    }
+    override fun hashCode() = id.hashCode()
 }

generators/entity-server/templates/src/main/kotlin/package/service/impl/EntityServiceImpl.kt.ejs

@@ -137,9 +137,9 @@ class <%= serviceClassName %>(
      *
      * @return the list of entities.
      */
-    <% if (service === 'serviceImpl') { %>override <% } %>fun findAllWithEagerRelationships(pageable: Pageable): Page<<%= instanceType %>> {
-        return <%= entityInstance %>Repository.findAllWithEagerRelationships(pageable)<% if (dto !== 'mapstruct') { %><% } else { %>.map(<%= entityToDtoReference %>)<% } %>
-    }
+    <% if (service === 'serviceImpl') { %>override <% } %>fun findAllWithEagerRelationships(pageable: Pageable) =
+        <%= entityInstance %>Repository.findAllWithEagerRelationships(pageable)<% if (dto !== 'mapstruct') { %><% } else { %>.map(<%= entityToDtoReference %>)<% } %>
+
     <%_ } _%>
 <%- include('../../common/get_filtered_template', {asEntity, asDto}); -%>
     /**

generators/entity-server/templates/src/main/kotlin/package/service/mapper/EntityMapper.kt.ejs

@@ -71,28 +71,33 @@ _%>
 
 <%_
 // DTO -> entity mapping
-var renMapAnotDto = false;  //Render Mapping Annotation during DTO to Entity conversion?
+var mappedRelsDto = [];
 for (idx in relationships) {
     const relationshipType = relationships[idx].relationshipType;
     const ownerSide = relationships[idx].ownerSide;
     if (relationshipType === 'many-to-one' || (relationshipType === 'one-to-one' && ownerSide === true) ||
         (relationshipType === 'many-to-many' && ownerSide === false) ||
         relationshipType === 'one-to-many' ||
         relationshipType === 'one-to-one' && ownerSide === false) {
-        renMapAnotDto = true;
-        break;
+        mappedRelsDto.push(idx)
     }
-} if(renMapAnotDto === true) { _%>
+}
+var renMapAnotDto = mappedRelsDto.length > 0; //Render Mapping Annotation during DTO to Entity conversion?
+if(renMapAnotDto === true) {
+_%>
     @Mappings(<% } %>
 <%_
 // var hasOAuthUser = false; // if OAuthuser, use a String id in fromId() method
-for (idx in relationships) {
+for (idx in mappedRelsDto) {
     const relationshipType = relationships[idx].relationshipType;
     const relationshipName = relationships[idx].relationshipName;
     // hasOAuthUser = (relationshipName === 'user' && authenticationType === 'oauth2');
     const relationshipNamePlural = relationships[idx].relationshipNamePlural;
+    const relationshipNameCapitalized = relationships[idx].relationshipNameCapitalized;
     const ownerSide = relationships[idx].ownerSide;
-    const comma = parseInt(idx, 10) ===relationships.length-1 ? '' : ',';
+    const isLast = parseInt(idx, 10) === mappedRelsDto.length-1;
+    const useComma = !isLast || ((relationshipType === 'one-to-many' || relationshipType === 'many-to-many') && fluentMethods);
+    const comma = useComma ? ',' : '';
     if (relationshipType === 'many-to-one' || (relationshipType === 'one-to-one' && ownerSide === true)) {
 _%>
         Mapping(source = "<%= relationshipName %>Id", target = "<%= relationshipName %>")<%= comma %>
@@ -102,16 +107,17 @@ _%>
         Mapping(target = "<%= relationshipNamePlural %>", ignore = true)<%= comma %>
             <%_ } else if (relationshipType === 'one-to-one' && ownerSide === false) { _%>
         Mapping(target = "<%= relationshipName %>", ignore = true)<%= comma %>
-            <%_ } _%>
+            <%_ }
+        if ((relationshipType === 'one-to-many' || relationshipType === 'many-to-many') && fluentMethods) { _%>
+        Mapping(target = "remove<%= relationshipNameCapitalized %>", ignore = true)<% if(!isLast) { %>,<% } %>
         <%_ } _%>
+    <%_ } _%>
     <%_ if (renMapAnotDto === true) { _%>
     )
     override fun toEntity(dto: <%= asDto(entityClass) %>): <%= asEntity(entityClass) %>
     <%_ } _%>
     <%_ if (databaseType === 'sql' || databaseType === 'mongodb') { _%>
 
-    fun fromId(id: <%= pkType %>?): <%= asEntity(entityClass) %>? {
-        return id?.let { <%= asEntity(entityClass) %>(it) }
-    }
+    fun fromId(id: <%= pkType %>?) = id?.let { <%= asEntity(entityClass) %>(it) }
 <%_ } _%>
 }

generators/entity-server/templates/src/main/kotlin/package/web/rest/EntityResource.kt.ejs

@@ -184,7 +184,9 @@ _%><%- include('../../common/inject_template', {viaService: viaService, construc
     /**
      * `GET  /<%= entityApiUrl %>` : get all the <%= entityInstancePlural %>.
      *<% if (pagination !== 'no') { %>
-     * @param pageable the pagination information.<% } if (!jpaMetamodelFiltering && fieldsContainOwnerManyToMany) { %>
+     * @param pageable the pagination information.
+     * @param queryParams a [MultiValueMap] query parameters.
+     * @param uriBuilder a [UriComponentsBuilder] URI builder.<% } if (!jpaMetamodelFiltering && fieldsContainOwnerManyToMany) { %>
      * @param eagerload flag to eager load entities from relationships (This is applicable for many-to-many).<% } if (jpaMetamodelFiltering) { %>
      * @param criteria the criteria which the requested entities should match.<% } else if (fieldsContainNoOwnerOneToOne) { %>
      * @param filter the filter of the request.<% } %>
@@ -246,7 +248,9 @@ _%><%- include('../../common/inject_template', {viaService: viaService, construc
      * to the query.
      *
      * @param query the query of the <%= entityInstance %> search.<% if (pagination !== 'no') { %>
-     * @param pageable the pagination information.<% } %>
+     * @param pageable the pagination information.
+     * @param queryParams a [MultiValueMap] query parameters.
+     * @param uriBuilder a [UriComponentsBuilder] URI builder.<% } %>
      * @return the result of the search.
      */
     @GetMapping("/_search/<%= entityApiUrl %>")<%- include('../../common/search_template', {asEntity, asDto, viaService}); -%><% } %>