iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup work (mostly formating)

This commit is contained in:
eugenp 2014-06-04 12:14:34 +02:00
parent f0b106ab60
commit bb662b4252
7 changed files with 73 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/controller/MyController.java
View File

@ -13,23 +13,21 @@ import org.springframework.web.servlet.ModelAndView;
@Controller
public class MyController {
/**
* Build the view model for the login page (add authentication error
* information in the event of an unsuccessful login attempt).
*/
@RequestMapping(value = "/login", method = RequestMethod.GET)
public ModelAndView login(
@RequestParam(value = "error", required = false) String error) {
/**
* Build the view model for the login page (add authentication error
* information in the event of an unsuccessful login attempt).
*/
@RequestMapping(value = "/login", method = RequestMethod.GET)
public ModelAndView login(@RequestParam(value = "error", required = false) String error) {
ModelAndView model = new ModelAndView();
if (error != null) {
model.addObject("message",
"Username or password not recognised - please try again.");
}
ModelAndView model = new ModelAndView();
if (error != null) {
model.addObject("message", "Username or password not recognised - please try again.");
}
model.setViewName("login");
return model;
model.setViewName("login");
return model;
}
}
}

4
spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java
View File

@ -17,9 +17,9 @@ import org.springframework.security.web.WebAttributes;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
import org.springframework.stereotype.Component;
@Component(value="mySimpleUrlAuthenticationSuccessHandler")
@Component(value = "mySimpleUrlAuthenticationSuccessHandler")
public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
private final Log logger = LogFactory.getLog(this.getClass());
private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();

5
spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityRole.java
View File

@ -6,7 +6,6 @@ package org.baeldung.security;
*/
public enum SecurityRole {
ROLE_USER,
ROLE_ADMIN;
ROLE_USER, ROLE_ADMIN;
}

2
spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/security/SecurityWebApplicationInitializer.java
View File

@ -6,6 +6,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
* Registers the springSecurityFilterChain Filter for every URL in the application.
*
*/
public class SecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer{
public class SecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
}

98
spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java
View File

@ -23,65 +23,61 @@ import org.springframework.stereotype.Service;
@Service
public class MyUserDetailsService implements UserDetailsService {
private final Log logger = LogFactory.getLog(this.getClass());
private final Log logger = LogFactory.getLog(this.getClass());
private Map<String, User> availableUsers = new HashMap<String, User>();
private Map<String, User> availableUsers = new HashMap<String, User>();
public MyUserDetailsService() {
public MyUserDetailsService() {
populateDemoUsers();
}
populateDemoUsers();
@Override
public UserDetails loadUserByUsername(String username)
throws UsernameNotFoundException {
}
logger.info("Load user by username " + username);
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
UserDetails user = availableUsers.get(username);
if (user == null) {
throw new UsernameNotFoundException("Username not found");
} else {
return availableUsers.get(username);
}
logger.info("Load user by username " + username);
}
UserDetails user = availableUsers.get(username);
if (user == null) {
throw new UsernameNotFoundException("Username not found");
} else {
return availableUsers.get(username);
}
/**
* Create demo users (note: obviously in a real system these would be persisted
* in database or retrieved from another system).
*/
private void populateDemoUsers(){
logger.info("Populate demo users");
availableUsers.put("user",
createUser("user", "password", Arrays.asList(SecurityRole.ROLE_USER)));
availableUsers.put("admin",
createUser("admin", "password", Arrays.asList(SecurityRole.ROLE_ADMIN)));
}
/**
* Create a demo User.
*
* @param username
* Username
* @param password
* Password
* @param roles
* Role names user is assigned to
* @return User
*/
private User createUser(String username, String password, List<SecurityRole> roles) {
}
logger.info("Create user " + username);
/**
* Create demo users (note: obviously in a real system these would be persisted
* in database or retrieved from another system).
*/
private void populateDemoUsers() {
List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
for (SecurityRole role : roles) {
authorities.add(new SimpleGrantedAuthority(role.toString()));
}
return new User(username, password, true, true, true, true, authorities);
}
logger.info("Populate demo users");
availableUsers.put("user", createUser("user", "password", Arrays.asList(SecurityRole.ROLE_USER)));
availableUsers.put("admin", createUser("admin", "password", Arrays.asList(SecurityRole.ROLE_ADMIN)));
}
/**
* Create a demo User.
*
* @param username
* Username
* @param password
* Password
* @param roles
* Role names user is assigned to
* @return User
*/
private User createUser(String username, String password, List<SecurityRole> roles) {
logger.info("Create user " + username);
List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
for (SecurityRole role : roles) {
authorities.add(new SimpleGrantedAuthority(role.toString()));
}
return new User(username, password, true, true, true, true, authorities);
}
}

4
spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java
View File

@ -20,10 +20,10 @@ import com.google.common.base.Preconditions;
@PropertySource({ "classpath:persistence-h2.properties" })
public class DatabaseConfig {
@Autowired
@Autowired
private Environment env;
@Bean
@Bean
public DataSource dataSource() {
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));

14
spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java
View File

@ -15,13 +15,11 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand
@ImportResource({ "classpath:webSecurityConfig.xml" })
public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
private AuthenticationSuccessHandler mySimpleUrlAuthenticationSuccessHandler;
@Autowired
private AuthenticationSuccessHandler mySimpleUrlAuthenticationSuccessHandler;
public SecurityConfig() {
super();
}
public SecurityConfig() {
super();
}
}