Fixed #183

Author: thomaswoehlke

.gitignore

@@ -32,7 +32,6 @@ setenv.cmd
 /etc/pom.xml
 /src/main/java/org/woehlke/simpleworklist/project/x.txt
 /src/main/java/org/woehlke/simpleworklist/task/x.txt
-/src/main/java/org/woehlke/simpleworklist/taskstate/x.txt
 /src/main/java/org/woehlke/simpleworklist/context/x.txt
 /src/main/java/org/woehlke/simpleworklist/error/x.txt
 /src/main/java/org/woehlke/simpleworklist/search/x.txt

etc/serialversions/getserialversionid.cmd

@@ -17,7 +17,7 @@ echo %CLASSPATH%
 cd target\classes
 serialver org.woehlke.simpleworklist.language.Language > ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.TaskEnergy >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.taskstate.TaskState >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.task.TaskState >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.TaskTime >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> ..\..\etc\serialversions.txt

pom.xml

@@ -71,7 +71,7 @@
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
         <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
-        <maven-site-plugin.version>3.8.2</maven-site-plugin.version>
+        <maven-site-plugin.version>3.9.0</maven-site-plugin.version>
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.2.3</maven-war-plugin.version>
@@ -154,7 +154,6 @@
                 <scope>import</scope>
             </dependency>
 
-
             <dependency>
                 <groupId>org.webjars</groupId>
                 <artifactId>jquery</artifactId>
@@ -286,7 +285,7 @@
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>${maven-site-plugin.version}</version>
                 <type>maven-plugin</type>
             </dependency>
             <dependency>
@@ -347,8 +346,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -396,6 +395,22 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-data</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -444,6 +459,11 @@
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf-spring5</artifactId>
@@ -636,6 +656,15 @@
                                 <requireJavaVersion>
                                     <version>${java.version}</version>
                                 </requireJavaVersion>
+                                <requireOS>
+                                    <family>unix</family>
+                                </requireOS>
+                                <requireFilesExist>
+                                    <files>
+                                        <file>${project.basedir}/docker-compose.yml</file>
+                                        <file>${project.basedir}/etc/setenv.sh</file>
+                                    </files>
+                                </requireFilesExist>
                             </rules>
                         </configuration>
                     </execution>
@@ -702,9 +731,6 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <addResources>true</addResources>
-                    <profiles>
-                        <profile>default</profile>
-                    </profiles>
                 </configuration>
                 <executions>
                     <!--
@@ -884,29 +910,15 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>spring.profiles.active</name>
-                    <value>default</value>
-                </property>
-            </activation>
-    </profile>
-
-    </profiles>
-
     <reporting>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-invoker-plugin</artifactId>
@@ -921,9 +933,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <profiles>
-                        <profile>default</profile>
-                    </profiles>
+                    <addResources>true</addResources>
                 </configuration>
             </plugin>
             <plugin>
@@ -1039,8 +1049,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
             </plugin>
-
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
@@ -1049,8 +1057,6 @@
                     <skipSurefireReport>${skipTests}</skipSurefireReport>
                 </configuration>
             </plugin>
-
-
         </plugins>
     </reporting>
 

run.sh

@@ -54,7 +54,8 @@ function run() {
 }
 
 function main() {
-    run
+    #run
+    build
 }
 
 main

src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java

@@ -1,7 +1,6 @@
 package org.woehlke.simpleworklist.config.di;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;

src/main/java/org/woehlke/simpleworklist/task/TaskState.java

@@ -1,6 +1,5 @@
 package org.woehlke.simpleworklist.task;
 
-import javax.persistence.Enumerated;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
@@ -10,34 +9,16 @@
  */
 public enum TaskState implements Serializable {
 
-    @Enumerated
-    INBOX("fas fa-inbox"),
 
-    @Enumerated
+    INBOX("fas fa-inbox"),
     TODAY("fas fa-clock"),
-
-    @Enumerated
     NEXT("fas fa-cogs"),
-
-    @Enumerated
     WAITING("fas fa-hourglass-half"),
-
-    @Enumerated
     SCHEDULED("fas fa-calendar-alt"),
-
-    @Enumerated
     SOMEDAY("fas fa-road"),
-
-    @Enumerated
     FOCUS("fas fa-star"),
-
-    @Enumerated
     COMPLETED("fas fa-check-square"),
-
-    @Enumerated
     TRASH("fas fa-trash-alt"),
-
-    @Enumerated
     DELETED("fas fa-trash-alt");
 
     TaskState(final String icon) {

src/main/java/org/woehlke/simpleworklist/task/TaskStateController.java

@@ -12,8 +12,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.context.Context;
-import org.woehlke.simpleworklist.task.TaskControllerService;
-import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
 import java.util.Locale;

src/test/java/org/woehlke/simpleworklist/task/TaskMoveControllerTest.java

@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.task;
+
+public class TaskMoveControllerTest {
+}

src/test/java/org/woehlke/simpleworklist/task/TaskMoveServiceTest.java

@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.task;
+
+public class TaskMoveServiceTest {
+}

src/test/java/org/woehlke/simpleworklist/task/TaskStateControllerTest.java

@@ -0,0 +1,4 @@
+package org.woehlke.simpleworklist.task;
+
+public class TaskStateControllerTest {
+}