npm - generator-jhipster - Versions diffs - 8.5.0 → 8.7.0 - Mend

generator-jhipster 8.5.0 → 8.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (951) hide show

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/jwt/TokenAuthenticationSecurityMetersIT.java.ejs RENAMED Viewed

@@ -68,8 +68,9 @@ class TokenAuthenticationSecurityMetersIT {
         tryToAuthenticate(createTokenWithDifferentSignature());
-        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count())
-            .isEqualTo(count + 1);
+        assertThat(meterRegistry.get(INVALID_TOKENS_METER_EXPECTED_NAME).tag("cause", "invalid-signature").counter().count()).isEqualTo(
+            count + 1
+        );
     }
     @Test

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/security/oauth2/CustomClaimConverterIT.java.ejs RENAMED Viewed

@@ -77,8 +77,7 @@ class CustomClaimConverterIT {
                 any(HttpEntity.class),
                 ArgumentMatchers.<Class<ObjectNode>>any()
             )
-        )
-            .thenReturn(ResponseEntity.ok(userInfo));
+        ).thenReturn(ResponseEntity.ok(userInfo));
     }
     @Test
@@ -157,11 +156,9 @@ class CustomClaimConverterIT {
         user.put("preferred_username", USERNAME);
         mockHttpGetUserInfo(user);
-        assertThatCode(() ->  {
+        assertThatCode(() -> {
             Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
-            assertThat(convertedClaims)
-                .containsEntry("preferred_username", USERNAME)
-                .doesNotContainKeys("given_name", "family_name");
+            assertThat(convertedClaims).containsEntry("preferred_username", USERNAME).doesNotContainKeys("given_name", "family_name");
         }).doesNotThrowAnyException();
     }
@@ -176,7 +173,7 @@ class CustomClaimConverterIT {
         user.put("name", FULL_NAME);
         mockHttpGetUserInfo(user);
-        assertThatCode(() ->  {
+        assertThatCode(() -> {
             Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
             assertThat(convertedClaims)
                 .containsEntry("preferred_username", USERNAME)
@@ -196,7 +193,7 @@ class CustomClaimConverterIT {
         user.put("name", FULL_NAME + " " + NAME_SUFFIX);
         mockHttpGetUserInfo(user);
-        assertThatCode(() ->  {
+        assertThatCode(() -> {
             Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
             System.out.println(convertedClaims);
             assertThat(convertedClaims)
@@ -217,11 +214,9 @@ class CustomClaimConverterIT {
         user.put("email", EMAIL);
         mockHttpGetUserInfo(user);
-        assertThatCode(() ->  {
+        assertThatCode(() -> {
             Map<String, Object> convertedClaims = customClaimConverter.convert(claims);
-            assertThat(convertedClaims)
-                .containsEntry("preferred_username", USERNAME)
-                .containsEntry("email", EMAIL);
+            assertThat(convertedClaims).containsEntry("preferred_username", USERNAME).containsEntry("email", EMAIL);
         }).doesNotThrowAnyException();
     }
 }

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/MailServiceIT.java.ejs RENAMED Viewed

@@ -78,7 +78,7 @@ class MailServiceIT {
     @BeforeEach
     public void setup() {
         doNothing().when(javaMailSender).send(any(MimeMessage.class));
-        when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session)null));
+        when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session) null));
     }
     @Test
@@ -233,7 +233,9 @@ class MailServiceIT {
             String emailTitle = (String) properties.get("email.test.title");
             assertThat(message.getSubject()).isEqualTo(emailTitle);
-            assertThat(message.getContent().toString()).isEqualToNormalizingNewlines("<html>" + emailTitle + ", http://127.0.0.1:8080, john</html>\n");
+            assertThat(message.getContent().toString()).isEqualToNormalizingNewlines(
+                "<html>" + emailTitle + ", http://127.0.0.1:8080, john</html>\n"
+            );
         }
     }
@@ -244,7 +246,7 @@ class MailServiceIT {
         String javaLangKey = langKey;
         Matcher matcher2 = PATTERN_LOCALE_2.matcher(langKey);
         if (matcher2.matches()) {
-            javaLangKey = matcher2.group(1) + "_"+ matcher2.group(2).toUpperCase();
+            javaLangKey = matcher2.group(1) + "_" + matcher2.group(2).toUpperCase();
         }
         Matcher matcher3 = PATTERN_LOCALE_3.matcher(langKey);
         if (matcher3.matches()) {

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs RENAMED Viewed

@@ -153,9 +153,7 @@ class UserMapperTest {
         List<<%= user.dtoClass %>> userDTOS = userMapper.usersToUserDTOs(users);
-        assertThat(userDTOS)
-          .isNotEmpty()
-          .size().isEqualTo(1);
+        assertThat(userDTOS).isNotEmpty().size().isEqualTo(1);
     }
     @Test
@@ -166,9 +164,7 @@ class UserMapperTest {
         List<<%= user.persistClass %>> users = userMapper.userDTOsToUsers(usersDto);
-        assertThat(users)
-          .isNotEmpty()
-          .size().isEqualTo(1);
+        assertThat(users).isNotEmpty().size().isEqualTo(1);
     }
     @Test
@@ -182,9 +178,7 @@ class UserMapperTest {
         List<<%= user.persistClass %>> users = userMapper.userDTOsToUsers(usersDto);
-        assertThat(users)
-          .isNotEmpty()
-          .size().isEqualTo(1);
+        assertThat(users).isNotEmpty().size().isEqualTo(1);
         assertThat(users.get(0).getAuthorities()).isNotNull();
         assertThat(users.get(0).getAuthorities()).isNotEmpty();
 <%_ if (databaseTypeSql || databaseTypeMongodb) { _%>
@@ -204,9 +198,7 @@ class UserMapperTest {
         List<<%= user.persistClass %>> users = userMapper.userDTOsToUsers(usersDto);
-        assertThat(users)
-          .isNotEmpty()
-          .size().isEqualTo(1);
+        assertThat(users).isNotEmpty().size().isEqualTo(1);
         assertThat(users.get(0).getAuthorities()).isNotNull();
         assertThat(users.get(0).getAuthorities()).isEmpty();
     }

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/test/util/OAuth2TestUtil.java.ejs RENAMED Viewed

@@ -41,6 +41,7 @@ import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 public class OAuth2TestUtil {
     public static final String TEST_USER_LOGIN = "test";
     public static final String ID_TOKEN =

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterIT_reactive.java.ejs RENAMED Viewed

@@ -60,11 +60,7 @@ class SpaWebFilterIT {
     @Test
     void testFilterDoesNotForwardToIndexForDotFile() {
-        webTestClient
-            .get()
-            .uri("/file.js")
-            .exchange()
-            .expectStatus().isNotFound();
+        webTestClient.get().uri("/file.js").exchange().expectStatus().isNotFound();
     }
     @Test
@@ -73,9 +69,12 @@ class SpaWebFilterIT {
             .get()
             .uri("/test")
             .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType("text/html;charset=UTF-8")
-            .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentType("text/html;charset=UTF-8")
+            .expectBody(String.class)
+            .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
     }
     @Test
@@ -84,9 +83,12 @@ class SpaWebFilterIT {
             .get()
             .uri("/first-level")
             .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType("text/html;charset=UTF-8")
-            .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentType("text/html;charset=UTF-8")
+            .expectBody(String.class)
+            .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
     }
     @Test
@@ -95,9 +97,12 @@ class SpaWebFilterIT {
             .get()
             .uri("/first-level/second-level")
             .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType("text/html;charset=UTF-8")
-            .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentType("text/html;charset=UTF-8")
+            .expectBody(String.class)
+            .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
     }
     @Test
@@ -106,9 +111,12 @@ class SpaWebFilterIT {
             .get()
             .uri("/first-level/second-level/third-level")
             .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType("text/html;charset=UTF-8")
-            .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentType("text/html;charset=UTF-8")
+            .expectBody(String.class)
+            .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
     }
     @Test
@@ -117,19 +125,17 @@ class SpaWebFilterIT {
             .get()
             .uri("/1/2/3/4/5/6/7/8/9/10")
             .exchange()
-            .expectStatus().isOk()
-            .expectHeader().contentType("text/html;charset=UTF-8")
-            .expectBody(String.class).isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
+            .expectStatus()
+            .isOk()
+            .expectHeader()
+            .contentType("text/html;charset=UTF-8")
+            .expectBody(String.class)
+            .isEqualTo(SpaWebFilterTestController.INDEX_HTML_TEST_CONTENT);
     }
     @Test
     void getUnmappedFirstLevelFile() {
-        webTestClient
-            .get()
-            .uri("/foo.js")
-            .exchange()
-            .expectStatus()
-            .isNotFound();
+        webTestClient.get().uri("/foo.js").exchange().expectStatus().isNotFound();
     }
     /**
@@ -139,21 +145,11 @@ class SpaWebFilterIT {
      */
     @Test
     void getUnmappedSecondLevelFile() {
-        webTestClient
-            .get()
-            .uri("/foo/bar.js")
-            .exchange()
-            .expectStatus()
-            .isForbidden();
+        webTestClient.get().uri("/foo/bar.js").exchange().expectStatus().isForbidden();
     }
     @Test
     void getUnmappedThirdLevelFile() {
-        webTestClient
-            .get()
-            .uri("/foo/another/bar.js")
-            .exchange()
-            .expectStatus()
-            .isForbidden();
+        webTestClient.get().uri("/foo/another/bar.js").exchange().expectStatus().isForbidden();
     }
 }

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/filter/SpaWebFilterTestController_reactive.java.ejs RENAMED Viewed

@@ -13,5 +13,4 @@ public class SpaWebFilterTestController {
     public String getIndexHtmlTestContent() {
         return INDEX_HTML_TEST_CONTENT;
     }
 }

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs RENAMED Viewed

@@ -174,14 +174,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
     void testNonAuthenticatedUser() {
         accountWebTestClient.get().uri("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON)
+            .accept(MediaType.TEXT_PLAIN)
             .exchange()
             .expectStatus().isOk()
             .expectBody().isEmpty();
 <%_ } else { _%>
     void testNonAuthenticatedUser() throws Exception {
-        restAccountMockMvc.perform(get("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON))
+        restAccountMockMvc
+            .perform(get("/api/authenticate").accept(MediaType.TEXT_PLAIN))
             .andExpect(status().isOk())
             .andExpect(content().string(""));
 <%_ } _%>
@@ -193,15 +193,14 @@ class AccountResourceIT {
     void testAuthenticatedUser() {
         accountWebTestClient
             .get().uri("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON)
+            .accept(MediaType.TEXT_PLAIN)
             .exchange()
             .expectStatus().isOk()
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
 <%_ } else { _%>
     void testAuthenticatedUser() throws Exception {
-        restAccountMockMvc.perform(get("/api/authenticate")
-            .with(request -> request)
-            .accept(MediaType.APPLICATION_JSON))
+        restAccountMockMvc
+            .perform(get("/api/authenticate").with(request -> request).accept(MediaType.TEXT_PLAIN))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));
 <%_ } _%>
@@ -324,7 +323,7 @@ class AccountResourceIT {
 <%_ } _%>
     void testRegisterInvalidLogin() throws Exception {
         ManagedUserVM invalidUser = new ManagedUserVM();
-        invalidUser.setLogin("funky-log(n");// <-- invalid
+        invalidUser.setLogin("funky-log(n"); // <-- invalid
         invalidUser.setPassword("password");
         invalidUser.setFirstName("Funky");
         invalidUser.setLastName("One");
@@ -360,9 +359,9 @@ class AccountResourceIT {
     static Stream<ManagedUserVM> invalidUsers() {
         return Stream.of(
-            createInvalidUser("bob", "password", "Bob", "Green", "invalid", true),// <-- invalid
-            createInvalidUser("bob", "123", "Bob", "Green", "bob@example.com", true),// password with only 3 digits
-            createInvalidUser("bob", null, "Bob", "Green", "bob@example.com", true)// invalid null password
+            createInvalidUser("bob", "password", "Bob", "Green", "invalid", true), // <-- invalid
+            createInvalidUser("bob", "123", "Bob", "Green", "bob@example.com", true), // password with only 3 digits
+            createInvalidUser("bob", null, "Bob", "Green", "bob@example.com", true) // invalid null password
         );
     }
@@ -391,7 +390,14 @@ class AccountResourceIT {
         assertThat(user).isEmpty();
     }
-    private static ManagedUserVM createInvalidUser(String login, String password, String firstName, String lastName, String email, boolean activated) {
+    private static ManagedUserVM createInvalidUser(
+        String login,
+        String password,
+        String firstName,
+        String lastName,
+        String email,
+        boolean activated
+    ) {
         ManagedUserVM invalidUser = new ManagedUserVM();
         invalidUser.setLogin(login);
         invalidUser.setPassword(password);
@@ -1201,7 +1207,8 @@ class AccountResourceIT {
         token.setUserAgent("Test agent");
         persistentTokenRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(token);
-        restAccountMockMvc.perform(get("/api/account/sessions"))
+        restAccountMockMvc
+            .perform(get("/api/account/sessions"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$.[*].series").value(hasItem(token.getSeries())))
             .andExpect(jsonPath("$.[*].ipAddress").value(hasItem(token.getIpAddress())))

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs RENAMED Viewed

@@ -185,13 +185,13 @@ class AccountResourceIT {
     void testNonAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         webTestClient.get().uri("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON)
+            .accept(MediaType.TEXT_PLAIN)
             .exchange()
             .expectStatus().isOk()
             .expectBody().isEmpty();
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON))
+            .accept(MediaType.TEXT_PLAIN))
             .andExpect(status().isOk())
             .andExpect(content().string(""));
 <%_ } _%>
@@ -203,14 +203,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         webTestClient
             .get().uri("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON)
+            .accept(MediaType.TEXT_PLAIN)
             .exchange()
             .expectStatus().isOk()
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
             .with(request -> request)
-            .accept(MediaType.APPLICATION_JSON))
+            .accept(MediaType.TEXT_PLAIN))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));
 <%_ } _%>

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/AccountResourceIT_skipUserManagement.java.ejs RENAMED Viewed

@@ -116,13 +116,13 @@ class AccountResourceIT {
     void testNonAuthenticatedUser() <% if (!reactive) { %>throws Exception <% } %>{
 <%_ if (reactive) { _%>
         accountWebTestClient.get().uri("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON)
+            .accept(MediaType.TEXT_PLAIN)
             .exchange()
             .expectStatus().isOk()
             .expectBody().isEmpty();
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON))
+            .accept(MediaType.TEXT_PLAIN))
             .andExpect(status().isOk())
             .andExpect(content().string(""));
 <%_ } _%>
@@ -134,14 +134,14 @@ class AccountResourceIT {
 <%_ if (reactive) { _%>
         accountWebTestClient
             .get().uri("/api/authenticate")
-            .accept(MediaType.APPLICATION_JSON)
+            .accept(MediaType.TEXT_PLAIN)
             .exchange()
             .expectStatus().isOk()
             .expectBody(String.class).isEqualTo(TEST_USER_LOGIN);
 <%_ } else { _%>
         restAccountMockMvc.perform(get("/api/authenticate")
             .with(request -> request)
-            .accept(MediaType.APPLICATION_JSON))
+            .accept(MediaType.TEXT_PLAIN))
             .andExpect(status().isOk())
             .andExpect(content().string(TEST_USER_LOGIN));
 <%_ } _%>

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/TestUtil.java.ejs RENAMED Viewed

@@ -108,11 +108,9 @@ public final class TestUtil {
                 }
                 return true;
             } catch (DateTimeParseException e) {
-                mismatchDescription.appendText("was ").appendValue(item)
-                    .appendText(", which could not be parsed as a ZonedDateTime");
+                mismatchDescription.appendText("was ").appendValue(item).appendText(", which could not be parsed as a ZonedDateTime");
                 return false;
             }
         }
         @Override
@@ -169,9 +167,9 @@ public final class TestUtil {
             } else {
                 return BigDecimal.valueOf(item.doubleValue());
             }
         }
     }
     /**
      * Creates a matcher that matches when the examined number represents the same value as the reference BigDecimal.
      *
@@ -208,7 +206,7 @@ public final class TestUtil {
      * @return the {@link FormattingConversionService}.
      */
     public static FormattingConversionService createFormattingConversionService() {
-        DefaultFormattingConversionService dfcs = new DefaultFormattingConversionService ();
+        DefaultFormattingConversionService dfcs = new DefaultFormattingConversionService();
         DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar();
         registrar.setUseIsoFormat(true);
         registrar.registerFormatters(dfcs);

package/dist/generators/{server → spring-boot}/templates/src/test/java/_package_/web/rest/WithUnauthenticatedMockUser.java.ejs RENAMED Viewed

@@ -28,12 +28,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @WithSecurityContext(factory = WithUnauthenticatedMockUser.Factory.class)
 public @interface WithUnauthenticatedMockUser {
     class Factory implements WithSecurityContextFactory<WithUnauthenticatedMockUser> {
         @Override
         public SecurityContext createSecurityContext(WithUnauthenticatedMockUser annotation) {
             return SecurityContextHolder.createEmptyContext();