fixed #222, fixed #217, working on #215, working on #200

Author: phasenraum2010

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

@@ -280,22 +280,19 @@ public String toString() {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof Mention)) return false;
-        if (!super.equals(o)) return false;
 
         Mention mention = (Mention) o;
 
-        if (getId() != null ? !getId().equals(mention.getId()) : mention.getId() != null) return false;
-        if (getIdTwitter() != null ? !getIdTwitter().equals(mention.getIdTwitter()) : mention.getIdTwitter() != null)
-            return false;
-        return getScreenName() != null ? getScreenName().equals(mention.getScreenName()) : mention.getScreenName() == null;
+        if (id != null ? !id.equals(mention.id) : mention.id != null) return false;
+        if (idTwitter != null ? !idTwitter.equals(mention.idTwitter) : mention.idTwitter != null) return false;
+        return screenNameUnique != null ? screenNameUnique.equals(mention.screenNameUnique) : mention.screenNameUnique == null;
     }
 
     @Override
     public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + (getId() != null ? getId().hashCode() : 0);
-        result = 31 * result + (getIdTwitter() != null ? getIdTwitter().hashCode() : 0);
-        result = 31 * result + (getScreenName() != null ? getScreenName().hashCode() : 0);
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (idTwitter != null ? idTwitter.hashCode() : 0);
+        result = 31 * result + (screenNameUnique != null ? screenNameUnique.hashCode() : 0);
         return result;
     }
 }

src/test/java/org/woehlke/twitterwall/oodm/service/UserServiceTest.java

@@ -21,6 +21,8 @@
 import org.woehlke.twitterwall.oodm.entities.*;
 import org.woehlke.twitterwall.oodm.entities.transients.Object2Entity;
 
+import java.util.Set;
+
 import static org.woehlke.twitterwall.frontend.controller.common.ControllerHelper.FIRST_PAGE_NUMBER;
 
 @RunWith(SpringRunner.class)
@@ -326,29 +328,35 @@ public void findAllUser2Media() throws Exception {
 
 
     //@Commit
-    @Ignore
+    //@Ignore
     @Test
     public void findAllUser2Mentiong() throws Exception {
         String msg = "findAllUser2Mentiong: ";
         int page=1;
         int size=10;
         Pageable pageRequest = new PageRequest(page,size);
         Page<Object2Entity> foundPage = userService.findAllUser2Mentiong(pageRequest);
-        if(foundPage.getTotalElements()>0){
-            for(Object2Entity object2Entity:foundPage.getContent()){
-                long objectId = object2Entity.getObjectId();
-                String objectInfo = object2Entity.getObjectInfo();
-                long entityId = object2Entity.getEntityId();
-                String entityInfo = object2Entity.getObjectInfo();
-                User userPers = userService.findById(objectId);
-                Mention mentionPers = mentionService.findById(entityId);
-                Assert.assertNotNull(msg,userPers);
-                Assert.assertNotNull(msg,mentionPers);
-                Assert.assertNull(objectInfo);
-                Assert.assertNull(entityInfo);
-                boolean ok = userPers.getEntities().getMentions().contains(mentionPers);
-                Assert.assertTrue(msg,ok);
-            }
+        for(Object2Entity object2Entity:foundPage.getContent()){
+            long objectId = object2Entity.getObjectId();
+            log.info(msg+" objectId: "+objectId);
+            String objectInfo = object2Entity.getObjectInfo();
+            log.info(msg+" objectInfo: "+objectInfo);
+            long entityId = object2Entity.getEntityId();
+            log.info(msg+" entityId: "+entityId);
+            String entityInfo = object2Entity.getObjectInfo();
+            log.info(msg+" entityInfo: "+entityInfo);
+            User userPers = userService.findById(objectId);
+            log.info(msg+" userPers: "+userPers);
+            Mention mentionPers = mentionService.findById(entityId);
+            log.info(msg+" mentionPers: "+mentionPers);
+            Assert.assertNotNull(msg+" userPers: ",userPers);
+            Assert.assertNotNull(msg+" mentionPers: ",mentionPers);
+            Assert.assertNull(msg+" objectInfo: " ,objectInfo);
+            Assert.assertNull(msg+" entityInfo: ",entityInfo);
+            Set<Mention> mentions = userPers.getEntities().getMentions();
+            Assert.assertTrue(msg,mentions.size()>0);
+            boolean ok = mentions.contains(mentionPers);
+            Assert.assertTrue(msg,ok);
         }
     }