formatting work
This commit is contained in:
@@ -25,8 +25,7 @@ public class UserController {
|
||||
myUserService.registerNewUserAccount(accountDto);
|
||||
model.addAttribute("message", "Registration successful");
|
||||
return "index";
|
||||
}
|
||||
catch(final Exception exc){
|
||||
} catch (final Exception exc) {
|
||||
model.addAttribute("message", "Registration failed");
|
||||
|
||||
return "index";
|
||||
|
||||
@@ -29,7 +29,7 @@ public class MyUserDAO {
|
||||
entityManager.persist(user);
|
||||
return user;
|
||||
}
|
||||
|
||||
|
||||
public void removeUserByUsername(String username) {
|
||||
final Query query = entityManager.createQuery("delete from MyUser where username=:username");
|
||||
query.setParameter("username", username);
|
||||
|
||||
@@ -33,8 +33,8 @@ public class MyUserService {
|
||||
final MyUser user = myUserDAO.findByUsername(username);
|
||||
return user;
|
||||
}
|
||||
|
||||
public void removeUserByUsername(String username){
|
||||
|
||||
public void removeUserByUsername(String username) {
|
||||
myUserDAO.removeUserByUsername(username);
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ public class MyUserDto {
|
||||
public void setUsername(final String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
+6
-8
@@ -59,8 +59,8 @@ public class CustomUserDetailsServiceIntegrationTest {
|
||||
myUserService.removeUserByUsername(USERNAME);
|
||||
}
|
||||
}
|
||||
|
||||
@Test (expected = BadCredentialsException.class)
|
||||
|
||||
@Test(expected = BadCredentialsException.class)
|
||||
public void givenIncorrectUser_whenAuthenticate_thenBadCredentialsException() {
|
||||
try {
|
||||
MyUserDto userDTO = new MyUserDto();
|
||||
@@ -69,15 +69,13 @@ public class CustomUserDetailsServiceIntegrationTest {
|
||||
|
||||
try {
|
||||
myUserService.registerNewUserAccount(userDTO);
|
||||
}
|
||||
catch (Exception exc) {
|
||||
} catch (Exception exc) {
|
||||
LOG.log(Level.SEVERE, "Error creating account");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(USERNAME2, PASSWORD);
|
||||
Authentication authentication = authenticationProvider.authenticate(auth);
|
||||
}
|
||||
finally {
|
||||
} finally {
|
||||
myUserService.removeUserByUsername(USERNAME);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user