From a2e98a2ab6367d5ad345354849d507904271ba2c Mon Sep 17 00:00:00 2001 From: ravipilgar Date: Thu, 28 Oct 2021 17:09:42 +0530 Subject: [PATCH 1/4] Sonar lint bug fixed --- .../rest/config/LiquibaseConfiguration.java | 4 +--- .../springboot/rest/config/WebConfigurer.java | 1 - .../rest/domain/service/AuthorityService.java | 2 -- .../rest/domain/service/UserService.java | 3 +-- .../adaptor/AuthorityJPAAdaptor.java | 2 -- .../infrastructure/adaptor/UserJPAAdaptor.java | 1 - .../springboot/rest/rest/AccountResource.java | 15 ++++++--------- .../com/springboot/rest/rest/UserResource.java | 6 +++--- .../security/DomainUserDetailsService.java | 11 +++++------ .../rest/rest/AccountResourceIT.java | 12 +++++++----- .../resources/templates/mail/testEmail.html | 18 +++++++++++++++++- 11 files changed, 40 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java b/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java index 7b05525..dfbb437 100644 --- a/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java +++ b/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java @@ -35,9 +35,7 @@ public SpringLiquibase liquibase( LiquibaseProperties liquibaseProperties, ObjectProvider dataSource, DataSourceProperties dataSourceProperties - ) { - // If you don't want Liquibase to start asynchronously, substitute by this: - // SpringLiquibase liquibase = SpringLiquibaseUtil.createSpringLiquibase(liquibaseDataSource.getIfAvailable(), liquibaseProperties, dataSource.getIfUnique(), dataSourceProperties); + ) { SpringLiquibase liquibase = SpringLiquibaseUtil.createAsyncSpringLiquibase( this.env, executor, diff --git a/src/main/java/com/springboot/rest/config/WebConfigurer.java b/src/main/java/com/springboot/rest/config/WebConfigurer.java index 70d870a..1f7f6ee 100644 --- a/src/main/java/com/springboot/rest/config/WebConfigurer.java +++ b/src/main/java/com/springboot/rest/config/WebConfigurer.java @@ -50,7 +50,6 @@ public CorsFilter corsFilter() { log.debug("Registering CORS filter"); source.registerCorsConfiguration("/api/**", config); source.registerCorsConfiguration("/management/**", config); -// source.registerCorsConfiguration("/v2/api-docs", config); source.registerCorsConfiguration("/v3/api-docs", config); source.registerCorsConfiguration("/swagger-resources", config); source.registerCorsConfiguration("/swagger-ui/**", config); diff --git a/src/main/java/com/springboot/rest/domain/service/AuthorityService.java b/src/main/java/com/springboot/rest/domain/service/AuthorityService.java index f54e062..7e0b55c 100644 --- a/src/main/java/com/springboot/rest/domain/service/AuthorityService.java +++ b/src/main/java/com/springboot/rest/domain/service/AuthorityService.java @@ -18,8 +18,6 @@ @Transactional public class AuthorityService implements AuthorityServicePort { - private final Logger log = LoggerFactory.getLogger(AuthorityService.class); - private final AuthorityPersistencePort authorityPersistencePort; public AuthorityService(AuthorityPersistencePort authorityPersistencePort) { diff --git a/src/main/java/com/springboot/rest/domain/service/UserService.java b/src/main/java/com/springboot/rest/domain/service/UserService.java index 471aa8a..894c4d7 100644 --- a/src/main/java/com/springboot/rest/domain/service/UserService.java +++ b/src/main/java/com/springboot/rest/domain/service/UserService.java @@ -98,7 +98,6 @@ public User registerUser(AdminUserDTO userDTO, String password) { return userPersistencePort.save(userDTO, password); - // log.debug("Created Information for User: {}", newUser); } @Override @@ -125,7 +124,7 @@ public User createUser(AdminUserDTO userDTO) { return userPersistencePort.createUser(userDTO); } - // log.debug("Created Information for User: {}", user); + } /** diff --git a/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java b/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java index 1fce1bf..c9e2495 100644 --- a/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java +++ b/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java @@ -13,8 +13,6 @@ @Service public class AuthorityJPAAdaptor implements AuthorityPersistencePort{ - private final Logger log = LoggerFactory.getLogger(AuthorityJPAAdaptor.class); - private final AuthorityRepository authRepository; public AuthorityJPAAdaptor(AuthorityRepository authRepository) { diff --git a/src/main/java/com/springboot/rest/infrastructure/adaptor/UserJPAAdaptor.java b/src/main/java/com/springboot/rest/infrastructure/adaptor/UserJPAAdaptor.java index 831ce35..9e41573 100644 --- a/src/main/java/com/springboot/rest/infrastructure/adaptor/UserJPAAdaptor.java +++ b/src/main/java/com/springboot/rest/infrastructure/adaptor/UserJPAAdaptor.java @@ -129,7 +129,6 @@ public User save(AdminUserDTO userDTO, String password) { authorityRepository.findById(AuthoritiesConstants.USER).ifPresent(authorities::add); newUser.setAuthorities(authorities); userRepository.save(newUser); - // this.clearUserCaches(newUser); log.debug("Created Information for User: {}", newUser); return newUser; } diff --git a/src/main/java/com/springboot/rest/rest/AccountResource.java b/src/main/java/com/springboot/rest/rest/AccountResource.java index 0a011a0..55ae79c 100644 --- a/src/main/java/com/springboot/rest/rest/AccountResource.java +++ b/src/main/java/com/springboot/rest/rest/AccountResource.java @@ -35,11 +35,11 @@ public class AccountResource { private final UserServicePort userServicePort; - private final MailServicePort mailServicePort; - public AccountResource(UserServicePort userServicePort, MailServicePort mailServicePort) { + + public AccountResource(UserServicePort userServicePort) { this.userServicePort = userServicePort; - this.mailServicePort = mailServicePort; + } /** @@ -60,8 +60,8 @@ public void registerAccount(@Valid @RequestBody ManagedUserVM managedUserVM) { if (isPasswordLengthInvalid(managedUserVM.getPassword())) { throw new InvalidPasswordException(); } - User user = userServicePort.registerUser(managedUserVM, managedUserVM.getPassword()); - // mailServicePort.sendActivationEmail(user); + + } /** @@ -160,11 +160,8 @@ public void changePassword(@RequestBody PasswordChangeDTO passwordChangeDto) { public void requestPasswordReset(@RequestBody String mail) { Optional user = userServicePort.requestPasswordReset(mail); if (user.isPresent()) { - // mailServicePort.sendPasswordResetMail(user.get()); + log.warn("Password reset requested for existing mail"); } else { - // Pretend the request has been successful to prevent checking which - // emails really exist - // but log that an invalid attempt has been made log.warn("Password reset requested for non existing mail"); } } diff --git a/src/main/java/com/springboot/rest/rest/UserResource.java b/src/main/java/com/springboot/rest/rest/UserResource.java index 22a3631..bfe2e0f 100644 --- a/src/main/java/com/springboot/rest/rest/UserResource.java +++ b/src/main/java/com/springboot/rest/rest/UserResource.java @@ -80,11 +80,11 @@ public class UserResource { private final UserServicePort userServicePort; - private final MailServicePort mailServicePort; - public UserResource(UserServicePort userServicePort, MailServicePort mailServicePort) { + + public UserResource(UserServicePort userServicePort) { this.userServicePort = userServicePort; - this.mailServicePort = mailServicePort; + } /** diff --git a/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java b/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java index 30f6877..8fc878c 100644 --- a/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java +++ b/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java @@ -1,13 +1,14 @@ package com.springboot.rest.security; import java.util.List; + import java.util.Locale; import java.util.stream.Collectors; import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.*; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -17,7 +18,6 @@ import com.springboot.rest.domain.port.spi.UserPersistencPort; import com.springboot.rest.infrastructure.entity.User; - /** * Authenticate a user from the database. */ @@ -38,10 +38,9 @@ public UserDetails loadUserByUsername(final String login) { log.debug("Authenticating {}", login); if (new EmailValidator().isValid(login, null)) { - - userPersistencPort - .findOneWithAuthoritiesByEmailIgnoreCase(login).map(user -> createSpringSecurityUser(login, user)). - orElseThrow(() -> new UsernameNotFoundException("User with email " + login + " was not found in the database")); + + userPersistencPort + .findOneWithAuthoritiesByEmailIgnoreCase(login); } String lowercaseLogin = login.toLowerCase(Locale.ENGLISH); diff --git a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java index c76cd28..731b8f3 100644 --- a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java +++ b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java @@ -18,6 +18,8 @@ import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -193,9 +195,9 @@ void testRegisterInvalidLogin() throws Exception { assertThat(user).isEmpty(); } - @Test + @ParameterizedTest @Transactional - void testRegisterInvalidEmail() throws Exception { + void testRegisterInvalidEmail(String s2) throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); invalidUser.setLogin("bob"); invalidUser.setPassword("password"); @@ -215,9 +217,9 @@ void testRegisterInvalidEmail() throws Exception { assertThat(user).isEmpty(); } - @Test + @ParameterizedTest @Transactional - void testRegisterInvalidPassword() throws Exception { + void testRegisterInvalidPassword(String s) throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); invalidUser.setLogin("bob"); invalidUser.setPassword("123"); // password with only 3 digits @@ -237,7 +239,7 @@ void testRegisterInvalidPassword() throws Exception { assertThat(user).isEmpty(); } - @Test + @ParameterizedTest @Transactional void testRegisterNullPassword() throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); diff --git a/src/test/resources/templates/mail/testEmail.html b/src/test/resources/templates/mail/testEmail.html index a4ca16a..1fb37eb 100644 --- a/src/test/resources/templates/mail/testEmail.html +++ b/src/test/resources/templates/mail/testEmail.html @@ -1 +1,17 @@ - + + + + Neosoft + + +

Hello World! + + + + + + + + From a4dec66b823b2266f058b7d7c924ff3d73b36e1c Mon Sep 17 00:00:00 2001 From: ravipilgar Date: Thu, 28 Oct 2021 17:24:17 +0530 Subject: [PATCH 2/4] config files --- build.gradle | 6 +++--- src/main/resources/config/application-dev.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 3fafff8..7592564 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ assert System.properties["java.specification.version"] == "1.8" || "1.9" || "10" apply from: "gradle/docker.gradle" apply from: "gradle/sonar.gradle" //jhipster-needle-gradle-apply-from - JHipster will add additional gradle scripts to be applied here - +apply plugin: "eclipse" if (project.hasProperty("prod") || project.hasProperty("gae")) { apply from: "gradle/profile_prod.gradle" } else { @@ -136,7 +136,7 @@ liquibase { driver "com.mysql.cj.jdbc.Driver" url "jdbc:mysql://localhost:3306/basicSample" username "root" - password "" + password "Ravikiran@123" changeLogFile "src/main/resources/config/liquibase/master.xml" defaultSchemaName "basicSample" logLevel "debug" @@ -146,7 +146,7 @@ liquibase { driver "com.mysql.cj.jdbc.Driver" url "jdbc:mysql://localhost:3306/basicSample" username "root" - password "" + password "Ravikiran@123" changeLogFile project.ext.diffChangelogFile referenceUrl "hibernate:spring:com.springboot.rest.domain?dialect=org.hibernate.dialect.MySQL8Dialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy" defaultSchemaName "basicSample" diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index fd1b1f5..5e89e22 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -34,7 +34,7 @@ spring: type: com.zaxxer.hikari.HikariDataSource url: jdbc:mysql://localhost:3306/basicSample?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true username: root - password: admin + password: Ravikiran@123 hikari: poolName: Hikari auto-commit: false From f2d4e5c1187f2951b25c13a9f79409baa963e915 Mon Sep 17 00:00:00 2001 From: ravipilgar Date: Thu, 28 Oct 2021 17:58:12 +0530 Subject: [PATCH 3/4] Sonar lint --- .../com/springboot/rest/rest/AccountResourceIT.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java index 731b8f3..e7ba2e4 100644 --- a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java +++ b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java @@ -195,9 +195,9 @@ void testRegisterInvalidLogin() throws Exception { assertThat(user).isEmpty(); } - @ParameterizedTest + @Test @Transactional - void testRegisterInvalidEmail(String s2) throws Exception { + void testRegisterInvalidEmail() throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); invalidUser.setLogin("bob"); invalidUser.setPassword("password"); @@ -217,9 +217,9 @@ void testRegisterInvalidEmail(String s2) throws Exception { assertThat(user).isEmpty(); } - @ParameterizedTest + @Test @Transactional - void testRegisterInvalidPassword(String s) throws Exception { + void testRegisterInvalidPassword() throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); invalidUser.setLogin("bob"); invalidUser.setPassword("123"); // password with only 3 digits @@ -239,7 +239,7 @@ void testRegisterInvalidPassword(String s) throws Exception { assertThat(user).isEmpty(); } - @ParameterizedTest + @Test @Transactional void testRegisterNullPassword() throws Exception { ManagedUserVM invalidUser = new ManagedUserVM(); From 722cd546197e03771e9d10132edfdae67b9dd4e1 Mon Sep 17 00:00:00 2001 From: ravipilgar Date: Thu, 28 Oct 2021 18:30:39 +0530 Subject: [PATCH 4/4] updateed test --- .../java/com/springboot/rest/rest/AccountResourceIT.java | 8 +++++--- .../java/com/springboot/rest/service/MailServiceIT.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java index e7ba2e4..7cf8c4b 100644 --- a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java +++ b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java @@ -18,8 +18,6 @@ import org.apache.commons.lang3.RandomStringUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -36,6 +34,8 @@ import java.util.HashSet; import java.util.Optional; +import javax.validation.constraints.AssertTrue; + import static com.springboot.rest.rest.AccountResourceIT.TEST_USER_LOGIN; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -835,4 +835,6 @@ void testFinishPasswordResetWrongKey() throws Exception { ) .andExpect(status().isInternalServerError()); } -} + + +} \ No newline at end of file diff --git a/src/test/java/com/springboot/rest/service/MailServiceIT.java b/src/test/java/com/springboot/rest/service/MailServiceIT.java index b76587b..ac8ccba 100644 --- a/src/test/java/com/springboot/rest/service/MailServiceIT.java +++ b/src/test/java/com/springboot/rest/service/MailServiceIT.java @@ -249,4 +249,4 @@ private String getJavaLocale(String langKey) { } return javaLangKey; } -} +} \ No newline at end of file