working on #157

Author: phasenraum2010

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

@@ -62,9 +62,63 @@ public class Url extends AbstractDomainObject<Url> implements DomainObjectEntity
 
     @Transient
     public boolean isUrlAndExpandedTheSame(){
+        if(url == null){
+            return false;
+        }
+        if(expanded == null){
+            return false;
+        }
+        if(this.url.isEmpty()){
+            return false;
+        }
+        if(this.expanded.isEmpty()){
+            return false;
+        }
         return url.compareTo(expanded) == 0;
     }
 
+    @Transient
+    public boolean isRawUrlsFromDescription() {
+        if(this.display == null){
+            return false;
+        }
+        if(this.expanded == null){
+            return false;
+        }
+        if(this.display.isEmpty()){
+            return false;
+        }
+        if(this.expanded.isEmpty()){
+            return false;
+        }
+        return (this.display.compareTo(UNDEFINED)==0)&&(this.expanded.compareTo(UNDEFINED)==0);
+    }
+
+    @Transient
+    @Override
+    public boolean isValid() {
+        if(this.url == null){
+            return false;
+        }
+        if(this.expanded == null){
+            return false;
+        }
+        if(this.display == null){
+            return false;
+        }
+        if(this.url.isEmpty()){
+            return false;
+        }
+        if(this.expanded.isEmpty()){
+            return false;
+        }
+        if(this.display.isEmpty()){
+            return false;
+        }
+        boolean isInvalid = this.isRawUrlsFromDescription()||this.isUrlAndExpandedTheSame();
+        return !isInvalid;
+    }
+
     public Url(Task createdBy, Task updatedBy,String display, String expanded, String url) {
         super(createdBy,updatedBy);
         this.display = display;
@@ -134,16 +188,6 @@ public String toString() {
                 "}\n";
     }
 
-    @Override
-    public boolean isValid() {
-        boolean isInvalid = (this.url == null)||(this.url.isEmpty()||isRawUrlsFromDescription())||(this.url.compareTo(this.expanded)==0);
-        return !isInvalid;
-    }
-
-    public boolean isRawUrlsFromDescription() {
-        return (this.getDisplay().compareTo(UNDEFINED)==0)&&(this.getExpanded().compareTo(UNDEFINED)==0);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

src/main/java/org/woehlke/twitterwall/oodm/entities/parts/Entities.java

@@ -384,7 +384,7 @@ public String toString() {
 
     public String getFormattedText(String formattedText ) {
 
-        formattedText = getFormattedTextForUserProfiles(formattedText);
+        //formattedText = getFormattedTextForUserProfiles(formattedText);
 
         Set<HashTag> tags = this.getHashTags();
         formattedText = getFormattedTextForHashTags(tags,formattedText);
@@ -395,7 +395,7 @@ public String getFormattedText(String formattedText ) {
         Set<Url> urls = this.getUrls();
         formattedText = getFormattedTextForUrls(urls, formattedText);
 
-        formattedText = getFormattedTextForUrls( formattedText );
+        //formattedText = getFormattedTextForUrls( formattedText );
 
         Set<Mention> mentions = this.getMentions();
         formattedText = super.getFormattedTextForMentions(mentions, formattedText);

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

@@ -19,15 +19,6 @@
 @Repository
 public class UserRepositoryImpl implements UserRepositoryCustom {
 
-    private final EntityManager entityManager;
-
-    private JdbcTemplate jdbcTemplate;
-
-    @Autowired
-    public UserRepositoryImpl(EntityManager entityManager,DataSource dataSource) {
-        this.entityManager = entityManager;
-        this.jdbcTemplate = new JdbcTemplate(dataSource);
-    }
 
     @Override
     public User findByUniqueId(User domainObject) {
@@ -43,11 +34,6 @@ public User findByUniqueId(User domainObject) {
         }
     }
 
-    @Override
-    public Page<User> findNotYetFollower(Pageable pageRequest) {
-        return null;
-    }
-
     @Override
     public Page<Object2Entity> findAllUser2HashTag(Pageable pageRequest) {
         String pagerSQL = " OFFSET "+pageRequest.getOffset()+" LIMIT "+pageRequest.getPageSize();
@@ -107,4 +93,14 @@ public Page<Object2Entity> findAllUser2TickerSymbol(Pageable pageRequest) {
         PageImpl<Object2Entity> resultPage = new PageImpl<>(list,pageRequest,total);
         return resultPage;
     }
+
+    private final EntityManager entityManager;
+
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    public UserRepositoryImpl(EntityManager entityManager,DataSource dataSource) {
+        this.entityManager = entityManager;
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
 }

src/main/java/org/woehlke/twitterwall/oodm/service/impl/UrlServiceImpl.java

@@ -32,10 +32,16 @@ public UrlServiceImpl(UrlRepository urlRepository, TaskRepository taskRepository
     public Url findByUrl(String url) {
         String name = "findByUrl "+url+" ";
         if(url == null){
-            throw new IllegalArgumentException("Url.findByUrl: url == null");
+            log.debug(name+"Url.findByUrl: url == null");
+            return null;
+            //throw new IllegalArgumentException("Url.findByUrl: url == null");
         }
         Url result = urlRepository.findByUrl(url);
-        log.debug(name+result.toString());
+        if(result == null){
+            log.debug(name+"Url.findByUrl: url == null");
+        } else {
+            log.debug(name+result.toString());
+        }
         return result;
     }
 

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

@@ -34,7 +34,14 @@ public Entities storeEntitiesProcess(Entities entities, Task task) {
         for (Url myUrl : entities.getUrls()) {
             if(myUrl != null) {
                 if (myUrl.isValid()) {
-                    Url urlPers = urlService.store(myUrl, task);
+                    Url urlPers = urlService.findByUrl(myUrl.getUrl());
+                    if(urlPers != null){
+                        urlPers.setDisplay(myUrl.getDisplay());
+                        urlPers.setExpanded(myUrl.getExpanded());
+                        urlPers = urlService.store(urlPers, task);
+                    } else {
+                        urlPers = urlService.store(myUrl, task);
+                    }
                     urls.add(urlPers);
                 } else if (myUrl.isRawUrlsFromDescription()){
                     String urlStr = myUrl.getUrl();