work in progress

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java

@@ -4,9 +4,9 @@
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
-import org.woehlke.simpleworklist.application.config.di.WebMvcConfig;
-import org.woehlke.simpleworklist.application.config.di.WebSecurityConfig;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
+import org.woehlke.simpleworklist.application.config.WebMvcConfig;
+import org.woehlke.simpleworklist.application.config.WebSecurityConfig;
 
 
 @ImportAutoConfiguration({

src/main/java/org/woehlke/simpleworklist/application/config/ApplicationProperties.java renamed to src/main/java/org/woehlke/simpleworklist/application/ApplicationProperties.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config;
+package org.woehlke.simpleworklist.application;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java

@@ -5,7 +5,7 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.woehlke.simpleworklist.application.breadcrumb.BreadcrumbService;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.TaskService;

src/main/java/org/woehlke/simpleworklist/application/config/di/WebMvcConfig.java renamed to src/main/java/org/woehlke/simpleworklist/application/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config.di;
+package org.woehlke.simpleworklist.application.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -18,7 +18,7 @@
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.dialect.springdata.SpringDataDialect;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 
 import java.util.Locale;
 import java.util.Properties;

src/main/java/org/woehlke/simpleworklist/application/config/di/WebSecurityConfig.java renamed to src/main/java/org/woehlke/simpleworklist/application/config/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config.di;
+package org.woehlke.simpleworklist.application.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -19,7 +19,8 @@
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
+import org.woehlke.simpleworklist.application.config.WebMvcConfig;
 import org.woehlke.simpleworklist.user.login.LoginSuccessHandler;
 import org.woehlke.simpleworklist.user.account.UserAccountSecurityService;
 

src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextRefreshedListener.java renamed to src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config.listener;
+package org.woehlke.simpleworklist.application.listener;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/woehlke/simpleworklist/application/config/listener/ContextStartedListener.java renamed to src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.config.listener;
+package org.woehlke.simpleworklist.application.listener;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImpl.java

@@ -13,7 +13,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
 
 @Slf4j

src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceImpl.java

@@ -9,7 +9,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.user.token.TokenGeneratorService;
 
 import java.util.Date;

src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java

@@ -7,6 +7,7 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
+import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.helper.TestHelperService;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.user.account.UserAccountService;