Merge pull request #263 from jhipster/v6.10.5

Support JHipster version V6.10.5
jhipster · Nov 7, 2020 · 67e14b8 · 67e14b8
2 parents 08c80fa + de8d6d1
commit 67e14b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...ators/server/templates/src/main/kotlin/package/web/rest/errors/ExceptionTranslator.kt.ejs b/...ators/server/templates/src/main/kotlin/package/web/rest/errors/ExceptionTranslator.kt.ejs
@@ -26,7 +26,9 @@ import org.springframework.beans.factory.annotation.Value
 <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%>
 import org.springframework.dao.ConcurrencyFailureException
 <%_ } _%>
+<%_ if (databaseType !== 'no') { _%>
 import org.springframework.dao.DataAccessException
+<%_ } _%>
 import org.springframework.http.ResponseEntity
 import org.springframework.http.converter.HttpMessageConversionException
 <%_ if (reactive && databaseType === 'sql') { _%>
@@ -205,7 +207,9 @@ _%>
         if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
             detail = when (throwable) {
                 is HttpMessageConversionException -> "Unable to convert http message"
+                <%_ if (databaseType !== 'no') { _%>
                 is DataAccessException -> "Failure during data access"
+                <%_ } _%>
                 else -> {
                     if (containsPackageName(throwable.message)) {
                         "Unexpected runtime exception"

diff --git a/generators/server/templates/src/test/kotlin/package/web/rest/AccountResourceIT.kt.ejs b/generators/server/templates/src/test/kotlin/package/web/rest/AccountResourceIT.kt.ejs
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test
 <%_ if (databaseType === 'neo4j') { _%>
 import org.junit.jupiter.api.extension.ExtendWith
 <%_ } _%>
-<%_ if (cacheProvider === 'redis') { _%>
+<%_ if (databaseType === 'neo4j' || cacheProvider === 'redis') { _%>
 import org.junit.jupiter.api.extension.ExtendWith
 <%_ } _%>