Merge pull request #203 from phasenraum2010/after-release-1.0.17

After release 1.0.17

Author: phasenraum2010

.gitignore

@@ -15,6 +15,12 @@ buildNumber.properties
 *.iml
 twitterwall.log
 twitterwall.log*
+maven-build.log
+maven-build.log.txt
+maven-testing.log.txt
+spring-boot.log.txt
+maven-testing-site.log.txt
+test.log.txt
 docs2
 .bundle
 .sass-cache

pom.xml

@@ -111,6 +111,15 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity4</artifactId>

src/main/java/org/woehlke/twitterwall/ScheduledTasks.java

@@ -8,7 +8,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.twitterwall.conf.properties.SchedulerProperties;
-import org.woehlke.twitterwall.scheduled.mq.endoint.StartTask;
+import org.woehlke.twitterwall.scheduled.mq.endpoint.StartTask;
 
 /**
  * Created by tw on 10.06.17.

src/main/java/org/woehlke/twitterwall/frontend/controller/ImprintController.java

@@ -10,7 +10,7 @@
 import org.woehlke.twitterwall.frontend.controller.common.Symbols;
 import org.woehlke.twitterwall.frontend.controller.common.ControllerHelper;
 import org.woehlke.twitterwall.oodm.entities.User;
-import org.woehlke.twitterwall.scheduled.mq.endoint.StartTask;
+import org.woehlke.twitterwall.scheduled.mq.endpoint.StartTask;
 
 
 /**

src/main/java/org/woehlke/twitterwall/frontend/controller/TaskController.java

@@ -22,8 +22,8 @@
 import org.woehlke.twitterwall.oodm.service.TaskHistoryService;
 import org.woehlke.twitterwall.oodm.service.TaskService;
 import org.woehlke.twitterwall.oodm.service.UserService;
-import org.woehlke.twitterwall.scheduled.mq.endoint.AsyncStartTask;
-import org.woehlke.twitterwall.scheduled.mq.endoint.StartTask;
+import org.woehlke.twitterwall.scheduled.mq.endpoint.AsyncStartTask;
+import org.woehlke.twitterwall.scheduled.mq.endpoint.StartTask;
 
 /**
  * Created by tw on 11.07.17.

src/main/java/org/woehlke/twitterwall/frontend/controller/TweetController.java

@@ -52,7 +52,7 @@ public String getLatestTweets(
     }
 
     @RequestMapping("/{id}")
-    public String getLatestTweets(
+    public String getTweetById(
         @PathVariable("id") Tweet tweet, Model model
     ) {
         String title = "Tweet";

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

@@ -64,19 +64,29 @@ public static boolean isValidText(String hashtagText){
         return m.matches();
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
+    @Transient
+    @Override
+    public boolean isValid() {
+        if((text == null)||(text.isEmpty())){
+            return false;
+        } else {
+            return this.hasValidText();
+        }
     }
 
+    @Transient
     @Override
     public String getUniqueId() {
         return text;
     }
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 
     public String getText() {
         return this.text;
@@ -99,14 +109,6 @@ public String toString() {
                 " }\n";
     }
 
-    @Override
-    public boolean isValid() {
-        if((text == null)||(text.isEmpty())){
-            return false;
-        }
-        return true;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

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

@@ -11,6 +11,7 @@
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
+import java.net.MalformedURLException;
 
 /**
  * Created by tw on 10.06.17.
@@ -101,6 +102,53 @@ private Media() {
         super();
     }
 
+    @Transient
+    @Override
+    public String getUniqueId() {
+        return idTwitter.toString();
+    }
+
+    @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;
+        }
+        if(this.mediaHttps == null){
+            return false;
+        }
+        if(this.mediaHttps.isEmpty()){
+            return false;
+        }
+        if(this.mediaHttp == null){
+            return false;
+        }
+        if(this.mediaHttp.isEmpty()){
+            return false;
+        }
+        try {
+            java.net.URL url = new java.net.URL(this.url);
+            return true;
+        } catch (MalformedURLException e) {
+            return false;
+        }
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -114,11 +162,6 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    @Override
-    public String getUniqueId() {
-        return idTwitter.toString();
-    }
-
     @Override
     public Long getIdTwitter() {
         return idTwitter;
@@ -192,10 +235,4 @@ public String toString() {
                 " }\n";
     }
 
-    @Override
-    public boolean isValid() {
-        return true;
-    }
-
-
 }

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

@@ -63,7 +63,7 @@ public class Mention extends AbstractDomainObject<Mention> implements DomainObje
     private User user;
 
     @NotNull
-    @Column(name = "id_twitte_of_user",nullable = false)
+    @Column(name = "id_twitter_of_user",nullable = false)
     private Long idTwitterOfUser = 0L;
 
     public Mention(Task createdBy, Task updatedBy, long idTwitter, String screenName, String name) {
@@ -83,6 +83,46 @@ public Mention(Task createdBy, Task updatedBy, String mentionString) {
     private Mention() {
     }
 
+    @Transient
+    @Override
+    public String getUniqueId() {
+        return idTwitter.toString() +"_"+ screenName.toString();
+    }
+
+    @Transient
+    @Override
+    public boolean isValid() {
+        if(screenName == null){
+            return false;
+        }
+        if(screenName.isEmpty()){
+            return false;
+        }
+        if(!this.hasValidScreenName()){
+            return false;
+        }
+        if(idTwitter == null){
+            return false;
+        }
+        return true;
+    }
+
+    @Transient
+    public boolean hasValidScreenName() {
+        Pattern p = Pattern.compile("^" + User.SCREEN_NAME_PATTERN + "$");
+        Matcher m = p.matcher(screenName);
+        return m.matches();
+    }
+
+    public static boolean isValidScreenName(String screenName) {
+        if(screenName==null){
+            return false;
+        }
+        Pattern p = Pattern.compile("^" + User.SCREEN_NAME_PATTERN + "$");
+        Matcher m = p.matcher(screenName);
+        return m.matches();
+    }
+
     @Transient
     public Boolean isProxy(){
         return idTwitter < 0;
@@ -102,16 +142,12 @@ public boolean hasPersistentUser(){
     }
 
     @Transient
-    public boolean hasValidScreenName() {
-        Pattern p = Pattern.compile("^" + User.SCREEN_NAME_PATTERN + "$");
-        Matcher m = p.matcher(screenName);
-        return m.matches();
-    }
-
-    public static boolean isValidScreenName(String screenName) {
-        Pattern p = Pattern.compile("^" + User.SCREEN_NAME_PATTERN + "$");
-        Matcher m = p.matcher(screenName);
-        return m.matches();
+    public boolean isRawMentionFromUserDescription() {
+        if(this.isValid()) {
+            return (this.getIdTwitter() == ID_TWITTER_UNDEFINED);
+        } else {
+            return false;
+        }
     }
 
     public boolean hasUser() {
@@ -130,11 +166,6 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    @Override
-    public String getUniqueId() {
-        return idTwitter.toString() +"_"+ screenName.toString();
-    }
-
     public String getScreenName() {
         return screenName;
     }
@@ -188,22 +219,6 @@ public String toString() {
             " }\n";
     }
 
-    @Transient
-    public boolean isValid() {
-        if((screenName == null) ||(screenName.isEmpty())|| isRawMentionFromUserDescription()){
-            return false;
-        }
-        if(idTwitter <= 1L){
-            return false;
-        }
-        return true;
-    }
-
-    @Transient
-    public boolean isRawMentionFromUserDescription() {
-        return (this.getIdTwitter() == ID_TWITTER_UNDEFINED);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;