Merge pull request #280 from jhipster/fix/reactive

Fix: reactive with Neo4J and add skip-ktlint-format flag
jhipster · May 1, 2021 · 01c94e1 · 01c94e1
2 parents 1c7e0c1 + 2bcb469
commit 01c94e1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -23,6 +23,13 @@ const { displayLogo } = require('./util');
 module.exports = class extends BaseGenerator {
     constructor(args, opts) {
         super(args, { fromBlueprint: true, ...opts });
+
+        // This adds support for a `--skip-ktlint-format` flag
+        this.option('skip-ktlint-format', {
+            desc: 'Indicates to skip formatting using ktlint',
+            type: Boolean,
+            defaults: false,
+        });
     }
 
     get initializing() {

diff --git a/generators/entity-server/templates/src/main/kotlin/package/domain/Entity.kt.ejs b/generators/entity-server/templates/src/main/kotlin/package/domain/Entity.kt.ejs
@@ -428,8 +428,6 @@ for (const field of filteredFields) {
     <%_ } _%>
     <%_ if (databaseType === 'sql' && reactive) { _%>
     @Transient
-    <%_ } else if (databaseType === 'neo4j') { _%>
-    @Relationship("<%= relationshipName %>")
     <%_ } _%>
     var <%= relationshipFieldNamePlural %>: MutableSet<<%= asEntity(otherEntityNameCapitalized) %>>? = mutableSetOf(),
 

diff --git a/generators/server/index.js b/generators/server/index.js
@@ -32,12 +32,6 @@ module.exports = class extends ServerGenerator {
         if (!jhContext) {
             this.error("This is a JHipster blueprint and should be used only like 'jhipster --blueprints myblueprint')}");
         }
-        // This adds support for a `--skip-ktlint-format` flag
-        this.option('skip-ktlint-format', {
-            desc: 'Indicates to skip formatting using ktlint',
-            type: Boolean,
-            defaults: false,
-        });
     }
 
     get initializing() {
@@ -80,7 +74,7 @@ module.exports = class extends ServerGenerator {
         const phaseFromJHipster = super._install();
         const myCustomPhaseSteps = {
             lintFiles() {
-                if (this.options['skip-ktlint-format']) {
+                if (this.options.skipKtlintFormat) {
                     this.log('Skipping ktlint format...');
                     return;
                 }

diff --git a/...ors/server/templates/src/main/kotlin/package/config/SecurityConfiguration_reactive.kt.ejs b/...ors/server/templates/src/main/kotlin/package/config/SecurityConfiguration_reactive.kt.ejs
@@ -23,12 +23,10 @@ import <%= packageName %>.security.ADMIN
 import <%= packageName %>.security.jwt.JWTFilter
 import <%= packageName %>.security.jwt.TokenProvider
 <%_ } _%>
-<%_ if (authenticationType === 'oauth2' && applicationType !== 'microservice') { _%>
-import <%= packageName %>.security.extractAuthorityFromClaims
-<%_ } _%>
 <%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>
     <%_ if (authenticationType === 'oauth2') { _%>
 import <%= packageName %>.security.SecurityUtils
+import <%= packageName %>.security.extractAuthorityFromClaims
 import <%= packageName %>.security.oauth2.AudienceValidator
 import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter
 import org.springframework.security.authentication.AbstractAuthenticationToken

diff --git a/generators/server/templates/src/main/kotlin/package/domain/User.kt.ejs b/generators/server/templates/src/main/kotlin/package/domain/User.kt.ejs
@@ -376,7 +376,7 @@ class <%= asEntity('User') %> (
     <%_ if (enableHibernateCache) { _%>
     @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
     <%_ } _%>
-    var persistentTokens: MutableSet<PersistentToken> = mutableSetOf()<% } %><% if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { %>,
+    var persistentTokens: MutableSet<PersistentToken> = mutableSetOf()<% } %><% if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { %>,
     createdBy: String? = null,
     createdDate: Instant? = Instant.now(),
     lastModifiedBy: String? = null,

diff --git a/generators/server/templates/src/main/kotlin/package/repository/AuthorityRepository.kt.ejs b/generators/server/templates/src/main/kotlin/package/repository/AuthorityRepository.kt.ejs
@@ -54,6 +54,6 @@ import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<%
 interface AuthorityRepository : <% if (databaseType === 'sql') { %><% if (reactive) { %>R2dbc<% } else { %>Jpa<% } %>Repository<% } else { %><% if (reactive) { %>Reactive<% } %><% if (databaseType === 'mongodb') { %>MongoRepository<% } %><% if (databaseType === 'neo4j') { %>Neo4jRepository<% } %><% if (databaseType === 'couchbase') { %>N1qlCouchbaseRepository<% } %><% } %><Authority, String> {
     <%_ if (databaseType === 'neo4j') { _%>
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<%_ } _%>
-    <<%= asEntity('Authority') %>> findAll(): <% if (reactive) { %>Flux<% } else { %>List<% } %>
+    override fun findAll(): <% if (reactive) { %>Flux<% } else { %>List<% } %><<%= asEntity('Authority') %>>
     <%_ } _%>
 }
diff --git a/generators/server/templates/src/main/kotlin/package/repository/UserRepository.kt.ejs b/generators/server/templates/src/main/kotlin/package/repository/UserRepository.kt.ejs
@@ -195,7 +195,7 @@ interface UserRepository : <% if (databaseType === 'sql') { %>JpaRepository<<%=
 
     <%_ if (databaseType === 'neo4j') { _%>
     <% if (!reactive) { %>// See https://github.com/neo4j/sdn-rx/issues/51<% } %>
-    fun findAll(): <%= listOrFlux %><<%= asEntity('User') %>>
+    override fun findAll(): <%= listOrFlux %><<%= asEntity('User') %>>
     <%_ } _%>
     <%_ if (databaseType === 'sql') { _%>
 

diff --git a/generators/server/templates/src/main/kotlin/package/service/UserService.kt.ejs b/generators/server/templates/src/main/kotlin/package/service/UserService.kt.ejs
@@ -641,7 +641,6 @@ class UserService<% if (databaseType !== 'no') { %>(
                     <%_ } else { _%>
                     userRepository.save(user)
                     <%_ } _%>
-                    userRepository.save(user)
                         .flatMap { user ->
                             Flux.fromIterable(user.authorities)
                                 .flatMap { user.id?.let { it1 -> it.name?.let { it2 -> userRepository.saveUserAuthority(it1, it2) } } }