working on #138

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/scheduled/mq/endoint/UserFinisher.java

@@ -1,12 +1,12 @@
 package org.woehlke.twitterwall.scheduled.mq.endoint;
 
 import org.springframework.messaging.Message;
-import org.woehlke.twitterwall.oodm.entities.User;
+import org.woehlke.twitterwall.scheduled.mq.msg.UserMessage;
 import org.woehlke.twitterwall.scheduled.mq.msg.UserResultList;
 
 import java.util.List;
 
 public interface UserFinisher {
 
-    UserResultList finish(Message<List<User>> incomingMessageList);
+    UserResultList finish(Message<List<UserMessage>> incomingMessageList);
 }

src/main/java/org/woehlke/twitterwall/scheduled/mq/endoint/impl/StartTaskImpl.java

@@ -150,7 +150,7 @@ public List<User> createTestDataForUser() {
         Object o = returnedMessage.getPayload();
         if( o instanceof UserResultList){
             UserResultList result = (UserResultList) o;
-            long taskId =result.getTaskId();
+            long taskId = result.getTaskId();
             task = taskService.findById(taskId);
             taskService.done(task);
             return result.getUserList();

src/main/java/org/woehlke/twitterwall/scheduled/mq/endoint/impl/UserFinisherImpl.java

@@ -4,19 +4,28 @@
 import org.springframework.stereotype.Component;
 import org.woehlke.twitterwall.oodm.entities.User;
 import org.woehlke.twitterwall.scheduled.mq.endoint.UserFinisher;
+import org.woehlke.twitterwall.scheduled.mq.msg.UserMessage;
 import org.woehlke.twitterwall.scheduled.mq.msg.UserResultList;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Component("mqUserFinisher")
 public class UserFinisherImpl implements UserFinisher {
 
 
     @Override
-    public UserResultList finish(Message<List<User>> incomingMessageList) {
+    public UserResultList finish(Message<List<UserMessage>> incomingMessageList) {
         long taskId = 0L;
-        List<User> userList = incomingMessageList.getPayload();
-        UserResultList userResultList = new UserResultList(taskId,userList);
+        List<User> users = new ArrayList<>();
+        List<UserMessage> userMessageList = incomingMessageList.getPayload();
+        if(userMessageList.size()>0) {
+            taskId = userMessageList.get(0).getTaskId();
+        }
+        for(UserMessage msg :userMessageList){
+            users.add(msg.getUser());
+        }
+        UserResultList userResultList = new UserResultList(taskId,users);
         return userResultList;
     }
 }

src/main/java/org/woehlke/twitterwall/scheduled/mq/helper/CreateTestDataForUsersReleaseStrategy.java

@@ -18,6 +18,6 @@ public CreateTestDataForUsersReleaseStrategy(TwitterwallSchedulerProperties twit
 
     @Override
     public boolean canRelease(MessageGroup group) {
-        return ! (group.size() < twitterwallSchedulerProperties.getFacade().getIdTwitterToFetchForUserControllerTest().size());
+        return ! (group.size() < twitterwallSchedulerProperties.getFacade().getScreenNamesToFetchForUserControllerTest().size());
     }
 }

src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/StoreEntitiesProcessImpl.java

@@ -57,12 +57,12 @@ public Entities storeEntitiesProcess(Entities entities, Task task) {
             if(mention.isValid()){
                 Mention mentionPers =mentionService.store(mention, task);
                 mentions.add(mentionPers);
-            } else if(mention.isRawMentionFromUserDescription()){
+            }/* else if(mention.isRawMentionFromUserDescription()){
                 Mention mentionPers = createPersistentMention.getPersistentMentionAndUserFor(mention,task);
                 if((mentionPers != null) && mentionPers.isValid()){
                     mentions.add(mentionPers);
                 }
-            }
+            }*/
         }
         for(Media medium:entities.getMedia()){
             if(medium.isValid()) {

src/main/resources/application.yml

@@ -35,17 +35,17 @@ spring:
     name: @project.name@
   datasource:
     driverClassName: org.postgresql.Driver
-    initialSize: 5
-    max-total: 70
-    maxActive: 60
-    maxIdle: 5
-    minIdle: 2
+    #initialSize: 5
+    #max-total: 70
+    #maxActive: 60
+    #maxIdle: 5
+    #minIdle: 2
     platform: POSTGRESQL
-    removeAbandoned: true
-    tomcat:
-      max-active: 50
-      max-wait: 100000
-      test-on-borrow: true
+    #removeAbandoned: true
+    #tomcat:
+      #max-active: 200
+      #max-wait: 100000
+      #test-on-borrow: true
     url: ${DATABASE_URL}
   devtools:
     livereload: