fixed #271

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/ScheduledTasks.java

@@ -7,7 +7,7 @@
 import org.springframework.stereotype.Component;
 import org.woehlke.twitterwall.conf.properties.SchedulerProperties;
 import org.woehlke.twitterwall.oodm.entities.Task;
-import org.woehlke.twitterwall.scheduled.mq.endpoint.AsyncStartTask;
+import org.woehlke.twitterwall.scheduled.mq.endpoint.tasks.AsyncStartTask;
 
 /**
  * Created by tw on 10.06.17.

src/main/java/org/woehlke/twitterwall/frontend/controller/ImprintController.java

@@ -10,7 +10,7 @@
 import org.woehlke.twitterwall.frontend.controller.common.Symbols;
 import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
 import org.woehlke.twitterwall.oodm.entities.User;
-import org.woehlke.twitterwall.scheduled.mq.endpoint.StartTask;
+import org.woehlke.twitterwall.scheduled.mq.endpoint.tasks.StartTask;
 
 
 /**

src/main/java/org/woehlke/twitterwall/frontend/controller/TaskController.java

@@ -22,7 +22,7 @@
 import org.woehlke.twitterwall.oodm.service.TaskHistoryService;
 import org.woehlke.twitterwall.oodm.service.TaskService;
 import org.woehlke.twitterwall.oodm.service.UserService;
-import org.woehlke.twitterwall.scheduled.mq.endpoint.AsyncStartTask;
+import org.woehlke.twitterwall.scheduled.mq.endpoint.tasks.AsyncStartTask;
 
 import javax.persistence.EntityNotFoundException;
 import java.util.ArrayList;

src/main/java/org/woehlke/twitterwall/oodm/entities/Task.java

@@ -2,10 +2,10 @@
 
 import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectMinimal;
-import org.woehlke.twitterwall.oodm.entities.parts.TaskStatus;
-import org.woehlke.twitterwall.oodm.entities.parts.TaskType;
+import org.woehlke.twitterwall.oodm.entities.tasks.TaskSendType;
+import org.woehlke.twitterwall.oodm.entities.tasks.TaskStatus;
+import org.woehlke.twitterwall.oodm.entities.tasks.TaskType;
 import org.woehlke.twitterwall.oodm.entities.listener.TaskListener;
-import org.woehlke.twitterwall.scheduled.mq.msg.SendType;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
@@ -60,7 +60,7 @@ public class Task implements DomainObjectMinimal<Task> {
     @NotNull
     @Column(name="send_type",nullable = false)
     @Enumerated(EnumType.STRING)
-    private SendType sendType = SendType.NULL;
+    private TaskSendType taskSendType = TaskSendType.NULL;
 
     @NotNull
     @Temporal(TemporalType.TIMESTAMP)
@@ -79,11 +79,11 @@ public class Task implements DomainObjectMinimal<Task> {
     private Task() {
     }
 
-    public Task(String description, TaskType taskType, TaskStatus taskStatus, SendType sendType, Date timeStarted, Date timeLastUpdate, Date timeFinished) {
+    public Task(String description, TaskType taskType, TaskStatus taskStatus, TaskSendType taskSendType, Date timeStarted, Date timeLastUpdate, Date timeFinished) {
         this.description = description;
         this.taskType = taskType;
         this.taskStatus = taskStatus;
-        this.sendType = sendType;
+        this.taskSendType = taskSendType;
         this.timeStarted = timeStarted;
         this.timeLastUpdate = timeLastUpdate;
         this.timeFinished = timeFinished;
@@ -155,12 +155,12 @@ public void setTaskStatus(TaskStatus taskStatus) {
         this.taskStatus = taskStatus;
     }
 
-    public SendType getSendType() {
-        return sendType;
+    public TaskSendType getTaskSendType() {
+        return taskSendType;
     }
 
-    public void setSendType(SendType sendType) {
-        this.sendType = sendType;
+    public void setTaskSendType(TaskSendType taskSendType) {
+        this.taskSendType = taskSendType;
     }
 
     public String getDescription() {
@@ -191,7 +191,7 @@ public String toString() {
                 ", description='" + description + '\'' +
                 ", taskType=" + taskType +
                 ", taskStatus=" + taskStatus +
-                ", sendType=" + sendType +
+                ", taskSendType=" + taskSendType +
                 ", timeStarted=" + timeStarted +
                 ", timeLastUpdate=" + timeLastUpdate +
                 ", timeFinished=" + timeFinished +

src/main/java/org/woehlke/twitterwall/oodm/entities/TaskHistory.java

@@ -3,7 +3,7 @@
 import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectMinimal;
 import org.woehlke.twitterwall.oodm.entities.parts.CountedEntities;
-import org.woehlke.twitterwall.oodm.entities.parts.TaskStatus;
+import org.woehlke.twitterwall.oodm.entities.tasks.TaskStatus;
 import org.woehlke.twitterwall.oodm.entities.listener.TaskHistoryListener;
 
 import javax.persistence.*;

src/main/java/org/woehlke/twitterwall/oodm/entities/Tweet.java

@@ -1,12 +1,10 @@
 package org.woehlke.twitterwall.oodm.entities;
 
 import org.hibernate.validator.constraints.NotEmpty;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Query;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithEntities;
 import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
-import org.woehlke.twitterwall.oodm.entities.parts.Entities;
+import org.woehlke.twitterwall.oodm.entities.entities.Entities;
 import org.woehlke.twitterwall.oodm.entities.listener.TweetListener;
 
 import javax.persistence.*;

src/main/java/org/woehlke/twitterwall/oodm/entities/User.java

@@ -6,7 +6,7 @@
 import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithScreenName;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
-import org.woehlke.twitterwall.oodm.entities.parts.Entities;
+import org.woehlke.twitterwall.oodm.entities.entities.Entities;
 import org.woehlke.twitterwall.oodm.entities.listener.UserListener;
 
 import javax.persistence.*;

src/main/java/org/woehlke/twitterwall/oodm/entities/common/DomainObjectWithApiCaching.java

@@ -1,6 +1,6 @@
 package org.woehlke.twitterwall.oodm.entities.common;
 
-import org.woehlke.twitterwall.oodm.entities.parts.TaskType;
+import org.woehlke.twitterwall.oodm.entities.tasks.TaskType;
 
 public interface DomainObjectWithApiCaching {
 

src/main/java/org/woehlke/twitterwall/oodm/entities/common/DomainObjectWithEntities.java

@@ -1,6 +1,6 @@
 package org.woehlke.twitterwall.oodm.entities.common;
 
-import org.woehlke.twitterwall.oodm.entities.parts.Entities;
+import org.woehlke.twitterwall.oodm.entities.entities.Entities;
 
 public interface DomainObjectWithEntities<T extends DomainObjectWithEntities> extends DomainObjectWithIdTwitter<T>,DomainObjectWithTask<T>  {
 

src/main/java/org/woehlke/twitterwall/oodm/entities/common/DomainObjectWithTask.java

@@ -1,7 +1,7 @@
 package org.woehlke.twitterwall.oodm.entities.common;
 
 import org.woehlke.twitterwall.oodm.entities.Task;
-import org.woehlke.twitterwall.oodm.entities.parts.TaskInfo;
+import org.woehlke.twitterwall.oodm.entities.tasks.TaskInfo;
 
 /**
  * Created by tw on 14.07.17.