generator-jhipster 7.6.0 → 7.8.1

package/generators/server/templates/pom.xml.ejs

@@ -64,7 +64,7 @@
 
     <properties>
         <!-- Build properties -->
-        <maven.version>3.3.9</maven.version>
+        <maven.version>3.8.5</maven.version>
         <java.version><%= JAVA_VERSION %></java.version>
 <%_ if (!skipClient) { _%>
         <node.version>v<%= NODE_VERSION %></node.version>
@@ -77,7 +77,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <start-class><%= packageName %>.<%= mainClass %></start-class>
-        <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
+        <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx512m</argLine>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
         <run.addResources>false</run.addResources>
         <!-- These remain empty unless the corresponding profile is active -->
@@ -86,6 +86,7 @@
 <%_ } _%>
         <profile.api-docs />
         <profile.tls />
+        <profile.e2e />
 
         <!-- Dependency versions -->
         <jhipster-dependencies.version><%= JHIPSTER_DEPENDENCIES_VERSION %></jhipster-dependencies.version>
@@ -127,28 +128,24 @@
         <jackson-databind-nullable.version><%= JACKSON_DATABIND_NULLABLE_VERSION %></jackson-databind-nullable.version>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-        <caffeine.version>3.0.5</caffeine.version>
-        <typesafe.version>1.4.1</typesafe.version>
-<%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-        <!-- This needs to be pinned with the one from neo4j migrations otherwise an older incompatible version from
-        spring fox is used-->
-        <classgraph.version>4.8.87</classgraph.version>
+        <caffeine.version>3.0.6</caffeine.version>
+        <typesafe.version>1.4.2</typesafe.version>
 <%_ } _%>
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
-        <maven-site-plugin.version>3.10.0</maven-site-plugin.version>
-        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
-        <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+        <maven-site-plugin.version>3.11.0</maven-site-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-        <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
+        <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <checkstyle.version>9.2.1</checkstyle.version>
+        <checkstyle.version>10.1</checkstyle.version>
         <nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
 <%_ if (!skipClient) { _%>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
@@ -156,16 +153,16 @@
         <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
 <%_ } _%>
         <git-commit-id-plugin.version>5.0.0</git-commit-id-plugin.version>
-        <modernizer-maven-plugin.version>2.3.0</modernizer-maven-plugin.version>
+        <modernizer-maven-plugin.version>2.4.0</modernizer-maven-plugin.version>
         <jacoco-maven-plugin.version><%= JACOCO_VERSION %></jacoco-maven-plugin.version>
         <jib-maven-plugin.version><%= JIB_VERSION %></jib-maven-plugin.version>
         <jib-maven-plugin.image><%= DOCKER_JAVA_JRE %></jib-maven-plugin.image>
         <jib-maven-plugin.architecture>amd64</jib-maven-plugin.architecture>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 <%_ if (enableSwaggerCodegen) { _%>
-        <openapi-generator-maven-plugin.version>5.3.1</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>5.4.0</openapi-generator-maven-plugin.version>
 <%_ } _%>
-        <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
+        <properties-maven-plugin.version>1.1.0</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
         <!-- jhipster-needle-maven-property -->
     </properties>
@@ -372,12 +369,6 @@
             <groupId>eu.michael-simons.neo4j</groupId>
             <artifactId>neo4j-migrations-spring-boot-starter</artifactId>
         </dependency>
-        <!-- This needs to be pinned with the one from neo4j migrations otherwise an older incompatible version from spring fox is used-->
-        <dependency>
-            <groupId>io.github.classgraph</groupId>
-            <artifactId>classgraph</artifactId>
-            <version>${classgraph.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>neo4j</artifactId>
@@ -402,7 +393,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>database-commons</artifactId>
+            <artifactId>cassandra</artifactId>
             <scope>test</scope>
         </dependency>
 <%_ } _%>
@@ -625,17 +616,19 @@
             <scope>test</scope>
         </dependency>
 <%_ if (messageBrokerKafka) { _%>
-  <%_ if (reactive) { _%>
         <dependency>
-            <groupId>io.projectreactor.kafka</groupId>
-            <artifactId>reactor-kafka</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-kafka</artifactId>
         </dependency>
-  <%_ } else { _%>
         <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-test-support</artifactId>
+            <scope>test</scope>
         </dependency>
-  <%_ } _%>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
@@ -705,6 +698,12 @@
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-jcache</artifactId>
         </dependency>
+  <%_ if (authenticationTypeOauth2 && reactive) { _%>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-security</artifactId>
+        </dependency>
+  <%_ } _%>
 <%_ } _%>
 <%_ if (applicationTypeMicroservice || applicationTypeGateway) { _%>
         <dependency>
@@ -716,6 +715,18 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.playtika.reactivefeign</groupId>
+            <artifactId>feign-reactor-webclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.playtika.reactivefeign</groupId>
+            <artifactId>feign-reactor-cloud</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.playtika.reactivefeign</groupId>
+            <artifactId>feign-reactor-spring-configuration</artifactId>
+        </dependency>
   <%_ } else { _%>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -726,6 +737,10 @@
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
 <%_ } _%>
 <%_ if (serviceDiscoveryType) { _%>
         <dependency>
@@ -753,30 +768,10 @@
         </dependency>
   <%_ } _%>
 <%_ } _%>
-<%_ if (applicationTypeGateway && authenticationTypeOauth2 && reactive) { _%>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-security</artifactId>
-        </dependency>
-<%_ } _%>
-<%_ if (applicationTypeMicroservice || applicationTypeGateway) { _%>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-<%_ } _%>
-<%_ if (applicationTypeGateway || (applicationTypeMicroservice && reactive)) { _%>
+<%_ if (!reactive && databaseTypeSql) { _%>
         <dependency>
-            <groupId>com.playtika.reactivefeign</groupId>
-            <artifactId>feign-reactor-webclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.playtika.reactivefeign</groupId>
-            <artifactId>feign-reactor-cloud</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.playtika.reactivefeign</groupId>
-            <artifactId>feign-reactor-spring-configuration</artifactId>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-data</artifactId>
         </dependency>
 <%_ } _%>
         <dependency>
@@ -1423,7 +1418,7 @@
                         </excludes>
 <%_ if (reactive) { _%>
                         <!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
-                        <argLine>-XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
+                        <argLine>${argLine} -XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
 <%_ } _%>
                     </configuration>
                 </plugin>
@@ -1443,7 +1438,7 @@
                         </includes>
 <%_ if (reactive) { _%>
                         <!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
-                        <argLine>-XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
+                        <argLine>${argLine} -XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
 <%_ } _%>
                     </configuration>
                     <executions>
@@ -1461,6 +1456,11 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+               </plugin>
 <%_ if (enableSwaggerCodegen) { _%>
                 <plugin>
                     <!--
@@ -2027,7 +2027,7 @@
             </build>
             <properties>
                 <!-- default Spring profiles -->
-                <spring.profiles.active>prod${profile.api-docs}${profile.tls}<%_ if (databaseTypeSql) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
+                <spring.profiles.active>prod${profile.api-docs}${profile.tls}${profile.e2e}<%_ if (databaseTypeSql) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
             </properties>
         </profile>
         <profile>
@@ -2050,7 +2050,11 @@
             <dependencies>
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-zipkin</artifactId>
+                    <artifactId>spring-cloud-starter-sleuth</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-sleuth-zipkin</artifactId>
                 </dependency>
             </dependencies>
         </profile>
@@ -2165,6 +2169,9 @@
 <%_ if (cypressTests || protractorTests) { _%>
         <profile>
             <id>e2e</id>
+            <properties>
+                <profile.e2e>,e2e</profile.e2e>
+            </properties>
             <build>
                 <finalName>e2e</finalName>
                 <pluginManagement>

package/generators/server/templates/settings.gradle.ejs

@@ -18,12 +18,13 @@
 -%>
 
 pluginManagement {
-<%_ if (!SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
     repositories {
+<%_ if (!SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
         maven { url 'https://repo.spring.io/milestone' }
         gradlePluginPortal()
-    }
 <%_ } _%>
+        //jhipster-needle-gradle-plugin-management-repositories - JHipster will add additional entries here
+    }
     plugins {
         id 'org.springframework.boot' version "${springBootVersion}"
         id 'com.google.cloud.tools.jib' version "${jibPluginVersion}"
@@ -44,6 +45,7 @@ pluginManagement {
         id "com.gradle.enterprise" version "${gradleEnterprisePluginVersion}"
         id "com.gradle.common-custom-user-data-gradle-plugin" version "${gradleCommonCustomUserDataPluginVersion}"
 <%_ } _%>
+        //jhipster-needle-gradle-plugin-management-plugins - JHipster will add additional entries here
     }
 }
 
@@ -52,7 +54,7 @@ plugins {
     id 'com.gradle.enterprise'
     id 'com.gradle.common-custom-user-data-gradle-plugin'
 }
-    
+
 gradleEnterprise {
     server = "<%= gradleEnterpriseHost %>"
     buildScan {
@@ -70,5 +72,5 @@ buildCache {
         url = '<%= gradleEnterpriseHost %>/cache/' // note the trailing slash!
     }
 }
-<%_ } _%>  
+<%_ } _%>
 rootProject.name = "<%= dasherizedBaseName %>"

package/generators/server/templates/src/main/docker/app.yml.ejs

@@ -76,11 +76,9 @@ _%>
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
       - SPRING_DATA_CASSANDRA_CONTACTPOINTS=<%= baseName.toLowerCase() %>-cassandra
-      - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
-<%_ } else if (prodDatabaseTypeMariadb) { _%>
-      - JHIPSTER_SLEEP=120 # gives time for mariadb server to start
-<%_ } else if (prodDatabaseTypeMssql) { _%>
-      - JHIPSTER_SLEEP=60 # gives time for mssql server to start
+<%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+      - JHIPSTER_SLEEP=60 # gives time for microservices to boot before the gateway, the entire stack will be ready to accept incomming requests.
 <%_ } else { _%>
       - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
 <%_ } _%>
@@ -88,7 +86,7 @@ _%>
       - SPRING_ELASTICSEARCH_URIS=http://<%= baseName.toLowerCase() %>-elasticsearch:9200
 <%_ } _%>
 <%_ if (messageBrokerKafka) { _%>
-      - KAFKA_BOOTSTRAPSERVERS=kafka:9092
+      - SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=kafka:9092
 <%_ } _%>
 <%_ if (cacheProviderInfinispan) { _%>
       - JAVA_OPTS=-Djgroups.tcp.address=NON_LOOPBACK -Djava.net.preferIPv4Stack=true

package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs

@@ -1038,7 +1038,8 @@
         "http://127.0.0.1:*",
         "http://localhost:*",
         "https://127.0.0.1:*",
-        "https://localhost:*"
+        "https://localhost:*",
+        "https://oauth.pstmn.io/v1/callback"
       ],
       "webOrigins": [
         "*"

package/generators/server/templates/src/main/docker/mysql.yml.ejs

@@ -21,6 +21,7 @@ version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
 services:
   <%= baseName.toLowerCase() %>-mysql:
     image: <%= DOCKER_MYSQL %>
+    platform: linux/x86_64
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:

package/generators/server/templates/src/main/docker/zipkin.yml.ejs

@@ -0,0 +1,25 @@
+<%#
+ 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.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
+version: '<%= DOCKER_COMPOSE_FORMAT_VERSION %>'
+services:
+  zipkin:
+    image: <%= DOCKER_ZIPKIN %>
+    ports:
+      - 127.0.0.1:9411:9411

package/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs

@@ -24,6 +24,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
 import org.springframework.boot.autoconfigure.task.TaskExecutionProperties;
+<%_ if (messageBrokerKafka) { _%>
+import org.springframework.cloud.stream.annotation.EnableBinding;
+<%_ } _%>
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
@@ -36,6 +39,9 @@ import java.util.concurrent.Executor;
 @Configuration
 @EnableAsync
 @EnableScheduling
+<%_ if (messageBrokerKafka) { _%>
+@EnableBinding({KafkaSseConsumer.class, KafkaSseProducer.class})
+<%_ } _%>
 public class AsyncConfiguration implements AsyncConfigurer {
 
     private final Logger log = LoggerFactory.getLogger(AsyncConfiguration.class);

package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs

@@ -24,11 +24,9 @@ import tech.jhipster.config.JHipsterProperties;
 
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.couchbase.client.java.Collection;
 import com.github.couchmove.Couchmove;
 
-import <%= packageName %>.config.couchbase.CustomCouchbaseRepositoryFactoryBean;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties;
@@ -53,7 +51,6 @@ import org.springframework.data.couchbase.core.mapping.event.ValidatingCouchbase
 import org.springframework.data.couchbase.repository.auditing.EnableCouchbaseAuditing;
 <%_ } _%>
 import org.springframework.data.couchbase.repository.config.Enable<%_ if (reactive) { _%>Reactive<% } %>CouchbaseRepositories;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
@@ -61,6 +58,7 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.time.Duration;
 import java.util.*;
 <%_ if (reactive) { _%>
 import java.lang.reflect.Field;
@@ -74,13 +72,16 @@ import reactor.core.publisher.Flux;
 @Enable<% if (reactive) { %>Reactive<% } %>ElasticsearchRepositories("<%= packageName %>.repository.search")
 <%_ } _%>
 @Profile("!" + JHipsterConstants.SPRING_PROFILE_CLOUD)
-@Enable<% if (reactive) { %>Reactive<% } %>CouchbaseRepositories(basePackages = "<%= packageName %>.repository", repositoryFactoryBeanClass = CustomCouchbaseRepositoryFactoryBean.class<%_ if (searchEngineElasticsearch) { %>,
+@Enable<% if (reactive) { %>Reactive<% } %>CouchbaseRepositories(basePackages = "<%= packageName %>.repository"<%_ if (searchEngineElasticsearch) { %>,
     includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = <% if (reactive) { %>Reactive<% } %>CouchbaseRepository.class)<%_ } _%>)
 <%_ if (!reactive) { _%>
 @EnableCouchbaseAuditing(auditorAwareRef = "springSecurityAuditorAware", dateTimeProviderRef = "")
 <%_ } _%>
 public class DatabaseConfiguration extends AbstractCouchbaseConfiguration {
 
+    private static final String CHANGELOG_COLLECTION = "changelog";
+    private static final String TYPE_KEY = "type";
+
     private final Logger log = LoggerFactory.getLogger(DatabaseConfiguration.class);
 
     private final JHipsterProperties jHipsterProperties;
@@ -164,25 +165,34 @@ public class DatabaseConfiguration extends AbstractCouchbaseConfiguration {
         return mappingCouchbaseConverter;
     }
 
-    /**
-     * Workaround for Couchbase overriding SB default jackson mapper: https://github.com/spring-projects/spring-data-couchbase/issues/1209
-     */
-    @Bean
-    @Primary
-    ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
-        return builder.createXmlMapper(false).build();
-    }
-
     @Bean
     public Couchmove couchmove(Cluster cluster) {
         log.debug("Configuring Couchmove");
         Bucket bucket = cluster.bucket(getBucketName());
-        Couchmove couchmove = new Couchmove(bucket, cluster, "config/couchmove/changelog");
+        Collection collection = bucket.scope(getScopeName()).collection(CHANGELOG_COLLECTION);
+        Couchmove couchmove = new Couchmove(collection, cluster, "config/couchmove/changelog");
         couchmove.migrate();
-        couchmove.buildN1qlDeferredIndexes();
+        couchmove.buildN1qlDeferredIndexes(getScopeName());
         return couchmove;
     }
 
+    @Bean
+    @Profile({JHipsterConstants.SPRING_PROFILE_TEST, JHipsterConstants.SPRING_PROFILE_E2E})
+    public Couchmove waitForIndexes(Couchmove couchmove) {
+        couchmove.waitForN1qlIndexes(getScopeName(), Duration.ofSeconds(60));
+        return couchmove;
+    }
+
+    @Override
+    public String typeKey() {
+        return TYPE_KEY;
+    }
+
+    @Override
+    protected String getScopeName() {
+        return jHipsterProperties.getDatabase().getCouchbase().getScopeName();
+    }
+
     /**
      * Simple singleton to convert {@link ZonedDateTime}s to their {@link Long} representation.
      */

package/generators/{client/templates/react/src/main/webapp/app/entities/index.tsx.ejs → server/templates/src/main/java/package/config/KafkaSseConsumer.java.ejs}

@@ -16,21 +16,15 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import React from 'react';
-import { Switch } from 'react-router-dom';
+package <%= packageName %>.config;
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import ErrorBoundaryRoute from 'app/shared/error/error-boundary-route';
+import org.springframework.cloud.stream.annotation.Input;
+import org.springframework.messaging.MessageChannel;
 
-/* jhipster-needle-add-route-import - JHipster will add routes here */
+public interface KafkaSseConsumer {
 
-const Routes = ({ match }) => (
-  <div>
-    <Switch>
-      {/* prettier-ignore */}
-      {/* jhipster-needle-add-route-path - JHipster will add routes here */}
-    </Switch>
-  </div>
-);
+    String CHANNELNAME = "binding-in-sse";
 
-export default Routes;
+    @Input(CHANNELNAME)
+    MessageChannel input();
+}

package/generators/server/templates/src/main/java/package/config/KafkaSseProducer.java.ejs

@@ -0,0 +1,30 @@
+<%#
+ 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.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.config;
+
+import org.springframework.cloud.stream.annotation.Output;
+import org.springframework.messaging.MessageChannel;
+
+public interface KafkaSseProducer {
+
+    String CHANNELNAME = "binding-out-sse";
+
+    @Output(CHANNELNAME)
+    MessageChannel output();
+}

package/generators/server/templates/src/main/java/package/config/LocaleConfiguration_reactive.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/config/SecurityConfiguration.java.ejs

@@ -36,6 +36,7 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.http.HttpMethod;
 <%_ } _%>
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 <%_ if (!applicationTypeMicroservice || !authenticationTypeOauth2) { _%>
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
@@ -45,7 +46,7 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity;
   <%_ } _%>
 <%_ } _%>
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%>
 import org.springframework.security.config.http.SessionCreationPolicy;
 <%_ } _%>
@@ -100,7 +101,7 @@ import org.zalando.problem.spring.web.advice.security.SecurityProblemSupport;
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
 @Import(SecurityProblemSupport.class)
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
 
     private final JHipsterProperties jHipsterProperties;
 <%_ if (authenticationTypeSession && !skipUserManagement) { _%>
@@ -161,9 +162,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 <%_ } _%>
 <%_ if (!applicationTypeMicroservice) { _%>
 
-    @Override
-    public void configure(WebSecurity web) {
-        web.ignoring()
+    @Bean
+    public WebSecurityCustomizer webSecurityCustomizer() {
+        return (web) -> web.ignoring()
             .antMatchers(HttpMethod.OPTIONS, "/**")
   <%_ if (!skipClient) { _%>
             .antMatchers("/app/**/*.{js,html}")
@@ -178,16 +179,16 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     }
 <%_ } else { _%>
   <%_ if (devDatabaseTypeH2Any) { _%>
-    @Override
-    public void configure(WebSecurity web) {
-        web.ignoring()
+    @Bean
+    public WebSecurityCustomizer webSecurityCustomizer() {
+        return (web) -> web.ignoring()
             .antMatchers("/h2-console/**");
     }
   <%_ } _%>
 <%_ } _%>
 
-    @Override
-    public void configure(HttpSecurity http) throws Exception {
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         // @formatter:off
         http
             .csrf()
@@ -284,6 +285,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
             .and()
                 .oauth2Client();
 <%_ } _%>
+        return http.build();
         // @formatter:on
     }
 <%_ if (authenticationTypeJwt) { _%>

package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs

@@ -112,6 +112,7 @@ import org.springframework.security.web.server.authentication.HttpStatusServerEn
 import org.springframework.security.web.server.authentication.logout.HttpStatusReturningServerLogoutSuccessHandler;
 import org.springframework.security.web.server.csrf.CookieServerCsrfTokenRepository;
 <%_ } _%>
+import org.springframework.security.web.server.header.XFrameOptionsServerHttpHeadersWriter.Mode;
 import org.springframework.security.web.server.header.ReferrerPolicyServerHttpHeadersWriter;
 <%_ if (applicationTypeMicroservice) { _%>
 import org.springframework.security.web.server.savedrequest.NoOpServerRequestCache;
@@ -255,7 +256,7 @@ public class SecurityConfiguration {
             .and()
                 .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
             .and()
-                .frameOptions().disable()
+                .frameOptions().mode(Mode.DENY)
 <%_ if (applicationTypeMicroservice) { _%>
         .and()
             .requestCache()