generator-jhipster 8.0.0-beta.1 → 8.0.0-beta.2

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

@@ -18,12 +18,22 @@
 -%>
 package <%= packageName %>.security.oauth2;
 
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
@@ -44,36 +54,30 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAut
 import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
 /**
  * Test class for the {@link AuthorizationHeaderUtil} utility class.
  */
+@ExtendWith(MockitoExtension.class)
 class AuthorizationHeaderUtilTest {
 
     public static final String VALID_REGISTRATION_ID = "OIDC";
     public static final String SUB_VALUE = "123456";
-    @Mock private OAuth2AuthorizedClientService clientService;
-    @Mock private RestTemplateBuilder restTemplateBuilder;
-    @Mock private SecurityContext securityContext;
-    @InjectMocks private AuthorizationHeaderUtil authorizationHeaderUtil;
+
+    @Mock
+    private OAuth2AuthorizedClientService clientService;
+
+    @Mock
+    private RestTemplateBuilder restTemplateBuilder;
+
+    @Mock
+    private SecurityContext securityContext;
+
+    @InjectMocks
+    private AuthorizationHeaderUtil authorizationHeaderUtil;
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.openMocks(this);
         SecurityContextHolder.setContext(securityContext);
-
-        doReturn(restTemplateBuilder).when(restTemplateBuilder).additionalMessageConverters(any(HttpMessageConverter.class));
-        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
-        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
     }
 
     @Test
@@ -88,8 +92,9 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_JwtAuthentication() {
-        JwtAuthenticationToken jwtToken = new JwtAuthenticationToken(new Jwt("tokenVal", Instant.now(),
-            Instant.now().plus(Duration.ofMinutes(3)), Map.of("alg", "HS256"), Map.of("sub",SUB_VALUE)));
+        JwtAuthenticationToken jwtToken = new JwtAuthenticationToken(
+            new Jwt("tokenVal", Instant.now(), Instant.now().plus(Duration.ofMinutes(3)), Map.of("alg", "HS256"), Map.of("sub", SUB_VALUE))
+        );
         doReturn(jwtToken).when(securityContext).getAuthentication();
 
         Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
@@ -100,15 +105,15 @@ class AuthorizationHeaderUtilTest {
     @Test
     void getAuthorizationHeader_OAuth2Authentication_InvalidClient() {
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken("INVALID");
-        OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient();
 
         doReturn(oauth2Token).when(securityContext).getAuthentication();
-        doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
 
-        Assertions.assertThatThrownBy(() -> {
-            Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
-        }).isInstanceOf(OAuth2AuthorizationException.class)
-            .hasMessageContaining("[access_denied] The token is expired");;
+        Assertions
+            .assertThatThrownBy(() -> {
+                authorizationHeaderUtil.getAuthorizationHeader();
+            })
+            .isInstanceOf(OAuth2AuthorizationException.class)
+            .hasMessageContaining("[access_denied] The token is expired");
     }
 
     @Test
@@ -125,6 +130,12 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_OAuth2Authentication_RefreshToken() {
+        doReturn(restTemplateBuilder)
+            .when(restTemplateBuilder)
+            .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
+
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
         OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
 
@@ -142,6 +153,12 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_OAuth2Authentication_RefreshToken_NoRefreshToken() {
+        doReturn(restTemplateBuilder)
+            .when(restTemplateBuilder)
+            .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
+
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
         OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
 
@@ -159,6 +176,12 @@ class AuthorizationHeaderUtilTest {
 
     @Test
     void getAuthorizationHeader_OAuth2Authentication_RefreshTokenFails() {
+        doReturn(restTemplateBuilder)
+            .when(restTemplateBuilder)
+            .additionalMessageConverters(any(HttpMessageConverter.class), any(HttpMessageConverter.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).errorHandler(any(ResponseErrorHandler.class));
+        doReturn(restTemplateBuilder).when(restTemplateBuilder).basicAuthentication(anyString(), anyString());
+
         OAuth2AuthenticationToken oauth2Token = getTestOAuth2AuthenticationToken(VALID_REGISTRATION_ID);
         OAuth2AuthorizedClient authorizedClient = getTestOAuth2AuthorizedClient(true);
 
@@ -166,12 +189,16 @@ class AuthorizationHeaderUtilTest {
         doReturn(authorizedClient).when(clientService).loadAuthorizedClient(eq(VALID_REGISTRATION_ID), eq(SUB_VALUE));
 
         RestTemplate restTemplate = mock(RestTemplate.class);
-        doThrow(new OAuth2AuthorizationException(new OAuth2Error("E"), "error")).when(restTemplate).exchange(any(RequestEntity.class), eq(OAuthIdpTokenResponseDTO.class));
+        doThrow(new OAuth2AuthorizationException(new OAuth2Error("E"), "error"))
+            .when(restTemplate)
+            .exchange(any(RequestEntity.class), eq(OAuthIdpTokenResponseDTO.class));
         doReturn(restTemplate).when(restTemplateBuilder).build();
 
-        Assertions.assertThatThrownBy(() -> {
-            Optional<String> header = authorizationHeaderUtil.getAuthorizationHeader();
-        }).isInstanceOf(OAuth2AuthenticationException.class)
+        Assertions
+            .assertThatThrownBy(() -> {
+                authorizationHeaderUtil.getAuthorizationHeader();
+            })
+            .isInstanceOf(OAuth2AuthenticationException.class)
             .hasMessageContaining("error");
     }
 
@@ -195,7 +222,8 @@ class AuthorizationHeaderUtilTest {
         OAuth2AccessToken token = new OAuth2AccessToken(OAuth2AccessToken.TokenType.BEARER, "tokenVal", issuedAt, expiresAt);
 
         return new OAuth2AuthorizedClient(
-            ClientRegistration.withRegistrationId(VALID_REGISTRATION_ID)
+            ClientRegistration
+                .withRegistrationId(VALID_REGISTRATION_ID)
                 .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
                 .clientId("web-app")
                 .clientSecret("secret")
@@ -205,14 +233,19 @@ class AuthorizationHeaderUtilTest {
                 .build(),
             "sub",
             token,
-            new OAuth2RefreshToken("refreshVal", Instant.now()));
+            new OAuth2RefreshToken("refreshVal", Instant.now())
+        );
     }
 
     private OAuth2AuthenticationToken getTestOAuth2AuthenticationToken(String registrationId) {
         return new OAuth2AuthenticationToken(
-            new DefaultOidcUser(List.of(new SimpleGrantedAuthority("USER")),
-                OidcIdToken.withTokenValue("tokenVal").claim("sub", SUB_VALUE).build()),
-            List.of(new SimpleGrantedAuthority("USER")), registrationId);
+            new DefaultOidcUser(
+                List.of(new SimpleGrantedAuthority("USER")),
+                OidcIdToken.withTokenValue("tokenVal").claim("sub", SUB_VALUE).build()
+            ),
+            List.of(new SimpleGrantedAuthority("USER")),
+            registrationId
+        );
     }
 
     private Optional<OAuthIdpTokenResponseDTO> getTestOAuthIdpTokenResponseDTO(boolean hasRefreshToken) {

package/dist/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_imperative.java.ejs

@@ -15,7 +15,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @AutoConfigureMockMvc
 @WithMockUser
 @IntegrationTest
-public class SpaWebFilterIT {
+class SpaWebFilterIT {
 
     @Autowired
     private MockMvc mockMvc;

package/dist/generators/server/templates/src/test/java/package/web/filter/SpaWebFilterIT_reactive.java.ejs

@@ -13,7 +13,7 @@ import org.springframework.http.MediaType;
 @AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 @WithMockUser
 @IntegrationTest
-public class SpaWebFilterIT {
+class SpaWebFilterIT {
 
     @Autowired
     private WebTestClient webTestClient;

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

@@ -520,8 +520,8 @@ class AccountResourceIT {
 
         Optional<<%= user.persistClass %>> testUser = userRepository.findOneByEmailIgnoreCase("alice2@example.com")<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(testUser).isPresent();
-        testUser.get().setActivated(true);
-        userRepository.save(testUser.get())<% if (reactive) { %>.block()<% } %>;
+        testUser.orElseThrow().setActivated(true);
+        userRepository.save(testUser.orElseThrow())<% if (reactive) { %>.block()<% } %>;
 
         // Second (already activated) user
 <%_ if (reactive) { _%>
@@ -644,10 +644,10 @@ class AccountResourceIT {
 
         Optional<<%= user.persistClass %>> testUser4 = userRepository.findOneByLogin("test-register-duplicate-email-3")<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(testUser4).isPresent();
-        assertThat(testUser4.get().getEmail()).isEqualTo("test-register-duplicate-email@example.com");
+        assertThat(testUser4.orElseThrow().getEmail()).isEqualTo("test-register-duplicate-email@example.com");
 
-        testUser4.get().setActivated(true);
-        userService.updateUser((new <%= user.adminUserDto %>(testUser4.get())))<% if (reactive) { %>.block()<% } %>;
+        testUser4.orElseThrow().setActivated(true);
+        userService.updateUser((new <%= user.adminUserDto %>(testUser4.orElseThrow())))<% if (reactive) { %>.block()<% } %>;
 
         // Register 4th (already activated) user
 <%_ if (reactive) { _%>
@@ -701,8 +701,8 @@ class AccountResourceIT {
 
         Optional<<%= user.persistClass %>> userDup = userRepository.findOne<% if (databaseTypeSql) { %>WithAuthorities<% } %>ByLogin("badguy")<% if (reactive) { %>.blockOptional()<% } %>;
         assertThat(userDup).isPresent();
-        assertThat(userDup.get().getAuthorities()).hasSize(1)
-            .containsExactly(<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>authorityRepository.findById(AuthoritiesConstants.USER).<% if (reactive) { %>block<% } else { %>get<% } %>()<% } %><% if (databaseTypeCassandra || databaseTypeCouchbase) { %>AuthoritiesConstants.USER<% } %>);
+        assertThat(userDup.orElseThrow().getAuthorities()).hasSize(1)
+            .containsExactly(<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>authorityRepository.findById(AuthoritiesConstants.USER).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>()<% } %><% if (databaseTypeCassandra || databaseTypeCouchbase) { %>AuthoritiesConstants.USER<% } %>);
     }
 
     @Test

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

@@ -239,16 +239,16 @@ public final class TestUtil {
 <%_ if (databaseTypeSql) { _%>
 
     /**
-     * Makes a an executes a query to the EntityManager finding all stored objects.
+     * Executes a query on the EntityManager finding all stored objects.
      * @param <T> The type of objects to be searched
      * @param em The instance of the EntityManager
-     * @param clss The class type to be searched
+     * @param clazz The class type to be searched
      * @return A list of all found objects
      */
-    public static <T> List<T> findAll(EntityManager em, Class<T> clss) {
+    public static <T> List<T> findAll(EntityManager em, Class<T> clazz) {
         CriteriaBuilder cb = em.getCriteriaBuilder();
-        CriteriaQuery<T> cq = cb.createQuery(clss);
-        Root<T> rootEntry = cq.from(clss);
+        CriteriaQuery<T> cq = cb.createQuery(clazz);
+        Root<T> rootEntry = cq.from(clazz);
         CriteriaQuery<T> all = cq.select(rootEntry);
         TypedQuery<T> allQuery = em.createQuery(all);
         return allQuery.getResultList();

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

@@ -630,7 +630,7 @@ class UserResourceIT {
             .collectList().block()<% } %>.size();
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());
@@ -668,7 +668,7 @@ class UserResourceIT {
         // Validate the User in the database
         assertPersistedUsers(users -> {
             assertThat(users).hasSize(databaseSizeBeforeUpdate);
-            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().get();
+            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().orElseThrow();
             assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
             assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
             assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
@@ -695,7 +695,7 @@ class UserResourceIT {
             .collectList().block()<% } %>.size();
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());
@@ -733,7 +733,7 @@ class UserResourceIT {
         // Validate the User in the database
         assertPersistedUsers(users -> {
             assertThat(users).hasSize(databaseSizeBeforeUpdate);
-            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().get();
+            <%= user.persistClass %> testUser = users.stream().filter(usr -> usr.getId().equals(updatedUser.getId())).findFirst().orElseThrow();
             assertThat(testUser.getLogin()).isEqualTo(UPDATED_LOGIN);
             assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
             assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
@@ -784,7 +784,7 @@ class UserResourceIT {
   <%_ } _%>
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());
@@ -859,7 +859,7 @@ class UserResourceIT {
   <%_ } _%>
 
         // Update the user
-        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
+        <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
         <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
         user.setId(updatedUser.getId());

package/dist/generators/spring-cache/internal/dependencies.mjs

@@ -23,6 +23,9 @@ const javaxCacheApi = {
 const hibernateJCache = {
     groupId: 'org.hibernate.orm',
     artifactId: 'hibernate-jcache',
+    // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+    // eslint-disable-next-line no-template-curly-in-string
+    version: '${hibernate.version}',
 };
 // eslint-disable-next-line import/prefer-default-export
 export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies) => {

package/dist/generators/spring-controller/generator.mjs

@@ -38,7 +38,6 @@ export default class SpringControllerGenerator extends BaseGenerator {
         this.name = this.options.name;
         this.option('default', {
             type: Boolean,
-            default: false,
             description: 'default option',
         });
         this.defaultOption = this.options.default;

package/dist/generators/spring-data-relational/internal/dependencies.mjs

@@ -50,8 +50,10 @@ export const getImperativeMavenDefinition = ({ javaDependencies }) => ({
     properties: [{ property: 'hibernate.version', value: javaDependencies.hibernate }],
     dependencies: [
         { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-data-jpa' },
-        { groupId: 'com.fasterxml.jackson.datatype', artifactId: 'jackson-datatype-hibernate5-jakarta' },
-        { groupId: 'org.hibernate.orm', artifactId: 'hibernate-core' },
+        { groupId: 'com.fasterxml.jackson.datatype', artifactId: 'jackson-datatype-hibernate6' },
+        // TODO drop forced version. Refer to https://github.com/jhipster/generator-jhipster/issues/22579
+        // eslint-disable-next-line no-template-curly-in-string
+        { groupId: 'org.hibernate.orm', artifactId: 'hibernate-core', version: '${hibernate.version}' },
         { groupId: 'org.hibernate.orm', artifactId: 'hibernate-jpamodelgen', scope: 'provided' },
         { groupId: 'org.hibernate.validator', artifactId: 'hibernate-validator' },
         { groupId: 'org.springframework.security', artifactId: 'spring-security-data' },
@@ -101,9 +103,7 @@ export const getDatabaseTypeMavenDefinition = (databaseType, { inProfile, javaDe
                 ],
             },
             r2dbc: {
-                // TODO drop version once spring-boot 3.1.0 is released https://github.com/spring-projects/spring-boot/issues/34625
-                // dependencies: [{ inProfile, groupId: 'org.mariadb', artifactId: 'r2dbc-mariadb', version: javaDependencies['r2dbc-mariadb'] }],
-                dependencies: [{ inProfile, groupId: 'io.asyncer', artifactId: 'r2dbc-mysql', version: javaDependencies['r2dbc-mysql'] }],
+                dependencies: [{ inProfile, groupId: 'org.mariadb', artifactId: 'r2dbc-mariadb' }],
             },
         },
         mssql: {
@@ -125,7 +125,7 @@ export const getDatabaseTypeMavenDefinition = (databaseType, { inProfile, javaDe
                 ],
             },
             r2dbc: {
-                dependencies: [{ inProfile, groupId: 'io.asyncer', artifactId: 'r2dbc-mysql', version: javaDependencies['r2dbc-mysql'] }],
+                dependencies: [{ inProfile, groupId: 'io.asyncer', artifactId: 'r2dbc-mysql' }],
             },
         },
         oracle: {

package/dist/generators/spring-data-relational/support/database-data.mjs

@@ -75,10 +75,6 @@ const databaseData = {
         defaultUsername: 'root',
         constraintNameMaxLength: 64,
         tableNameMaxLength: 64,
-        r2dbc: {
-            // TODO switch to mariadb if r2dbc-mariadb is reinstated
-            protocolSuffix: 'mysql://',
-        },
     },
     [MYSQL]: {
         name: 'MySQL',

package/dist/generators/spring-data-relational/templates/src/test/java/package/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs

@@ -69,7 +69,7 @@ public class SqlTestContainersSpringContextCustomizerFactory implements ContextC
                     }
                 }
 <%_ if (reactive) { _%>
-                testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMariadb) { %>.replace("mariadb", "mysql")<% } else if (prodDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- prodDatabaseExtraOptions %>");
+                testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMssql) { %>.replace(";encrypt=false", "")<% } %> + "<%- prodDatabaseExtraOptions %>");
                 testValues = testValues.and("spring.r2dbc.username=" + prodTestContainer.getTestContainer().getUsername());
                 testValues = testValues.and("spring.r2dbc.password=" + prodTestContainer.getTestContainer().getPassword());
                 testValues = testValues.and("spring.liquibase.url=" + prodTestContainer.getTestContainer().getJdbcUrl()  + "<%- prodDatabaseExtraOptions %>");

package/dist/generators/spring-service/generator.mjs

@@ -32,7 +32,6 @@ export default class SpringServiceGenerator extends BaseGenerator {
         this.name = this.options.name;
         this.option('default', {
             type: Boolean,
-            default: false,
             description: 'default option',
         });
         this.defaultOption = this.options.default;

package/dist/generators/upgrade/generator.mjs

@@ -22,7 +22,7 @@ import semver from 'semver';
 import fs from 'fs';
 import gitignore from 'parse-gitignore';
 import path from 'path';
-import childProcess from 'child_process';
+import latestVersion from 'latest-version';
 import BaseGenerator from '../base/index.mjs';
 import { upgradeFilesTask as upgradeLanguagesFilesTask } from '../languages/index.mjs';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
@@ -78,24 +78,12 @@ export default class UpgradeGenerator extends BaseGenerator {
             description: 'Upgrade to specific blueprint versions instead of the latest, e.g. --target-blueprint-versions foo@0.0.1,bar@1.0.2',
             type: String,
         });
-        // This adds support for a `--skip-install` flag
-        this.option('skip-install', {
-            description: 'Skips installing dependencies during the upgrade process',
-            type: Boolean,
-            default: false,
-        });
         // This adds support for a `--silent` flag
         this.option('silent', {
             description: 'Hides output of the generation process',
             type: Boolean,
             default: false,
         });
-        // This adds support for a `--skip-checks` flag
-        this.option('skip-checks', {
-            description: 'Disable checks during project regeneration',
-            type: Boolean,
-            default: false,
-        });
         if (this.options.help) {
             return;
         }
@@ -109,7 +97,7 @@ export default class UpgradeGenerator extends BaseGenerator {
         }
     }
     get [BaseGenerator.INITIALIZING]() {
-        return {
+        return this.asInitializingTaskGroup({
             displayLogo() {
                 this.log.log(chalk.green('Welcome to the JHipster Upgrade Sub-Generator'));
                 this.log.log(chalk.green('This will upgrade your current application codebase to the latest JHipster version'));
@@ -121,7 +109,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                 this.currentJhipsterVersion = this.config.get('jhipsterVersion');
                 this.clientPackageManager = this.config.get('clientPackageManager');
             },
-        };
+        });
     }
     _rmRf(file) {
         const absolutePath = path.resolve(file);
@@ -178,13 +166,11 @@ export default class UpgradeGenerator extends BaseGenerator {
         const skipChecksOption = this.skipChecks ? '--skip-checks' : '';
         const regenerateCmd = `${generatorCommand} --with-entities --force --skip-install --skip-git --ignore-errors --no-insight ${skipChecksOption}`;
         this.log.verboseInfo(regenerateCmd);
-        try {
-            childProcess.execSync(regenerateCmd, { stdio: 'inherit' });
-            this.success(`Successfully regenerated application with JHipster ${jhipsterVersion}${blueprintInfo}`);
-        }
-        catch (err) {
-            throw new Error(`Something went wrong while generating project! ${err}`);
+        const result = this.spawnCommandSync(regenerateCmd);
+        if (result.exitCode !== 0) {
+            throw new Error(`Something went wrong while generating project! ${result.exitCode}`);
         }
+        this.success(`Successfully regenerated application with JHipster ${jhipsterVersion}${blueprintInfo}`);
     }
     _gitCommitAll(commitMsg) {
         const gitAdd = this.gitExec(['add', '-A'], { maxBuffer: 1024 * 10000, silent: this.silent });
@@ -204,17 +190,6 @@ export default class UpgradeGenerator extends BaseGenerator {
         this._rmRf(keystore);
         this._gitCommitAll(`Generated with JHipster ${jhipsterVersion}${blueprintInfo}`);
     }
-    _retrieveLatestVersion(packageName) {
-        this.log.verboseInfo(`Looking for latest ${packageName} version...`);
-        const commandPrefix = 'npm show';
-        const pkgInfo = shelljs.exec(`${commandPrefix} ${packageName} version`, { silent: this.silent });
-        if (pkgInfo.stderr) {
-            this.log.warn(pkgInfo.stderr);
-            throw new Error(`Something went wrong fetching the latest ${packageName} version number...\n${pkgInfo.stderr}`);
-        }
-        const msg = pkgInfo.stdout;
-        return msg.replace('\n', '');
-    }
     _installNpmPackageLocally(npmPackage, version) {
         this.log.verboseInfo(`Installing ${npmPackage} ${version} locally`);
         const commandPrefix = 'npm install';
@@ -261,32 +236,28 @@ export default class UpgradeGenerator extends BaseGenerator {
                     }
                     return true;
                 })
-                    .map(blueprint => {
-                    return new Promise(resolve => {
-                        const latestVersion = this._retrieveLatestVersion(blueprint.name);
-                        blueprint.latestBlueprintVersion = latestVersion;
-                        if (semver.lt(blueprint.version, blueprint.latestBlueprintVersion)) {
-                            this.newBlueprintVersionFound = true;
-                            this.success(`New ${blueprint.name} version found: ${blueprint.latestBlueprintVersion}`);
-                        }
-                        else if (this.force) {
-                            this.newBlueprintVersionFound = true;
-                            this.log.log(chalk.yellow('Forced re-generation'));
-                        }
-                        else {
-                            if (this.newBlueprintVersionFound === undefined) {
-                                this.newBlueprintVersionFound = false;
-                            }
-                            this.log.warn(`${chalk.green('No update available.')} Application has already been generated with latest version for blueprint: ${blueprint.name}`);
+                    .map(async (blueprint) => {
+                    blueprint.latestBlueprintVersion = await latestVersion(blueprint.name);
+                    if (semver.lt(blueprint.version, blueprint.latestBlueprintVersion)) {
+                        this.newBlueprintVersionFound = true;
+                        this.success(`New ${blueprint.name} version found: ${blueprint.latestBlueprintVersion}`);
+                    }
+                    else if (this.force) {
+                        this.newBlueprintVersionFound = true;
+                        this.log.log(chalk.yellow('Forced re-generation'));
+                    }
+                    else {
+                        if (this.newBlueprintVersionFound === undefined) {
+                            this.newBlueprintVersionFound = false;
                         }
-                        this.success(`Done checking for new version for blueprint ${blueprint.name}`);
-                        resolve();
-                    });
+                        this.log.warn(`${chalk.green('No update available.')} Application has already been generated with latest version for blueprint: ${blueprint.name}`);
+                    }
+                    this.success(`Done checking for new version for blueprint ${blueprint.name}`);
                 })).then(() => {
                     this.success('Done checking for new version of blueprints');
                 });
             },
-            checkLatestJhipsterVersion() {
+            async checkLatestJhipsterVersion() {
                 if (this.targetJhipsterVersion) {
                     if (this.targetJhipsterVersion === GLOBAL_VERSION) {
                         this.originalTargetJhipsterVersion = this.targetJhipsterVersion;
@@ -296,8 +267,7 @@ export default class UpgradeGenerator extends BaseGenerator {
                     return;
                 }
                 this.log.verboseInfo(`Looking for latest ${GENERATOR_JHIPSTER} version...`);
-                const latestVersion = this._retrieveLatestVersion(GENERATOR_JHIPSTER);
-                this.targetJhipsterVersion = latestVersion;
+                this.targetJhipsterVersion = await latestVersion(GENERATOR_JHIPSTER);
                 if (semver.lt(this.currentJhipsterVersion, this.targetJhipsterVersion)) {
                     this.success(`New ${GENERATOR_JHIPSTER} version found: ${this.targetJhipsterVersion}`);
                 }