Merge pull request #136 from phasenraum2010/milestone-1.0.13

Milestone 1.0.13

Author: phasenraum2010

src/main/java/org/woehlke/twitterwall/conf/DataSourceConf.java

@@ -5,13 +5,15 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 import javax.sql.DataSource;
 
 /**
  * Created by tw on 19.06.17.
  */
 @Configuration
+@EnableJpaRepositories("org.woehlke.twitterwall.oodm.repositories")
 public class DataSourceConf {
 
     @Bean

…rontend/controller/DomainController.java …nd/controller/ApplicationController.javasrc/main/java/org/woehlke/twitterwall/frontend/controller/DomainController.java renamed to src/main/java/org/woehlke/twitterwall/frontend/controller/ApplicationController.java src/main/java/org/woehlke/twitterwall/frontend/controller/DomainController.java renamed to src/main/java/org/woehlke/twitterwall/frontend/controller/ApplicationController.java

@@ -15,7 +15,7 @@
  */
 @Controller
 @RequestMapping(path="/application")
-public class DomainController {
+public class ApplicationController {
 
     @RequestMapping(path="/domain/count")
     public String domainCount(Model model) {
@@ -30,10 +30,25 @@ public String domainCount(Model model) {
         return "application/domain/count";
     }
 
+    @RequestMapping(path="/management")
+    public String dmanagementPage(Model model) {
+        String msg = "/application/domain/count: ";
+        controllerHelper.logEnv();
+        String title = "Application Management";
+        String subtitle = twitterProperties.getSearchQuery();
+        String symbol = Symbols.DATABASE.toString();
+        model = controllerHelper.setupPage(model,title,subtitle,symbol);
+        //CountedEntities countedEntities =this.countedEntitiesService.countAll();
+        //model.addAttribute("countedEntities", countedEntities);
+
+        return "application/management";
+    }
+
+
     private final CountedEntitiesService countedEntitiesService;
 
     @Autowired
-    public DomainController(CountedEntitiesService countedEntitiesService, ControllerHelper controllerHelper, TwitterProperties twitterProperties) {
+    public ApplicationController(CountedEntitiesService countedEntitiesService, ControllerHelper controllerHelper, TwitterProperties twitterProperties) {
         this.countedEntitiesService = countedEntitiesService;
         this.controllerHelper = controllerHelper;
         this.twitterProperties = twitterProperties;

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

@@ -1,21 +1,15 @@
 package org.woehlke.twitterwall.oodm.entities;
 
 import org.hibernate.validator.constraints.SafeHtml;
-import org.woehlke.twitterwall.oodm.entities.parts.AbstractTwitterObject;
+import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObject;
-import org.woehlke.twitterwall.oodm.entities.parts.TaskInfo;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
 import org.woehlke.twitterwall.oodm.entities.listener.HashTagListener;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static javax.persistence.CascadeType.DETACH;
-import static javax.persistence.CascadeType.REFRESH;
-import static javax.persistence.FetchType.EAGER;
-
 /**
  * Created by tw on 10.06.17.
  */
@@ -26,46 +20,32 @@
         @UniqueConstraint(name="unique_hashtag",columnNames = {"text"})
     }
 )
+@NamedQueries({
+    @NamedQuery(
+        name="HashTag.findByUniqueId",
+        query="select t from HashTag t where t.text=:text"
+    )
+})
 @EntityListeners(HashTagListener.class)
-public class HashTag extends AbstractTwitterObject<HashTag> implements DomainObject<HashTag>,DomainObjectWithTask<HashTag> {
+public class HashTag extends AbstractDomainObject<HashTag> implements DomainObject<HashTag>,DomainObjectWithTask<HashTag> {
 
     private static final long serialVersionUID = 1L;
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     protected Long id;
 
-    @NotNull
-    @Embedded
-    private TaskInfo taskInfo  = new TaskInfo();
-
-    @NotNull
-    @JoinColumn(name = "fk_user_created_by")
-    @ManyToOne(cascade = { REFRESH, DETACH }, fetch = EAGER,optional = false)
-    private Task createdBy;
-
-    @JoinColumn(name = "fk_user_updated_by")
-    @ManyToOne(cascade = { REFRESH ,DETACH}, fetch = EAGER,optional = true)
-    private Task updatedBy;
-
     @SafeHtml
     @Column(name="text", nullable = false,length=4096)
     private String text = "";
 
     public HashTag(Task createdBy, Task updatedBy, String text) {
-        this.createdBy = createdBy;
-        this.updatedBy = updatedBy;
+        super(createdBy,updatedBy);
         this.text = text;
     }
 
-    public HashTag(String text, Task task) {
-        this.text = text;
-        this.createdBy = task;
-        this.updatedBy = task;
-        this.taskInfo.setTaskInfoFromTask(task);
-    }
-
     private HashTag() {
+        super();
     }
 
     public final static String HASHTAG_TEXT_PATTERN = "[öÖäÄüÜßa-zA-Z0-9_]{1,139}";
@@ -91,6 +71,11 @@ public void setId(Long id) {
         this.id = id;
     }
 
+    @Override
+    public String getUniqueId() {
+        return text;
+    }
+
 
     public String getText() {
         return this.text;
@@ -104,95 +89,38 @@ public void setText(String text) {
         this.text = text;
     }
 
-    public TaskInfo getTaskInfo() {
-        return taskInfo;
-    }
-
-    public void setTaskInfo(TaskInfo taskInfo) {
-        this.taskInfo = taskInfo;
-    }
-
-    public Task getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(Task createdBy) {
-        taskInfo.setTaskInfoFromTask(createdBy);
-        this.createdBy = createdBy;
-    }
-
-    public Task getUpdatedBy() {
-        return updatedBy;
+    @Override
+    public String toString() {
+        return "HashTag{" +
+                " id=" + id +
+                ", text='" + text + '\'' +
+                    super.toString() +
+                " }\n";
     }
 
-    public void setUpdatedBy(Task updatedBy) {
-        taskInfo.setTaskInfoFromTask(updatedBy);
-        this.updatedBy = updatedBy;
+    @Override
+    public boolean isValid() {
+        if((text == null)||(text.isEmpty())){
+            return false;
+        }
+        return true;
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof HashTag)) return false;
-        if (!super.equals(o)) return false;
 
         HashTag hashTag = (HashTag) o;
 
-        return text != null ? text.equals(hashTag.text) : hashTag.text == null;
+        if (getId() != null ? !getId().equals(hashTag.getId()) : hashTag.getId() != null) return false;
+        return getText() != null ? getText().equals(hashTag.getText()) : hashTag.getText() == null;
     }
 
     @Override
     public int hashCode() {
-        int result = super.hashCode();
-        result = 31 * result + (text != null ? text.hashCode() : 0);
+        int result = getId() != null ? getId().hashCode() : 0;
+        result = 31 * result + (getText() != null ? getText().hashCode() : 0);
         return result;
     }
-
-    @Override
-    public int compareTo(HashTag other) {
-        return text.compareTo(other.getText());
-    }
-
-    private String toStringCreatedBy(){
-        if(createdBy==null){
-            return " null ";
-        } else {
-            return createdBy.toString();
-        }
-    }
-
-    private String toStringUpdatedBy(){
-        if(updatedBy==null){
-            return " null ";
-        } else {
-            return updatedBy.toString();
-        }
-    }
-
-    private String toStringTaskInfo(){
-        if(taskInfo==null){
-            return " null ";
-        } else {
-            return taskInfo.toString();
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "HashTag{" +
-                " id=" + id +
-                ", text='" + text + '\'' +
-            ",\n createdBy="+ toStringCreatedBy() +
-            ",\n updatedBy=" + toStringUpdatedBy() +
-            ",\n taskInfo="+ toStringTaskInfo() +
-                " }\n";
-    }
-
-    @Override
-    public boolean isValid() {
-        if((text == null)||(text.isEmpty())){
-            return false;
-        }
-        return true;
-    }
 }