migrate spring-boot

thomaswoehlke · thomaswoehlke · commit cbf0b47ae79b · 2020-04-02T20:25:22.000+02:00
diff --git a/src/test/java/org/woehlke/simpleworklist/AbstractTest.java b/src/test/java/org/woehlke/simpleworklist/AbstractTest.java
@@ -14,9 +14,9 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 import org.woehlke.simpleworklist.config.ApplicationProperties;
+import org.woehlke.simpleworklist.helper.TestHelperService;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.user.account.UserAccountService;
-import org.woehlke.simpleworklist.model.services.*;
 import org.woehlke.simpleworklist.user.account.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.account.UserAccountSecurityService;
 import org.woehlke.simpleworklist.user.login.UserAccountLoginSuccessService;
diff --git a/src/test/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceTest.java b/src/test/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.breadcrumb;
+
+public class BreadcrumbServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/context/ContextControllerTest.java b/src/test/java/org/woehlke/simpleworklist/context/ContextControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.context;
+
+public class ContextControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/context/ContextServiceTest.java b/src/test/java/org/woehlke/simpleworklist/context/ContextServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.context;
+
+public class ContextServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/error/MyErrorControllerTest.java b/src/test/java/org/woehlke/simpleworklist/error/MyErrorControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.error;
+
+public class MyErrorControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java b/src/test/java/org/woehlke/simpleworklist/helper/TestHelperService.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.model.services;
+package org.woehlke.simpleworklist.helper;
 
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
 import org.woehlke.simpleworklist.user.register.UserRegistration;
diff --git a/src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java b/src/test/java/org/woehlke/simpleworklist/helper/TestHelperServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.model.services.impl;
+package org.woehlke.simpleworklist.helper;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -8,7 +8,7 @@
 import org.woehlke.simpleworklist.user.register.UserRegistrationRepository;
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
 import org.woehlke.simpleworklist.user.register.UserRegistration;
-import org.woehlke.simpleworklist.model.services.TestHelperService;
+import org.woehlke.simpleworklist.helper.TestHelperService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.task.TaskRepository;
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsNotNullObjectOfActionItem.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsNotNullObjectOfActionItem.java
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsNotNullObjectOfCategory.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsNotNullObjectOfCategory.java
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsNullObjectOfActionItem.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsNullObjectOfActionItem.java
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsNullObjectOfCategory.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsNullObjectOfCategory.java
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsSameObjectOfActionItem.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsSameObjectOfActionItem.java
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsSameObjectOfCategory.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsSameObjectOfCategory.java
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/Matchers.java b/src/test/java/org/woehlke/simpleworklist/oodm/Matchers.java
diff --git a/src/test/java/org/woehlke/simpleworklist/project/ProjectControllerTest.java b/src/test/java/org/woehlke/simpleworklist/project/ProjectControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.project;
+
+public class ProjectControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/project/ProjectServiceTest.java b/src/test/java/org/woehlke/simpleworklist/project/ProjectServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.project;
+
+public class ProjectServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/search/SearchControllerTest.java b/src/test/java/org/woehlke/simpleworklist/search/SearchControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.search;
+
+public class SearchControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/search/SearchServiceTest.java b/src/test/java/org/woehlke/simpleworklist/search/SearchServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.search;
+
+public class SearchServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskControllerTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.task;
+
+public class TaskControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/task/TaskServiceTest.java b/src/test/java/org/woehlke/simpleworklist/task/TaskServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.task;
+
+public class TaskServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/taskstate/TaskMoveControllerTest.java b/src/test/java/org/woehlke/simpleworklist/taskstate/TaskMoveControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.taskstate;
+
+public class TaskMoveControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceTest.java b/src/test/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.taskstate;
+
+public class TaskMoveServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/taskstate/TaskStateControllerTest.java b/src/test/java/org/woehlke/simpleworklist/taskstate/TaskStateControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.taskstate;
+
+public class TaskStateControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/taskstate/TaskStateServiceTest.java b/src/test/java/org/woehlke/simpleworklist/taskstate/TaskStateServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.taskstate;
+
+public class TaskStateServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java b/src/test/java/org/woehlke/simpleworklist/testdata/TestDataControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.testdata;
+
+public class TestDataControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java b/src/test/java/org/woehlke/simpleworklist/testdata/TestDataServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.testdata;
+
+public class TestDataServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java b/src/test/java/org/woehlke/simpleworklist/user/UserDetailsBeanTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.model;
+package org.woehlke.simpleworklist.user;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountAccessServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.account;
+
+public class UserAccountAccessServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountFormTest.java b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountFormTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.model;
+package org.woehlke.simpleworklist.user.account;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountSecurityServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.account;
+
+public class UserAccountSecurityServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImplTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.model.services.impl;
+package org.woehlke.simpleworklist.user.account;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/account/UserAccountServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.account;
+
+public class UserAccountServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/login/UserLoginControllerTest.java
@@ -1,24 +1,24 @@
-package org.woehlke.simpleworklist.control;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
-
-import org.junit.Test;
-import org.woehlke.simpleworklist.AbstractTest;
-
-public class UserLoginControllerTest extends AbstractTest {
-
-    @Test
-    public void testLoginFormular() throws Exception {
-        this.mockMvc.perform(
-                get("/login")).andDo(print())
-                .andExpect(view().name(containsString("user/loginForm")));
-    }
-
-    @Test
-    public void testFinish() {
-        deleteAll();
-    }
-}
+package org.woehlke.simpleworklist.user.login;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
+import org.junit.Test;
+import org.woehlke.simpleworklist.AbstractTest;
+
+public class UserLoginControllerTest extends AbstractTest {
+
+    @Test
+    public void testLoginFormular() throws Exception {
+        this.mockMvc.perform(
+                get("/login")).andDo(print())
+                .andExpect(view().name(containsString("user/loginForm")));
+    }
+
+    @Test
+    public void testFinish() {
+        deleteAll();
+    }
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.messages;
+
+public class User2UserMessageControllerTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.messages;
+
+public class User2UserMessageServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationControllerTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.control;
+package org.woehlke.simpleworklist.user.register;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceImplTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.model.services.impl;
+package org.woehlke.simpleworklist.user.register;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/register/UserRegistrationServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.user.register;
+
+public class UserRegistrationServiceTest {
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryControllerTest.java
diff --git a/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryServiceTest.java
diff --git a/src/test/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceControllerTest.java b/src/test/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceControllerTest.java
diff --git a/src/test/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceTest.java b/src/test/java/org/woehlke/simpleworklist/user/token/TokenGeneratorServiceTest.java

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package org.woehlke.simpleworklist.breadcrumb;
++
 +public class BreadcrumbServiceTest {
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.woehlke.simpleworklist.model.services;`
	`1`	`+package org.woehlke.simpleworklist.helper;`
`2`	`2`
`3`	`3`	`import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;`
`4`	`4`	`import org.woehlke.simpleworklist.user.register.UserRegistration;`