fixed #272, fixed #271,fixed #270, fixed #269, fixed #268, fixed #267, fixed #266, fixed #257

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/backend/service/transform/impl/UserTransformatorImpl.java renamed to src/main/java/org/woehlke/twitterwall/backend/mq/users/endpoint/serviceactivator/impl/UserTransformatorImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.twitterwall.backend.service.transform.impl;
+package org.woehlke.twitterwall.backend.mq.users.endpoint.serviceactivator.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.support.MessageBuilder;

src/main/java/org/woehlke/twitterwall/backend/service/transform/impl/TickerSymbolTransformServiceImpl.java

@@ -19,11 +19,12 @@
 public class TickerSymbolTransformServiceImpl extends EntitiesFilter implements TickerSymbolTransformService {
 
     @Override
-    public TickerSymbol transform(TickerSymbolEntity tickerSymbol,Task task) {
-        String tickerSymbolString = tickerSymbol.getTickerSymbol();
-        String url = tickerSymbol.getUrl();
-        TickerSymbol myTickerSymbolEntity = new TickerSymbol(task, null, tickerSymbolString, url);
-        return myTickerSymbolEntity;
+    public TickerSymbol transform(TickerSymbolEntity tickerSymbolSource,Task createdBy) {
+        String tickerSymbolString = tickerSymbolSource.getTickerSymbol();
+        String url = tickerSymbolSource.getUrl();
+        Task updatedBy = null;
+        TickerSymbol tickerSymboTarget = new TickerSymbol(createdBy, updatedBy, tickerSymbolString, url);
+        return tickerSymboTarget;
     }
 
     @Override

src/main/java/org/woehlke/twitterwall/backend/service/transform/impl/TweetTransformServiceImpl.java

@@ -14,7 +14,6 @@
 /**
  * Created by tw on 28.06.17.
  */
-
 @Component
 public class TweetTransformServiceImpl implements TweetTransformService {
 
@@ -31,7 +30,6 @@ public TweetTransformServiceImpl(UserTransformService userTransformService, Enti
     @Override
     public org.woehlke.twitterwall.oodm.model.Tweet transform(org.springframework.social.twitter.api.Tweet tweetSource, Task task) {
         if (tweetSource == null) { return null; } else {
-            org.woehlke.twitterwall.oodm.model.Tweet retweetedStatus = transform(tweetSource.getRetweetedStatus(),task);
             long idTwitter = tweetSource.getId();
             String idStr = tweetSource.getIdStr();
             String text = tweetSource.getText();
@@ -54,17 +52,18 @@ public org.woehlke.twitterwall.oodm.model.Tweet transform(org.springframework.so
             tweetTarget.setFromUser(tweetSource.getFromUser());
             tweetTarget.setFavorited(tweetSource.isFavorited());
             tweetTarget.setInReplyToStatusId(tweetSource.getInReplyToStatusId());
+            /* retweetedStatus */
+            org.woehlke.twitterwall.oodm.model.Tweet retweetedStatus = transform(tweetSource.getRetweetedStatus(),task);
             tweetTarget.setRetweetedStatus(retweetedStatus);
-            TwitterProfile userSource = tweetSource.getUser();
-
+            /* Entities */
             Entities entitiesTarget = entitiesTransformService.transformEntitiesForTweet(tweetSource,task);
-
             tweetTarget.setEntities(entitiesTarget);
-
             /* transformEntitiesForTweet userTarget */
+            TwitterProfile userSource = tweetSource.getUser();
             User userTarget = userTransformService.transform(userSource,task);
             tweetTarget.setUser(userTarget);
-
+            /* ExtraData */
+            tweetTarget.setExtraData(tweetSource.getExtraData());
             return tweetTarget;
         }
     }

src/main/java/org/woehlke/twitterwall/backend/service/transform/impl/UrlTransformServiceImpl.java

@@ -20,12 +20,13 @@
 public class UrlTransformServiceImpl extends EntitiesFilter implements UrlTransformService {
 
     @Override
-    public Url transform(UrlEntity url, Task task) {
-        String display = url.getDisplayUrl();
-        String expanded = url.getExpandedUrl();
-        String urlStr = url.getUrl();
-        Url myUrlEntity = Url.createByTransformation(task, display, expanded, urlStr);
-        return myUrlEntity;
+    public Url transform(UrlEntity urlSource, Task task) {
+        String display = urlSource.getDisplayUrl();
+        String expanded = urlSource.getExpandedUrl();
+        String urlStr = urlSource.getUrl();
+        Url urlTarget = Url.createByTransformation(task, display, expanded, urlStr);
+        urlTarget.setExtraData(urlSource.getExtraData());
+        return urlTarget;
     }
 
     @Override

src/main/java/org/woehlke/twitterwall/backend/service/transform/impl/UserListTransformServiceImpl.java

@@ -2,9 +2,13 @@
 
 import org.springframework.stereotype.Component;
 import org.woehlke.twitterwall.oodm.model.Task;
+import org.woehlke.twitterwall.oodm.model.User;
 import org.woehlke.twitterwall.oodm.model.UserList;
 import org.woehlke.twitterwall.backend.service.transform.UserListTransformService;
 
+import java.util.LinkedHashSet;
+import java.util.Set;
+
 @Component
 public class UserListTransformServiceImpl implements UserListTransformService {
 
@@ -22,7 +26,11 @@ public UserList transform(org.springframework.social.twitter.api.UserList twitte
         boolean isFollowing = twitterObject.isFollowing();
         int memberCount = twitterObject.getMemberCount();
         int subscriberCount = twitterObject.getSubscriberCount();
-        UserList userList = new UserList(createdBy, updatedBy, idTwitter, name, fullName, uriPath, description, slug, isPublic, isFollowing, memberCount, subscriberCount);
+        Set<User> members = new LinkedHashSet<User>();
+        Set<User> subscriber = new LinkedHashSet<User>();
+        User listOwner = null;
+        UserList userList = new UserList(createdBy, updatedBy, idTwitter, name, fullName, uriPath, description, slug, isPublic, isFollowing, memberCount, subscriberCount,listOwner,members,subscriber);
+        userList.setExtraData(twitterObject.getExtraData());
         return userList;
     }
 }

src/main/java/org/woehlke/twitterwall/backend/service/transform/impl/UserTransformServiceImpl.java

@@ -16,7 +16,6 @@
 /**
  * Created by tw on 28.06.17.
  */
-
 @Component
 public class UserTransformServiceImpl implements UserTransformService {
 
@@ -82,6 +81,7 @@ public User transform(TwitterProfile userSource,Task task) {
         userTarget.setEntities(entities);
         log.debug(msg+" userTarget = "+userTarget.getUniqueId());
         log.trace(msg+" userTarget = "+userTarget.toString());
+        userTarget.setExtraData(userSource.getExtraData());
         return userTarget;
     }
 

src/main/java/org/woehlke/twitterwall/oodm/model/UserList.java

@@ -8,6 +8,14 @@
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import static javax.persistence.CascadeType.DETACH;
+import static javax.persistence.CascadeType.REFRESH;
+import static javax.persistence.CascadeType.REMOVE;
+import static javax.persistence.FetchType.EAGER;
+import static javax.persistence.FetchType.LAZY;
 
 @Entity
 @Table(
@@ -83,7 +91,34 @@ public String getListOwnersScreenName(){
         return myuriPath.split("/")[1];
     }
 
-    public UserList(Task createdBy, Task updatedBy, long idTwitter, String name, String fullName, String uriPath, String description, String slug, boolean isPublic, boolean isFollowing, int memberCount, int subscriberCount) {
+    @NotNull
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumn(name="fk_user")
+    private User listOwner;
+
+
+    @NotNull
+    @JoinTable(
+        name="userlist_members"
+    )
+    @ManyToMany(
+        cascade = { DETACH, REFRESH, REMOVE },
+        fetch = LAZY
+    )
+    private Set<User> members = new LinkedHashSet<User>();
+
+
+    @NotNull
+    @JoinTable(
+        name="userlist_subcriber"
+    )
+    @ManyToMany(
+        cascade = { DETACH, REFRESH, REMOVE },
+        fetch = LAZY
+    )
+    private Set<User> subscriber = new LinkedHashSet<User>();
+
+    public UserList(Task createdBy, Task updatedBy, long idTwitter, String name, String fullName, String uriPath, String description, String slug, boolean isPublic, boolean isFollowing, int memberCount, int subscriberCount, User listOwner,Set<User> members,Set<User> subscriber) {
         super(createdBy, updatedBy);
         this.idTwitter = idTwitter;
         this.name = name;
@@ -99,6 +134,9 @@ public UserList(Task createdBy, Task updatedBy, long idTwitter, String name, Str
         } else {
             this.description = description;
         }
+        this.listOwner = listOwner;
+        this.members = members;
+        this.subscriber = subscriber;
     }
 
     protected UserList() {
@@ -213,45 +251,74 @@ public void setSubscriberCount(Integer subscriberCount) {
         this.subscriberCount = subscriberCount;
     }
 
+
+    public User getListOwner() {
+        return listOwner;
+    }
+
+    public void setListOwner(User listOwner) {
+        this.listOwner = listOwner;
+    }
+
+    public Set<User> getMembers() {
+        return members;
+    }
+
+    public void setMembers(Set<User> members) {
+        this.members = members;
+    }
+
+    public Set<User> getSubscriber() {
+        return subscriber;
+    }
+
+    public void setSubscriber(Set<User> subscriber) {
+        this.subscriber = subscriber;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof UserList)) return false;
 
         UserList userList = (UserList) o;
 
-        if (getId() != null ? !getId().equals(userList.getId()) : userList.getId() != null) return false;
-        if (getIdTwitter() != null ? !getIdTwitter().equals(userList.getIdTwitter()) : userList.getIdTwitter() != null)
-            return false;
-        if (getName() != null ? !getName().equals(userList.getName()) : userList.getName() != null) return false;
-        if (getFullName() != null ? !getFullName().equals(userList.getFullName()) : userList.getFullName() != null)
+        if (id != null ? !id.equals(userList.id) : userList.id != null) return false;
+        if (idTwitter != null ? !idTwitter.equals(userList.idTwitter) : userList.idTwitter != null) return false;
+        if (name != null ? !name.equals(userList.name) : userList.name != null) return false;
+        if (fullName != null ? !fullName.equals(userList.fullName) : userList.fullName != null) return false;
+        if (uriPath != null ? !uriPath.equals(userList.uriPath) : userList.uriPath != null) return false;
+        if (description != null ? !description.equals(userList.description) : userList.description != null)
             return false;
-        if (getUriPath() != null ? !getUriPath().equals(userList.getUriPath()) : userList.getUriPath() != null)
-            return false;
-        if (getDescription() != null ? !getDescription().equals(userList.getDescription()) : userList.getDescription() != null)
-            return false;
-        if (getSlug() != null ? !getSlug().equals(userList.getSlug()) : userList.getSlug() != null) return false;
+        if (slug != null ? !slug.equals(userList.slug) : userList.slug != null) return false;
         if (isPublic != null ? !isPublic.equals(userList.isPublic) : userList.isPublic != null) return false;
         if (isFollowing != null ? !isFollowing.equals(userList.isFollowing) : userList.isFollowing != null)
             return false;
-        if (getMemberCount() != null ? !getMemberCount().equals(userList.getMemberCount()) : userList.getMemberCount() != null)
+        if (memberCount != null ? !memberCount.equals(userList.memberCount) : userList.memberCount != null)
+            return false;
+        if (subscriberCount != null ? !subscriberCount.equals(userList.subscriberCount) : userList.subscriberCount != null)
             return false;
-        return getSubscriberCount() != null ? getSubscriberCount().equals(userList.getSubscriberCount()) : userList.getSubscriberCount() == null;
+        if (listOwner != null ? !listOwner.equals(userList.listOwner) : userList.listOwner != null) return false;
+        if (members != null ? !members.equals(userList.members) : userList.members != null) return false;
+        return subscriber != null ? subscriber.equals(userList.subscriber) : userList.subscriber == null;
     }
 
     @Override
     public int hashCode() {
-        int result = getId() != null ? getId().hashCode() : 0;
-        result = 31 * result + (getIdTwitter() != null ? getIdTwitter().hashCode() : 0);
-        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
-        result = 31 * result + (getFullName() != null ? getFullName().hashCode() : 0);
-        result = 31 * result + (getUriPath() != null ? getUriPath().hashCode() : 0);
-        result = 31 * result + (getDescription() != null ? getDescription().hashCode() : 0);
-        result = 31 * result + (getSlug() != null ? getSlug().hashCode() : 0);
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (idTwitter != null ? idTwitter.hashCode() : 0);
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (fullName != null ? fullName.hashCode() : 0);
+        result = 31 * result + (uriPath != null ? uriPath.hashCode() : 0);
+        result = 31 * result + (description != null ? description.hashCode() : 0);
+        result = 31 * result + (slug != null ? slug.hashCode() : 0);
         result = 31 * result + (isPublic != null ? isPublic.hashCode() : 0);
         result = 31 * result + (isFollowing != null ? isFollowing.hashCode() : 0);
-        result = 31 * result + (getMemberCount() != null ? getMemberCount().hashCode() : 0);
-        result = 31 * result + (getSubscriberCount() != null ? getSubscriberCount().hashCode() : 0);
+        result = 31 * result + (memberCount != null ? memberCount.hashCode() : 0);
+        result = 31 * result + (subscriberCount != null ? subscriberCount.hashCode() : 0);
+        result = 31 * result + (listOwner != null ? listOwner.hashCode() : 0);
+        result = 31 * result + (members != null ? members.hashCode() : 0);
+        result = 31 * result + (subscriber != null ? subscriber.hashCode() : 0);
         return result;
     }
 

src/main/java/org/woehlke/twitterwall/oodm/model/parts/AbstractDomainObject.java

@@ -1,6 +1,7 @@
 package org.woehlke.twitterwall.oodm.model.parts;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import org.hibernate.annotations.IndexColumn;
 import org.springframework.validation.annotation.Validated;
 import org.woehlke.twitterwall.oodm.model.Task;
 import org.woehlke.twitterwall.oodm.model.common.DomainObject;
@@ -55,6 +56,9 @@ public abstract class AbstractDomainObject<T extends DomainObject> implements Do
     @Transient
     private Map<String, Object> extraData = new HashMap<>();
 
+    @Transient
+    private int[] indices;
+
     @Transient
     public Boolean isCached(TaskType taskType, long timeToLive){
         return this.taskBasedCaching.isCached(taskType,timeToLive);
@@ -97,6 +101,13 @@ public void setExtraData(Map<String, Object> extraData) {
         this.extraData = extraData;
     }
 
+    public int[] getIndices() {
+        return indices;
+    }
+
+    public void setIndices(int[] indices) {
+        this.indices = indices;
+    }
 
     @Override
     public String toString() {

src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/impl/TaskRepositoryImpl.java

@@ -58,6 +58,8 @@ public void deleteAllDomainData() {
             "delete from hashtag",
             "delete from tweet",
             "delete from userprofile",
+            "delete from userlist_members",
+            "delete from userlist_subcriber",
             "delete from userlist",
             "delete from task_history",
             "delete from task"