generator-jhipster 7.4.1 → 7.5.0

package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs

@@ -43,7 +43,7 @@ class SecurityMetersServiceTests {
     }
 
     @Test
-    public void testInvalidTokensCountersByCauseAreCreated() {
+    void testInvalidTokensCountersByCauseAreCreated() {
         meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).counter();
 
         meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
@@ -64,14 +64,14 @@ class SecurityMetersServiceTests {
 
         Collection<Counter> counters = meterRegistry.find(INVALID_TOKENS_METER_EXPECTED_NAME).counters();
 
-        assertThat(counters.size()).isEqualTo(4);
+        assertThat(counters).hasSize(4);
     }
 
     @Test
-    public void testCountMethodsShouldBeBoundToCorrectCounters() {
+    void testCountMethodsShouldBeBoundToCorrectCounters() {
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "expired")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         securityMetersService.trackTokenExpired();
 
@@ -81,7 +81,7 @@ class SecurityMetersServiceTests {
 
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "unsupported")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         securityMetersService.trackTokenUnsupported();
 
@@ -91,7 +91,7 @@ class SecurityMetersServiceTests {
 
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "invalid-signature")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         securityMetersService.trackTokenInvalidSignature();
 
@@ -101,7 +101,7 @@ class SecurityMetersServiceTests {
 
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "malformed")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         securityMetersService.trackTokenMalformed();
 

package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs

@@ -74,23 +74,23 @@ class TokenProviderSecurityMetersTests {
     }
 
     @Test
-    public void testValidTokenShouldNotCountAnything() {
+    void testValidTokenShouldNotCountAnything() {
         Collection<Counter> counters = meterRegistry.find(INVALID_TOKENS_METER_EXPECTED_NAME).counters();
 
-        assertThat(aggregate(counters)).isEqualTo(0);
+        assertThat(aggregate(counters)).isZero();
 
         String validToken = createValidToken();
 
         tokenProvider.validateToken(validToken);
 
-        assertThat(aggregate(counters)).isEqualTo(0);
+        assertThat(aggregate(counters)).isZero();
     }
 
     @Test
-    public void testTokenExpiredCount() {
+    void testTokenExpiredCount() {
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "expired")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         String expiredToken = createExpiredToken();
 
@@ -105,7 +105,7 @@ class TokenProviderSecurityMetersTests {
     void testTokenUnsupportedCount() {
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "unsupported")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         String unsupportedToken = createUnsupportedToken();
 
@@ -117,10 +117,10 @@ class TokenProviderSecurityMetersTests {
     }
 
     @Test
-    public void testTokenSignatureInvalidCount() {
+    void testTokenSignatureInvalidCount() {
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "invalid-signature")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         String tokenWithDifferentSignature = createTokenWithDifferentSignature();
 
@@ -132,10 +132,10 @@ class TokenProviderSecurityMetersTests {
     }
 
     @Test
-    public void testTokenMalformedCount() {
+    void testTokenMalformedCount() {
         assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME)
             .tag("cause", "malformed")
-            .counter().count()).isEqualTo(0);
+            .counter().count()).isZero();
 
         String malformedToken = createMalformedToken();
 

package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs

@@ -68,7 +68,7 @@ class AuthorizationHeaderUtilTest {
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         SecurityContextHolder.setContext(securityContext);
 
         doReturn(restTemplateBuilder).when(restTemplateBuilder).additionalMessageConverters(any(HttpMessageConverter.class));

package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs

@@ -86,7 +86,7 @@ class MailServiceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraT
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         doNothing().when(javaMailSender).send(any(MimeMessage.class));
         mailService = new MailService(jHipsterProperties, javaMailSender, messageSource, templateEngine);
     }

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs

@@ -68,8 +68,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.test.context.support.WithMockUser;
 <%_ if (reactive) { _%>
 import org.springframework.test.web.reactive.server.WebTestClient;
-<%_ } _%>
-<%_ if (!reactive) { _%>
+<%_ } else { _%>
 import org.springframework.test.web.servlet.MockMvc;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -165,7 +164,7 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
     @Test
     @WithUnauthenticatedMockUser
 <%_ if (!reactive) { _%>
-    void testNonAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
+    void testNonAuthenticatedUser() throws Exception {
         restAccountMockMvc.perform(get("/api/authenticate")
             .accept(MediaType.APPLICATION_JSON))
             .andExpect(status().isOk())

package/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs

@@ -69,6 +69,15 @@ class ClientForwardControllerTest {
             .andExpect(status().isOk())
             .andExpect(forwardedUrl("/"));
     }
+    @Test
+    void getUnmappedDottedEndpoint() throws Exception {
+        restMockMvc.perform(get("/foo.js")).andExpect(status().isNotFound());
+    }
+
+    @Test
+    void getUnmappedNestedDottedEndpoint() throws Exception {
+        restMockMvc.perform(get("/foo/bar.js")).andExpect(status().isNotFound());
+    }
 
 <%_ if (communicationSpringWebsocket) { _%>
     @Test

package/generators/server/templates/src/test/resources/junit-platform.properties.ejs

@@ -0,0 +1,2 @@
+cucumber.publish.enabled=true
+cucumber.plugin=pretty, html:target/cucumber-reports/Cucumber.html

package/generators/server/templates/src/test/resources/logback.xml.ejs

@@ -123,7 +123,7 @@
 <%_ if (reactive) { _%>
     <logger name="reactor" level="WARN"/>
 <%_ } _%>
-    <logger name="springfox" level="WARN"/>
+    <logger name="io.swagger.v3" level="INFO"/>
     <logger name="sun.rmi" level="WARN"/>
 <%_ if (databaseTypeSql) { _%>
     <logger name="liquibase" level="WARN"/>

package/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs

@@ -41,7 +41,7 @@ class <%= controllerClass %>IT {
 
     @BeforeEach
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
 
         <%= controllerClass %> <%= controllerInstance %> = new <%= controllerClass %>();
         restMockMvc = MockMvcBuilders

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.4.1",
+  "version": "7.5.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -80,12 +80,12 @@
     "update-snapshots": "npm run update-snapshot -- test generators"
   },
   "dependencies": {
-    "aws-sdk": "2.1037.0",
+    "aws-sdk": "2.1048.0",
     "axios": "0.24.0",
     "chalk": "4.1.2",
     "chevrotain": "9.1.0",
     "commander": "8.3.0",
-    "conf": "10.1.0",
+    "conf": "10.1.1",
     "debug": "4.3.3",
     "didyoumean": "1.2.2",
     "ejs": "3.1.6",
@@ -94,7 +94,7 @@
     "insight": "0.11.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "mem-fs-editor": "9.3.0",
+    "mem-fs-editor": "9.4.0",
     "minimatch": "3.0.4",
     "normalize-path": "3.0.0",
     "os-locale": "5.0.0",
@@ -102,14 +102,14 @@
     "p-transform": "1.3.0",
     "parse-gitignore": "1.0.1",
     "pluralize": "8.0.0",
-    "prettier": "2.5.0",
+    "prettier": "2.5.1",
     "prettier-plugin-java": "1.6.0",
     "prettier-plugin-packagejson": "2.2.15",
     "progress": "2.0.3",
     "randexp": "0.5.3",
     "semver": "7.3.5",
     "shelljs": "0.8.4",
-    "simple-git": "2.47.0",
+    "simple-git": "2.48.0",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
     "winston": "3.3.3",
@@ -119,14 +119,14 @@
   "devDependencies": {
     "chai": "4.3.4",
     "ejs-lint": "1.2.1",
-    "eslint": "8.3.0",
+    "eslint": "8.5.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-chai-friendly": "^0.7.1",
     "eslint-plugin-import": "2.25.3",
-    "eslint-plugin-mocha": "9.0.0",
+    "eslint-plugin-mocha": "10.0.3",
     "eslint-plugin-prettier": "4.0.0",
-    "expect": "27.3.1",
+    "expect": "27.4.2",
     "fs-extra": "10.0.0",
     "jsdoc": "3.6.7",
     "mocha": "9.1.3",

package/utils/entity.js

@@ -28,7 +28,6 @@ const { PaginationTypes, ServiceTypes } = require('../jdl/jhipster/entity-option
 const { GATEWAY, MICROSERVICE } = require('../jdl/jhipster/application-types');
 const { MapperTypes } = require('../jdl/jhipster/entity-options');
 const { OAUTH2 } = require('../jdl/jhipster/authentication-types');
-const { ANGULAR_X } = require('../jdl/jhipster/client-framework-types');
 const { CommonDBTypes } = require('../jdl/jhipster/field-types');
 
 const { BOOLEAN, LONG, STRING, UUID } = CommonDBTypes;
@@ -208,10 +207,7 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
   const { microserviceName, entityFileName, microfrontend } = entityWithConfig;
   entityWithConfig.entityApi = microserviceName ? `services/${microserviceName.toLowerCase()}/` : '';
   entityWithConfig.entityPage =
-    microfrontend &&
-    microserviceName &&
-    entityWithConfig.clientFramework !== ANGULAR_X &&
-    (entityWithConfig.applicationType === MICROSERVICE || entityWithConfig.applicationType === GATEWAY)
+    microfrontend && microserviceName && (entityWithConfig.applicationType === MICROSERVICE || entityWithConfig.applicationType === GATEWAY)
       ? `${microserviceName.toLowerCase()}/${entityFileName}`
       : `${entityFileName}`;
 

package/generators/server/templates/src/main/java/package/config/apidocs/GatewaySwaggerResourcesProvider.java.ejs

@@ -1,91 +0,0 @@
-package <%= packageName %>.config.apidocs;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.gateway.route.Route;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
-import reactor.core.scheduler.Schedulers;
-import springfox.documentation.swagger.web.SwaggerResource;
-import springfox.documentation.swagger.web.SwaggerResourcesProvider;
-import tech.jhipster.config.JHipsterConstants;
-
-/**
- * Retrieves all registered microservices Swagger resources.
- */
-@Component
-@Primary
-@Profile(JHipsterConstants.SPRING_PROFILE_API_DOCS)
-@Configuration
-public class GatewaySwaggerResourcesProvider implements SwaggerResourcesProvider {
-
-    @Value("${eureka.instance.appname:<%= baseName.toLowerCase() %>}")
-    private String gatewayName;
-
-    private final RouteLocator routeLocator;
-
-    @Qualifier("swaggerResources")
-    private final SwaggerResourcesProvider swaggerResourcesProvider;
-
-    public GatewaySwaggerResourcesProvider(RouteLocator routeLocator, SwaggerResourcesProvider swaggerResourcesProvider) {
-        this.routeLocator = routeLocator;
-        this.swaggerResourcesProvider = swaggerResourcesProvider;
-    }
-
-    @Override
-    public List<SwaggerResource> get() {
-        List<SwaggerResource> swaggerResources = new ArrayList<>();
-
-        swaggerResources.add(swaggerResource(gatewayName.concat(" (default)"), "/v3/api-docs"));
-        swaggerResources.add(swaggerResource(gatewayName.concat(" (management)"), "/v3/api-docs?group=management"));
-
-        List<String> microservices = routeLocator
-            .getRoutes()
-            .map(this::getMicroserviceName)
-            .collectList()
-            .defaultIfEmpty(Collections.emptyList())
-            .subscribeOn(Schedulers.boundedElastic())
-            .toFuture()
-            .orTimeout(10, TimeUnit.SECONDS)
-            .join();
-        microservices
-            .stream()
-            .filter(this::isNotGateway)
-<%_ if (serviceDiscoveryConsul) { _%>
-            .filter(this::isNotConsul)
-<%_ } _%>
-            .forEach(microservice -> swaggerResources.add(swaggerResource(microservice, getMicroserviceApiDocs(microservice))));
-        return swaggerResources;
-    }
-
-    public static SwaggerResource swaggerResource(String name, String location) {
-        SwaggerResource swaggerResource = new SwaggerResource();
-        swaggerResource.setName(name);
-        swaggerResource.setLocation(location);
-        swaggerResource.setSwaggerVersion("3.0");
-        return swaggerResource;
-    }
-
-    private boolean isNotGateway(String name) {
-        return !name.equalsIgnoreCase(gatewayName);
-    }
-
-<%_ if (serviceDiscoveryConsul) { _%>
-    private boolean isNotConsul(String name) {
-        return !name.equalsIgnoreCase("consul");
-    }
-
-<%_ } _%>
-    private String getMicroserviceApiDocs(String name) {
-        return "/services/".concat(name).concat("/v3/api-docs");
-    }
-
-    private String getMicroserviceName(Route route) {
-        return route.getUri().toString().replace("lb://", "").toLowerCase();
-    }
-}

package/generators/server/templates/src/test/java/package/config/apidocs/GatewaySwaggerResourcesProviderTest.java.ejs

@@ -1,79 +0,0 @@
-package <%= packageName %>.config.apidocs;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-import static <%= packageName %>.config.apidocs.GatewaySwaggerResourcesProvider.swaggerResource;
-
-import java.net.URI;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.springframework.cloud.gateway.route.Route;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.test.util.ReflectionTestUtils;
-import reactor.core.publisher.Flux;
-import springfox.documentation.swagger.web.SwaggerResource;
-import springfox.documentation.swagger.web.SwaggerResourcesProvider;
-
-@ExtendWith(SpringExtension.class)
-class GatewaySwaggerResourcesProviderTest {
-
-    @InjectMocks
-    GatewaySwaggerResourcesProvider gatewaySwaggerResourcesProvider;
-
-    @Mock
-    RouteLocator routeLocator;
-
-    @Mock
-    SwaggerResourcesProvider swaggerResourcesProvider;
-
-    @Test
-    void shouldGet() {
-        // Given
-        ReflectionTestUtils.setField(gatewaySwaggerResourcesProvider, "gatewayName", "burger");
-        when(swaggerResourcesProvider.get())
-            .thenReturn(
-                List.of(
-                    swaggerResource("default", "/v3/api-docs"),
-                    swaggerResource("default", "/v3/api-docs?group=management"),
-                    swaggerResource("default", "/v3/api-docs?group=openapi")
-                )
-            );
-        when(routeLocator.getRoutes())
-            .thenReturn(
-                Flux.just(
-                    Route
-                        .async()
-                        .id("ReactiveCompositeDiscoveryClient_BURGER")
-                        .uri(URI.create("lb://BURGER"))
-                        .predicate(exchange -> true)
-                        .build(),
-                    Route
-                        .async()
-                        .id("ReactiveCompositeDiscoveryClient_BEER")
-                        .uri(URI.create("lb://BEER"))
-                        .predicate(exchange -> true)
-                        .build()
-                )
-            );
-
-        // When
-        List<SwaggerResource> result = gatewaySwaggerResourcesProvider.get();
-
-        // Then
-        assertThat(result).isNotEmpty();
-        assertThat(result.size()).isEqualTo(3);
-
-        assertThat(result.get(0).getName()).isEqualTo("burger (default)");
-        assertThat(result.get(0).getUrl()).isEqualTo("/v3/api-docs");
-
-        assertThat(result.get(1).getName()).isEqualTo("burger (management)");
-        assertThat(result.get(1).getUrl()).isEqualTo("/v3/api-docs?group=management");
-
-        assertThat(result.get(2).getName()).isEqualTo("beer");
-        assertThat(result.get(2).getUrl()).isEqualTo("/services/beer/v3/api-docs");
-    }
-}

package/generators/server/templates/src/test/resources/cucumber.properties.ejs

@@ -1 +0,0 @@
-cucumber.publish.quiet=true