registration project cleanup

Author: eugenp

…g/event/OnRegistrationCompleteEvent.java …tration/OnRegistrationCompleteEvent.javaspring-security-login-and-registration/src/main/java/org/baeldung/event/OnRegistrationCompleteEvent.java renamed to spring-security-login-and-registration/src/main/java/org/baeldung/registration/OnRegistrationCompleteEvent.java spring-security-login-and-registration/src/main/java/org/baeldung/event/OnRegistrationCompleteEvent.java renamed to spring-security-login-and-registration/src/main/java/org/baeldung/registration/OnRegistrationCompleteEvent.java

@@ -1,4 +1,4 @@
-package org.baeldung.event;
+package org.baeldung.registration;
 
 import java.util.Locale;
 

…event/listener/RegistrationListener.java …ation/listener/RegistrationListener.javaspring-security-login-and-registration/src/main/java/org/baeldung/event/listener/RegistrationListener.java renamed to spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java spring-security-login-and-registration/src/main/java/org/baeldung/event/listener/RegistrationListener.java renamed to spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java

@@ -1,10 +1,10 @@
-package org.baeldung.event.listener;
+package org.baeldung.registration.listener;
 
 import java.util.UUID;
 
-import org.baeldung.event.OnRegistrationCompleteEvent;
 import org.baeldung.persistence.model.User;
 import org.baeldung.persistence.service.IUserService;
+import org.baeldung.registration.OnRegistrationCompleteEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.MessageSource;

spring-security-login-and-registration/src/main/java/org/baeldung/spring/AppConfig.java

@@ -6,20 +6,21 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 
 @Configuration
-@ComponentScan(basePackages = { "org.baeldung.event.service", "org.baeldung.event", "org.baeldung.persistence.service", "org.baeldung.persistence.dao" })
-@Import({ MvcConfig.class, PersistenceJPAConfig.class, SecSecurityConfig.class })
-@PropertySource("classpath:application.properties")
+@ComponentScan(basePackages = { "org.baeldung.registration" })
+@PropertySource("classpath:email.properties")
 public class AppConfig {
+
     @Autowired
     private Environment env;
 
+    // beans
+
     @Bean
     public static PropertySourcesPlaceholderConfigurer propertyPlaceHolderConfigurer() {
         return new PropertySourcesPlaceholderConfigurer();

spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java

@@ -23,15 +23,15 @@
 import org.springframework.web.servlet.view.JstlView;
 
 @Configuration
-@ComponentScan(basePackages = { "org.baeldung.web.controller", "org.baeldung.persistence.service", "org.baeldung.persistence.dao" })
+@ComponentScan(basePackages = { "org.baeldung.web" })
 @EnableWebMvc
 public class MvcConfig extends WebMvcConfigurerAdapter {
 
     public MvcConfig() {
         super();
     }
 
-    // API
+    //
 
     @Override
     public void addViewControllers(final ViewControllerRegistry registry) {
@@ -51,15 +51,6 @@ public void addViewControllers(final ViewControllerRegistry registry) {
         registry.addViewController("/successRegister.html");
     }
 
-    @Bean
-    public ViewResolver viewResolver() {
-        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
-        bean.setViewClass(JstlView.class);
-        bean.setPrefix("/WEB-INF/view/");
-        bean.setSuffix(".jsp");
-        return bean;
-    }
-
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/resources/**").addResourceLocations("/", "/resources/");
@@ -72,6 +63,17 @@ public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(localeChangeInterceptor);
     }
 
+    // beans
+
+    @Bean
+    public ViewResolver viewResolver() {
+        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
+        bean.setViewClass(JstlView.class);
+        bean.setPrefix("/WEB-INF/view/");
+        bean.setSuffix(".jsp");
+        return bean;
+    }
+
     @Bean
     public LocaleResolver localeResolver() {
         CookieLocaleResolver cookieLocaleResolver = new CookieLocaleResolver();
@@ -91,21 +93,17 @@ public MessageSource messageSource() {
 
     @Bean
     public EmailValidator usernameValidator() {
-        EmailValidator userNameValidator = new EmailValidator();
-        return userNameValidator;
+        return new EmailValidator();
     }
 
     @Bean
     public PasswordMatchesValidator passwordMatchesValidator() {
-        PasswordMatchesValidator passwordMatchesValidator = new PasswordMatchesValidator();
-        return passwordMatchesValidator;
+        return new PasswordMatchesValidator();
     }
 
-    // DIC 7
     @Bean
     public HashGenerator hashGenerator() {
-        HashGenerator hashGenerator = new HashGenerator();
-        return hashGenerator;
+        return new HashGenerator();
     }
 
 }

spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java

@@ -18,8 +18,8 @@
 
 @Configuration
 @EnableTransactionManagement
-@PropertySource({ "classpath:application.properties" })
-@ComponentScan({ "org.baeldung.persistence.model" })
+@PropertySource({ "classpath:persistence.properties" })
+@ComponentScan({ "org.baeldung.persistence" })
 @EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
 public class PersistenceJPAConfig {
 

spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java

@@ -9,7 +9,7 @@
 import org.baeldung.persistence.model.VerificationToken;
 import org.baeldung.persistence.service.UserDto;
 import org.baeldung.persistence.service.IUserService;
-import org.baeldung.event.OnRegistrationCompleteEvent;
+import org.baeldung.registration.OnRegistrationCompleteEvent;
 import org.baeldung.validation.service.EmailExistsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

…rc/main/resources/application.properties …rc/main/resources/persistence.propertiesspring-security-login-and-registration/src/main/resources/application.properties renamed to spring-security-login-and-registration/src/main/resources/persistence.properties spring-security-login-and-registration/src/main/resources/application.properties renamed to spring-security-login-and-registration/src/main/resources/persistence.properties

@@ -8,10 +8,3 @@ init-db=false
 hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create-drop
-################### JavaMail Configuration ##########################
-smtp.host=smtp.gmail.com
-smtp.port=465
-smtp.protocol=smtps
-smtp.username=[email protected]
-smtp.password=
-support.email=[email protected]

spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml

@@ -5,6 +5,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+	
 	<http use-expressions="true">
 		<intercept-url pattern="/login*" access="permitAll" />
 		<intercept-url pattern="/logout*" access="permitAll" />
@@ -19,7 +20,7 @@
 		<intercept-url pattern="/emailError*" access="permitAll" />
 		<intercept-url pattern="/resources/**" access="permitAll" />
 		<intercept-url pattern="/invalidSession*" access="isAnonymous()" />
-	<intercept-url pattern="/**" access="isAuthenticated()" />
+		<intercept-url pattern="/**" access="isAuthenticated()" />
 		<form-login login-page='/login.html'
 			authentication-failure-url="/login.html?error=true"
 			authentication-success-handler-ref="myAuthenticationSuccessHandler"
@@ -29,7 +30,9 @@
 		<logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true"
 			logout-url="/j_spring_security_logout" delete-cookies="JSESSIONID" />
 	</http>
+
 	<authentication-manager>
-		<authentication-provider ref="authProvider"/>
+		<authentication-provider ref="authProvider" />
 	</authentication-manager>
+
 </beans:beans>