generator-jhipster 7.4.1 → 7.7.0

package/generators/server/templates/src/main/java/package/service/UsernameAlreadyUsedException.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/service/dto/AdminUserDTO.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -71,12 +71,12 @@ public class <%= asDto('User') %> {
     }
 
 <%_ for (field of user.fields.filter(field => !field.builtIn && field.relatedByOtherEntity)) { _%>
-        public String get<%= javaBeanCase(field.fieldName) %>() {
-            return <%= field.fieldName %>;
-        }
-        public void set<%= javaBeanCase(field.fieldName) %>(String <%= field.fieldName %>) {
-            this.<%= field.fieldName %> = <%= field.fieldName %>;
-        }
+    public String get<%= javaBeanCase(field.fieldName) %>() {
+        return <%= field.fieldName %>;
+    }
+    public void set<%= javaBeanCase(field.fieldName) %>(String <%= field.fieldName %>) {
+        this.<%= field.fieldName %> = <%= field.fieldName %>;
+    }
 <%_ } _%>
 
     // prettier-ignore

package/generators/server/templates/src/main/java/package/service/dto/package-info.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/service/mapper/package-info.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/service/package-info.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/web/filter/ModifyServersOpenApiFilter.java.ejs

@@ -34,12 +34,13 @@ import reactor.core.publisher.Mono;
 @Component
 public class ModifyServersOpenApiFilter implements GlobalFilter, Ordered {
 
+    private static final String OPEN_API_PATH = "/v3/api-docs";
     private static final Logger log = LoggerFactory.getLogger(ModifyServersOpenApiFilter.class);
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         String path = exchange.getRequest().getURI().getPath();
-        if (path.startsWith("/services") && path.contains("/v3/api-docs")) {
+        if (path.startsWith("/services") && path.contains(OPEN_API_PATH)) {
             ServerHttpResponse originalResponse = exchange.getResponse();
             DataBufferFactory bufferFactory = originalResponse.bufferFactory();
             ServerHttpResponseDecorator decoratedResponse = createModifyServersOpenApiInterceptor(path, originalResponse, bufferFactory);
@@ -109,7 +110,7 @@ public class ModifyServersOpenApiFilter implements GlobalFilter, Ordered {
                 ObjectMapper mapper = new ObjectMapper();
                 JsonNode jsonBody = mapper.readTree(strBody);
                 ObjectNode serversToJson = mapper.createObjectNode();
-                serversToJson.set("url", mapper.valueToTree(path.replace("/v3/api-docs", "")));
+                serversToJson.set("url", mapper.valueToTree(path.replaceFirst(OPEN_API_PATH + "(/.*)?$", "")));
                 serversToJson.set("description", mapper.valueToTree("added by global filter"));
 
                 // add custom server

package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -46,7 +46,6 @@ public class OAuth2ReactiveRefreshTokensWebFilter implements WebFilter {
             .filter(principal -> principal instanceof OAuth2AuthenticationToken)
             .cast(OAuth2AuthenticationToken.class)
             .flatMap(authentication -> authorizedClient(exchange, authentication))
-            .onErrorResume(e -> Mono.empty())
             .thenReturn(exchange)
             .flatMap(chain::filter);
     }

package/generators/server/templates/src/main/java/package/web/filter/OAuth2RefreshTokensWebFilter.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -18,13 +18,11 @@
 -%>
 package <%= packageName %>.web.filter;
 
-import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
 
-@Component
 public class SpaWebFilter implements WebFilter {
 
     /**
@@ -35,7 +33,7 @@ public class SpaWebFilter implements WebFilter {
         String path = exchange.getRequest().getURI().getPath();
         if (!path.startsWith("/api") && !path.startsWith("/management")<% if (authenticationTypeOauth2) { %> && !path.startsWith("/login")<% } %>
 <%_ if (applicationTypeGateway || applicationTypeMonolith) { _%>
-            && !path.startsWith("/services") && !path.startsWith("/swagger") && !path.startsWith("/v2/api-docs") && !path.startsWith("/v3/api-docs")
+            && !path.startsWith("/services") && !path.startsWith("/v3/api-docs")
 <%_ } _%>
             && path.matches("[^\\\\.]*")) {
             return chain.filter(

package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -108,12 +108,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.GrantedAuthority;
-  <%_ if (!reactive) { _%>
-import org.springframework.security.core.context.SecurityContextHolder;
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.userdetails.UserDetails;
+  <%_ } else { _%>
+import org.springframework.security.core.context.SecurityContextHolder;
   <%_ } _%>
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -145,15 +145,7 @@ public class AccountResource {
      * @throws AccountResourceException {@code 500 (Internal Server Error)} if the user couldn't be returned.
      */
     @GetMapping("/account")
-  <%_ if (!reactive) { _%>
-    public UserVM getAccount() {
-        String login = SecurityUtils.getCurrentUserLogin()
-            .orElseThrow(AccountResourceException::new);
-        Set<String> authorities = SecurityContextHolder.getContext().getAuthentication().getAuthorities().stream()
-            .map(GrantedAuthority::getAuthority)
-            .collect(Collectors.toSet());
-        return new UserVM(login, authorities);
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     public Mono<UserVM> getAccount() {
         return ReactiveSecurityContextHolder.getContext()
             .map(SecurityContext::getAuthentication)
@@ -172,6 +164,14 @@ public class AccountResource {
                 return new UserVM(login, authorities);
             })
             .switchIfEmpty(Mono.error(new AccountResourceException()));
+  <%_ } else { _%>
+    public UserVM getAccount() {
+        String login = SecurityUtils.getCurrentUserLogin()
+            .orElseThrow(AccountResourceException::new);
+        Set<String> authorities = SecurityContextHolder.getContext().getAuthentication().getAuthorities().stream()
+            .map(GrantedAuthority::getAuthority)
+            .collect(Collectors.toSet());
+        return new UserVM(login, authorities);
   <%_ } _%>
     }
 
@@ -216,7 +216,7 @@ public class AccountResource {
         }
     }
 }
-<%_ } else {  /* not oauth, not skipUserManagement */ _%>
+<%_ } else { /* not oauth, not skipUserManagement */ _%>
   <%_ if (authenticationTypeSession && !reactive) { _%>
 import <%= packageName %>.domain.PersistentToken;
 import <%= packageName %>.repository.PersistentTokenRepository;
@@ -309,13 +309,13 @@ public class AccountResource {
         if (isPasswordLengthInvalid(managedUserVM.getPassword())) {
             throw new InvalidPasswordException();
         }
-  <%_ if (!reactive) { _%>
-        <%= asEntity('User') %> user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
-        mailService.sendActivationEmail(user);
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         return userService.registerUser(managedUserVM, managedUserVM.getPassword())
             .doOnSuccess(mailService::sendActivationEmail)
             .then();
+  <%_ } else { _%>
+        <%= asEntity('User') %> user = userService.registerUser(managedUserVM, managedUserVM.getPassword());
+        mailService.sendActivationEmail(user);
   <%_ } _%>
     }
 
@@ -327,15 +327,15 @@ public class AccountResource {
      */
     @GetMapping("/activate")
     public <% if (reactive) { %>Mono<Void><% } else { %>void<% } %> activateAccount(@RequestParam(value = "key") String key) {
-  <%_ if (!reactive) { _%>
+  <%_ if (reactive) { _%>
+        return userService.activateRegistration(key)
+            .switchIfEmpty(Mono.error(new AccountResourceException("No user was found for this activation key")))
+            .then();
+  <%_ } else { _%>
         Optional<<%= asEntity('User') %>> user = userService.activateRegistration(key);
         if (!user.isPresent()) {
             throw new AccountResourceException("No user was found for this activation key");
         }
-  <%_ } else { _%>
-        return userService.activateRegistration(key)
-            .switchIfEmpty(Mono.error(new AccountResourceException("No user was found for this activation key")))
-            .then();
   <%_ } _%>
     }
 
@@ -346,14 +346,14 @@ public class AccountResource {
      * @return the login if the user is authenticated.
      */
     @GetMapping("/authenticate")
-  <%_ if (!reactive) { _%>
-    public String isAuthenticated(HttpServletRequest request) {
-        log.debug("REST request to check if the current user is authenticated");
-        return request.getRemoteUser();
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     public Mono<String> isAuthenticated(ServerWebExchange request) {
         log.debug("REST request to check if the current user is authenticated");
         return request.getPrincipal().map(Principal::getName);
+  <%_ } else { _%>
+    public String isAuthenticated(HttpServletRequest request) {
+        log.debug("REST request to check if the current user is authenticated");
+        return request.getRemoteUser();
   <%_ } _%>
     }
 
@@ -367,10 +367,10 @@ public class AccountResource {
     public <% if (reactive) { %>Mono<<%= asDto('AdminUser') %>><% } else { %><%= asDto('AdminUser') %><% } %> getAccount() {
         return userService.getUserWithAuthorities()
             .map(<%= asDto('AdminUser') %>::new)
-  <%_ if (!reactive) { _%>
-            .orElseThrow(() -> new AccountResourceException("User could not be found"));
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
             .switchIfEmpty(Mono.error(new AccountResourceException("User could not be found")));
+  <%_ } else { _%>
+            .orElseThrow(() -> new AccountResourceException("User could not be found"));
   <%_ } _%>
     }
 
@@ -382,20 +382,7 @@ public class AccountResource {
      * @throws RuntimeException {@code 500 (Internal Server Error)} if the user login wasn't found.
      */
     @PostMapping("/account")
-  <%_ if (!reactive) { _%>
-    public void saveAccount(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
-        String userLogin = SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new AccountResourceException("Current user login not found"));
-        Optional<<%= asEntity('User') %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
-        if (existingUser.isPresent() && (!existingUser.get().getLogin().equalsIgnoreCase(userLogin))) {
-            throw new EmailAlreadyUsedException();
-        }
-        Optional<<%= asEntity('User') %>> user = userRepository.findOneByLogin(userLogin);
-        if (!user.isPresent()) {
-            throw new AccountResourceException("User could not be found");
-        }
-        userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
-            userDTO.getLangKey()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { %>, userDTO.getImageUrl()<% } %>);
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     public Mono<Void> saveAccount(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
         return SecurityUtils.getCurrentUserLogin()
             .switchIfEmpty(Mono.error(new AccountResourceException("Current user login not found")))
@@ -411,6 +398,19 @@ public class AccountResource {
                 .switchIfEmpty(Mono.error(new AccountResourceException("User could not be found")))
                 .flatMap(user -> userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
                     userDTO.getLangKey()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { %>, userDTO.getImageUrl()<% } %>));
+  <%_ } else { _%>
+    public void saveAccount(@Valid @RequestBody <%= asDto('AdminUser') %> userDTO) {
+        String userLogin = SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new AccountResourceException("Current user login not found"));
+        Optional<<%= asEntity('User') %>> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
+        if (existingUser.isPresent() && (!existingUser.get().getLogin().equalsIgnoreCase(userLogin))) {
+            throw new EmailAlreadyUsedException();
+        }
+        Optional<<%= asEntity('User') %>> user = userRepository.findOneByLogin(userLogin);
+        if (!user.isPresent()) {
+            throw new AccountResourceException("User could not be found");
+        }
+        userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
+            userDTO.getLangKey()<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j) { %>, userDTO.getImageUrl()<% } %>);
   <%_ } _%>
     }
 
@@ -484,17 +484,7 @@ public class AccountResource {
      * @param mail the mail of the user.
      */
     @PostMapping(path = "/account/reset-password/init")
-  <%_ if (!reactive) { _%>
-    public void requestPasswordReset(@RequestBody String mail) {
-        Optional<<%= asEntity('User') %>> user = userService.requestPasswordReset(mail);
-        if (user.isPresent()) {
-            mailService.sendPasswordResetMail(user.get());
-        } else {
-            // Pretend the request has been successful to prevent checking which emails really exist
-            // but log that an invalid attempt has been made
-            log.warn("Password reset requested for non existing mail");
-        }
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
     public Mono<Void> requestPasswordReset(@RequestBody String mail) {
         return userService.requestPasswordReset(mail)
             .doOnSuccess(user -> {
@@ -507,6 +497,16 @@ public class AccountResource {
                 }
             })
             .then();
+  <%_ } else { _%>
+    public void requestPasswordReset(@RequestBody String mail) {
+        Optional<<%= asEntity('User') %>> user = userService.requestPasswordReset(mail);
+        if (user.isPresent()) {
+            mailService.sendPasswordResetMail(user.get());
+        } else {
+            // Pretend the request has been successful to prevent checking which emails really exist
+            // but log that an invalid attempt has been made
+            log.warn("Password reset requested for non existing mail");
+        }
   <%_ } _%>
     }
 
@@ -522,17 +522,17 @@ public class AccountResource {
         if (isPasswordLengthInvalid(keyAndPassword.getNewPassword())) {
             throw new InvalidPasswordException();
         }
-  <%_ if (!reactive) { _%>
+  <%_ if (reactive) { _%>
+        return userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey())
+            .switchIfEmpty(Mono.error(new AccountResourceException("No user was found for this reset key")))
+            .then();
+  <%_ } else { _%>
         Optional<<%= asEntity('User') %>> user =
             userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey());
 
         if (!user.isPresent()) {
             throw new AccountResourceException("No user was found for this reset key");
         }
-  <%_ } else { _%>
-        return userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey())
-            .switchIfEmpty(Mono.error(new AccountResourceException("No user was found for this reset key")))
-            .then();
   <%_ } _%>
     }
 

package/generators/server/templates/src/main/java/package/web/rest/AuthInfoResource.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.

package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -63,45 +63,51 @@ public class <%= upperFirstCamelCase(baseName) %>KafkaResource {
     private final Logger log = LoggerFactory.getLogger(<%= upperFirstCamelCase(baseName) %>KafkaResource.class);
 
     private final KafkaProperties kafkaProperties;
-<%_ if (!reactive) { _%>
+<%_ if (reactive) { _%>
+    private KafkaSender<String, String> sender;
+<%_ } else { _%>
     private KafkaProducer<String, String> producer;
     private ExecutorService sseExecutorService = Executors.newCachedThreadPool();
-<%_ } else { _%>
-    private KafkaSender<String, String> sender;
 <%_ }  _%>
 
     public <%= upperFirstCamelCase(baseName) %>KafkaResource(KafkaProperties kafkaProperties) {
         this.kafkaProperties = kafkaProperties;
-<%_ if (!reactive) { _%>
-        this.producer = new KafkaProducer<>(kafkaProperties.getProducerProps());
-<%_ } else { _%>
+<%_ if (reactive) { _%>
         this.sender = KafkaSender.create(SenderOptions.create(kafkaProperties.getProducerProps()));
+<%_ } else { _%>
+        this.producer = new KafkaProducer<>(kafkaProperties.getProducerProps());
 <%_ }  _%>
     }
 
     @PostMapping("/publish/{topic}")
-    public <% if (!reactive) { %>PublishResult<% } else { %>Mono<PublishResult><% }  %> publish(@PathVariable String topic, @RequestParam String message, @RequestParam(required = false) String key)<% if (!reactive) { %> throws ExecutionException, InterruptedException<% } %> {
+    public <% if (reactive) { %>Mono<PublishResult><% } else { %>PublishResult<% }  %> publish(@PathVariable String topic, @RequestParam String message, @RequestParam(required = false) String key)<% if (!reactive) { %> throws ExecutionException, InterruptedException<% } %> {
         log.debug("REST request to send to Kafka topic {} with key {} the message : {}", topic, key, message);
-<%_ if (!reactive) { _%>
-        RecordMetadata metadata = producer.send(new ProducerRecord<>(topic, key, message)).get();
-        return new PublishResult(metadata.topic(), metadata.partition(), metadata.offset(), Instant.ofEpochMilli(metadata.timestamp()));
-<%_ } else { _%>
+<%_ if (reactive) { _%>
         return Mono.just(SenderRecord.create(topic, null, null, key, message, null))
             .as(sender::send)
             .next()
             .map(SenderResult::recordMetadata)
             .map(metadata -> new PublishResult(metadata.topic(), metadata.partition(), metadata.offset(), Instant.ofEpochMilli(metadata.timestamp())));
+<%_ } else { _%>
+        RecordMetadata metadata = producer.send(new ProducerRecord<>(topic, key, message)).get();
+        return new PublishResult(metadata.topic(), metadata.partition(), metadata.offset(), Instant.ofEpochMilli(metadata.timestamp()));
 <%_ }  _%>
     }
 
     @GetMapping("/consume")
-    public <% if (!reactive) { %>SseEmitter<% } else { %>Flux<String><% }  %> consume(@RequestParam("topic") List<String> topics, @RequestParam Map<String, String> consumerParams) {
+    public <% if (reactive) { %>Flux<String><% } else { %>SseEmitter<% }  %> consume(@RequestParam("topic") List<String> topics, @RequestParam Map<String, String> consumerParams) {
         log.debug("REST request to consume records from Kafka topics {}", topics);
         Map<String, Object> consumerProps = kafkaProperties.getConsumerProps();
         consumerProps.putAll(consumerParams);
         consumerProps.remove("topic");
 
-<%_ if (!reactive) { _%>
+<%_ if (reactive) { _%>
+        ReceiverOptions<String, String> receiverOptions = ReceiverOptions.<String, String>create(consumerProps)
+            .subscription(topics);
+        return KafkaReceiver.create(receiverOptions)
+            .receive()
+            .map(ConsumerRecord::value);
+<%_ } else { _%>
         SseEmitter emitter = new SseEmitter(0L);
         sseExecutorService.execute(() -> {
             KafkaConsumer<String, String> consumer = new KafkaConsumer<>(consumerProps);
@@ -125,12 +131,6 @@ public class <%= upperFirstCamelCase(baseName) %>KafkaResource {
             emitter.complete();
         });
         return emitter;
-<%_ } else { _%>
-        ReceiverOptions<String, String> receiverOptions = ReceiverOptions.<String, String>create(consumerProps)
-            .subscription(topics);
-        return KafkaReceiver.create(receiverOptions)
-            .receive()
-            .map(ConsumerRecord::value);
 <%_ }  _%>
     }
 

package/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -21,18 +21,12 @@ package <%= packageName %>.web.rest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.<% if (reactive) { %>Reactive<% } %>ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
-<%_ if (!reactive) { _%>
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpHeaders;
-<%_ } else { _%>
-import org.springframework.web.server.WebSession;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import reactor.core.publisher.Mono;
-<%_ } _%>
 import java.util.Map;
 
 /**
@@ -40,27 +34,20 @@ import java.util.Map;
  */
 @RestController
 public class LogoutResource {
-    private final <% if (reactive) { %>Mono<<% } %>ClientRegistration<% if (reactive) { %>><% } %> registration;
+    private final ClientRegistration registration;
 
-    public LogoutResource(<% if (reactive) { %>Reactive<% } %>ClientRegistrationRepository registrations) {
+    public LogoutResource(ClientRegistrationRepository registrations) {
         this.registration = registrations.findByRegistrationId("oidc");
     }
 
     /**
      * {@code POST  /api/logout} : logout the current user.
      *
-<%_ if (!reactive) { _%>
      * @param request the {@link HttpServletRequest}.
-<%_ } _%>
      * @param idToken the ID token.
-<%_ if (reactive) { _%>
-     * @param request a {@link ServerHttpRequest} request.
-     * @param session the current {@link WebSession}.
-<%_ } _%>
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and a body with a global logout URL.
      */
     @PostMapping("/api/logout")
-<%_ if (!reactive) { _%>
     public ResponseEntity<?> logout(HttpServletRequest request,
                                     @AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken) {
         StringBuilder logoutUrl = new StringBuilder();
@@ -87,36 +74,5 @@ public class LogoutResource {
         request.getSession().invalidate();
         return ResponseEntity.ok().body(Map.of("logoutUrl", logoutUrl.toString()));
     }
-<%_ } else { _%>
-    public Mono<Map<String, String>> logout(@AuthenticationPrincipal(expression = "idToken") OidcIdToken idToken, ServerHttpRequest request, WebSession session) {
-        return session
-            .invalidate()
-            .then(
-                this.registration.map(oidc -> prepareLogoutUri(request, oidc, idToken))
-            );
-    }
-
-    private Map<String, String> prepareLogoutUri(ServerHttpRequest request, ClientRegistration clientRegistration, OidcIdToken idToken) {
-        StringBuilder logoutUrl = new StringBuilder();
-        String issuerUri = clientRegistration.getProviderDetails().getIssuerUri();
-        if (issuerUri.contains("auth0.com")) {
-            logoutUrl.append(issuerUri.endsWith("/") ? issuerUri + "v2/logout" : issuerUri + "/v2/logout");
-        } else {
-            logoutUrl.append(clientRegistration.getProviderDetails().getConfigurationMetadata().get("end_session_endpoint").toString());
-        }
-
-        String originUrl = request.getHeaders().getOrigin();
-        if (logoutUrl.indexOf("/protocol") > -1) {
-            logoutUrl.append("?redirect_uri=").append(originUrl);
-        } else if (logoutUrl.indexOf("auth0.com") > -1) {
-            // Auth0
-            logoutUrl.append("?client_id=").append(clientRegistration.getClientId()).append("&returnTo=").append(originUrl);
-        } else {
-            // Okta
-            logoutUrl.append("?id_token_hint=").append(idToken.getTokenValue()).append("&post_logout_redirect_uri=").append(originUrl);
-        }
-        return Map.of("logoutUrl", logoutUrl.toString());
-    }
 
-<%_ } _%>
 }