fixed #240

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/frontend/controller/common/HashTagsOverviewHelper.java

@@ -4,9 +4,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.servlet.ModelAndView;
 import org.woehlke.twitterwall.conf.properties.TwitterProperties;
@@ -17,10 +14,7 @@
 /**
  * Created by tw on 18.07.17.
  */
-
 @Component
-//@Service
-//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
 public class ControllerHelperImpl implements ControllerHelper {
 
     private Page setupPage(Page page, String title, String subtitle, String symbol)  {

src/main/java/org/woehlke/twitterwall/frontend/controller/common/UrlPaths.java

@@ -79,7 +79,6 @@ public class TaskHistory implements DomainObjectMinimal<TaskHistory> {
         @AttributeOverride(name = "countMention", column = @Column(name = "count_mention",nullable=false)),
         @AttributeOverride(name = "countTickerSymbol", column = @Column(name = "count_tickersymbol",nullable=false)),
         @AttributeOverride(name = "countUrl", column = @Column(name = "count_url",nullable=false)),
-        @AttributeOverride(name = "countUrlCache", column = @Column(name = "count_urlcache",nullable=false)),
         @AttributeOverride(name = "countTask", column = @Column(name = "count_task",nullable=false)),
         @AttributeOverride(name = "countTaskHistory", column = @Column(name = "count_task_history",nullable=false)),
         @AttributeOverride(name = "tweet2hashtag", column = @Column(name = "count_tweet2hashtag",nullable=false)),
@@ -95,19 +94,9 @@ public class TaskHistory implements DomainObjectMinimal<TaskHistory> {
     })
     private CountedEntities countedEntities = new CountedEntities();
 
-    private TaskHistory() {
+    protected TaskHistory() {
     }
 
-    /*
-    public TaskHistory(String description, TaskStatus taskStatusBefore, TaskStatus taskStatusNow, CountedEntities countedEntities) {
-        this.countedEntities = countedEntities;
-        this.description = description;
-        this.taskStatusBefore = taskStatusBefore;
-        this.taskStatusNow = taskStatusNow;
-        this.timeEvent = new Date();
-    }
-    */
-
     public TaskHistory(String description, TaskStatus taskStatusBefore, TaskStatus taskStatusNow, Date timeEvent, Task task, CountedEntities countedEntities) {
         this.countedEntities = countedEntities;
         this.description = description;

src/main/java/org/woehlke/twitterwall/frontend/controller/common/impl/ControllerHelperImpl.java

@@ -8,6 +8,7 @@
 import org.woehlke.twitterwall.oodm.entities.listener.TweetListener;
 
 import javax.persistence.*;
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
@@ -142,6 +143,7 @@ public class Tweet extends AbstractDomainObject<Tweet> implements DomainObjectWi
     @Column(name="favorite_count")
     private Integer favoriteCount;
 
+    @Valid
     @Embedded
     @AssociationOverrides({
         @AssociationOverride(

src/main/java/org/woehlke/twitterwall/frontend/controller/common/impl/HashTagsOverviewHelperImpl.java

@@ -40,24 +40,24 @@
             query = "select t from User as t where t.taskInfo.fetchTweetsFromSearch=true"
         ),
         @NamedQuery(
-                name = "User.findFollower",
-                query = "select t from User as t where t.taskInfo.fetchFollower=true"
+            name = "User.findFollower",
+            query = "select t from User as t where t.taskInfo.fetchFollower=true"
         ),
         @NamedQuery(
-                name = "User.findNotYetFollower",
-                query = "select t from User as t where t.taskInfo.fetchFollower=false"
+            name = "User.findNotYetFollower",
+            query = "select t from User as t where t.taskInfo.fetchFollower=false"
         ),
         @NamedQuery(
-                name = "User.findFriends",
-                query = "select t from User as t where t.taskInfo.fetchFriends=true"
+            name = "User.findFriends",
+            query = "select t from User as t where t.taskInfo.fetchFriends=true"
         ),
         @NamedQuery(
             name = "User.findNotYetFriends",
             query = "select t from User as t where t.taskInfo.fetchFriends=false"
         ),
         @NamedQuery(
-                name = "User.findOnList",
-                query = "select t from User as t where t.taskInfo.fetchUsersFromList=true"
+            name = "User.findOnList",
+            query = "select t from User as t where t.taskInfo.fetchUsersFromList=true"
         ),
         @NamedQuery(
             name = "User.findNotYetOnList",

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

@@ -1,5 +1,7 @@
 package org.woehlke.twitterwall.oodm.entities.parts;
 
+import org.springframework.validation.annotation.Validated;
+
 import javax.persistence.Embeddable;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
@@ -8,6 +10,7 @@
 /**
  * Created by tw on 03.07.17.
  */
+@Validated
 @Embeddable
 public class CountedEntities implements Serializable {
 

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

@@ -1,5 +1,6 @@
 package org.woehlke.twitterwall.oodm.entities.parts;
 
+import org.springframework.validation.annotation.Validated;
 import org.woehlke.twitterwall.oodm.entities.*;
 
 import javax.persistence.*;
@@ -16,6 +17,7 @@
 /**
  * Created by tw on 11.07.17.
  */
+@Validated
 @Embeddable
 public class Entities extends EntitiesFilter implements Serializable {
 

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

@@ -114,7 +114,7 @@ public void setTaskInfoFromTask(Task task) {
     protected TaskInfo() {
     }
 
-    public TaskInfo(Boolean fetchTweetsFromSearch, Boolean updateTweets, Boolean updatedUsers, Boolean updateUsersFromMentions, Boolean fetchUsersFromList, Boolean controllerAddUserForScreenName, Boolean controllerCreateTestdataTweets, Boolean controllerCreateTestdataUsers,Boolean controllerCreateImprintUser,Boolean removeOldDataFromStorage,Boolean fetchFollower ) {
+    public TaskInfo(Boolean fetchTweetsFromSearch, Boolean updateTweets, Boolean updatedUsers, Boolean updateUsersFromMentions, Boolean fetchUsersFromList, Boolean controllerAddUserForScreenName, Boolean controllerCreateTestdataTweets, Boolean controllerCreateTestdataUsers, Boolean controllerCreateImprintUser, Boolean removeOldDataFromStorage, Boolean fetchFollower, Boolean fetchFriends) {
         this.fetchTweetsFromSearch = fetchTweetsFromSearch;
         this.updateTweets = updateTweets;
         this.updatedUsers = updatedUsers;
@@ -126,6 +126,7 @@ public TaskInfo(Boolean fetchTweetsFromSearch, Boolean updateTweets, Boolean upd
         this.controllerCreateImprintUser = controllerCreateImprintUser;
         this.removeOldDataFromStorage = removeOldDataFromStorage;
         this.fetchFollower = fetchFollower;
+        this.fetchFriends = fetchFriends;
     }
 
     public Boolean getFetchTweetsFromSearch() {
@@ -203,7 +204,9 @@ public boolean equals(Object o) {
             return false;
         if (removeOldDataFromStorage != null ? !removeOldDataFromStorage.equals(taskInfo.removeOldDataFromStorage) : taskInfo.removeOldDataFromStorage != null)
             return false;
-        return fetchFollower != null ? fetchFollower.equals(taskInfo.fetchFollower) : taskInfo.fetchFollower == null;
+        if (fetchFollower != null ? !fetchFollower.equals(taskInfo.fetchFollower) : taskInfo.fetchFollower != null)
+            return false;
+        return fetchFriends != null ? fetchFriends.equals(taskInfo.fetchFriends) : taskInfo.fetchFriends == null;
     }
 
     @Override
@@ -219,7 +222,25 @@ public int hashCode() {
         result = 31 * result + (controllerCreateImprintUser != null ? controllerCreateImprintUser.hashCode() : 0);
         result = 31 * result + (removeOldDataFromStorage != null ? removeOldDataFromStorage.hashCode() : 0);
         result = 31 * result + (fetchFollower != null ? fetchFollower.hashCode() : 0);
+        result = 31 * result + (fetchFriends != null ? fetchFriends.hashCode() : 0);
         return result;
     }
 
+    @Override
+    public String toString() {
+        return "TaskInfo{" +
+                "fetchTweetsFromSearch=" + fetchTweetsFromSearch +
+                ", updateTweets=" + updateTweets +
+                ", updatedUsers=" + updatedUsers +
+                ", updateUsersFromMentions=" + updateUsersFromMentions +
+                ", fetchUsersFromList=" + fetchUsersFromList +
+                ", controllerAddUserForScreenName=" + controllerAddUserForScreenName +
+                ", controllerCreateTestdataTweets=" + controllerCreateTestdataTweets +
+                ", controllerCreateTestdataUsers=" + controllerCreateTestdataUsers +
+                ", controllerCreateImprintUser=" + controllerCreateImprintUser +
+                ", removeOldDataFromStorage=" + removeOldDataFromStorage +
+                ", fetchFollower=" + fetchFollower +
+                ", fetchFriends=" + fetchFriends +
+                '}';
+    }
 }