Merge branch 'master' of https://github.com/phasenraum2010/twitterwall2

* 'master' of https://github.com/phasenraum2010/twitterwall2:
  after release
  working on #228, working on #225, working on #42, working on #230
  working on #228, working on #225, working on #42, working on #230
  working on #228, working on #225, working on #42, working on #230
  working on #228, working on #225, working on #42, working on #230
  Update TaskController.java

Author: phasenraum2010

.gitignore

@@ -12,6 +12,8 @@ buildNumber.properties
 !/.mvn/wrapper/maven-wrapper.jar
 
 .idea
+todo.txt
+tw.txt
 twitterwall.log
 twitterwall.log*
 maven-build.log

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.woehlke.twitterwall</groupId>
     <artifactId>twitterwall2</artifactId>
-    <version>1.0.24-SNAPSHOT</version>
+    <version>1.0.25-SNAPSHOT</version>
     <name>twitterwall2</name>
 
     <description>Twitterwall with spring:boot for heroku</description>

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

@@ -39,6 +39,18 @@ public String managementPage(Model model) {
         return "application/management";
     }
 
+    @RequestMapping(path="/domain/delete/all")
+    public String domainDeleteAll(Model model) {
+        String msg = "/application/domain/delete/all: ";
+        String title = "Counted Entities";
+        String subtitle = twitterProperties.getSearchQuery();
+        String symbol = Symbols.DATABASE.toString();
+        model = controllerHelper.setupPage(model,title,subtitle,symbol);
+        CountedEntities countedEntities =this.countedEntitiesService.deleteAll();
+        model.addAttribute("countedEntities", countedEntities);
+        return "application/domain/count";
+    }
+
     private final CountedEntitiesService countedEntitiesService;
 
     private final ControllerHelper controllerHelper;

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

@@ -173,7 +173,7 @@ public String updateUserProfilesStartTask(Model model) {
 
     private static final Logger log = LoggerFactory.getLogger(TaskController.class);
 
-    private final String PATH = "/task";
+    private final String PATH = "task";
 
     private final UserService userService;
 

src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/TaskRepositoryCustom.java

@@ -6,4 +6,7 @@
 public interface TaskRepositoryCustom extends DomainObjectMinimalRepository<Task> {
 
     Task findByUniqueId(Task domainObject);
+
+    void deleteAllDomainData();
+
 }

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

@@ -1,22 +1,27 @@
 package org.woehlke.twitterwall.oodm.repositories.custom.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.repositories.custom.TaskRepositoryCustom;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
+import javax.sql.DataSource;
 import java.util.List;
 
 @Repository
 public class TaskRepositoryImpl implements TaskRepositoryCustom {
 
     private final EntityManager entityManager;
 
+    private JdbcTemplate jdbcTemplate;
+
     @Autowired
-    public TaskRepositoryImpl(EntityManager entityManager) {
+    public TaskRepositoryImpl(EntityManager entityManager,DataSource dataSource) {
         this.entityManager = entityManager;
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
     @Override
@@ -32,4 +37,35 @@ public Task findByUniqueId(Task domainObject) {
             return null;
         }
     }
+
+    @Override
+    public void deleteAllDomainData() {
+
+        String SQL_DELETE_ALL_ROWS[] = {
+            "delete from userprofile_url",
+            "delete from userprofile_mention",
+            "delete from userprofile_hashtag",
+            "delete from userprofile_media",
+            "delete from userprofile_tickersymbol",
+            "delete from tweet_tickersymbol",
+            "delete from tweet_mention",
+            "delete from tweet_media",
+            "delete from tweet_hashtag",
+            "delete from tweet_url",
+            "delete from url_cache",
+            "delete from url",
+            "delete from tickersymbol",
+            "delete from mention",
+            "delete from media",
+            "delete from hashtag",
+            "delete from tweet",
+            "delete from userprofile",
+            "delete from task_history",
+            "delete from task"
+        };
+
+        for(String SQL : SQL_DELETE_ALL_ROWS){
+            jdbcTemplate.execute(SQL);
+        }
+    }
 }

src/main/java/org/woehlke/twitterwall/oodm/service/CountedEntitiesService.java

@@ -12,4 +12,7 @@ public interface CountedEntitiesService {
     long countTweets();
 
     long countUsers();
+
+    CountedEntities deleteAll();
+
 }

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

@@ -72,6 +72,13 @@ public long countUsers() {
         return userRepository.count();
     }
 
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+    public CountedEntities deleteAll() {
+        taskRepository.deleteAllDomainData();
+        return this.countAll();
+    }
+
     private static final Logger log = LoggerFactory.getLogger(CountedEntitiesServiceImpl.class);
 
     private final TweetRepository tweetRepository;

src/main/resources/application.yml

@@ -18,8 +18,6 @@ info:
     groupId: @project.groupId@
     name: @project.name@
     version: @project.version@
-logging:
-  file: test/twitterwall.log.txt
 management:
   address: 127.0.0.1
   context-path: "/manage"
@@ -33,14 +31,14 @@ spring:
   datasource:
     driverClassName: org.postgresql.Driver
     #initialSize: 5
-    max-total: 70
-    maxActive: 60
+    max-total: 20
+    maxActive: 20
     #maxIdle: 5
     #minIdle: 2
     platform: POSTGRESQL
     #removeAbandoned: true
     tomcat:
-      max-active: 60
+      max-active: 20
       #max-wait: 100000
       #test-on-borrow: true
     url: ${DATABASE_URL}

src/main/resources/templates/application/management.html

@@ -19,6 +19,11 @@ <h3>Your Options:</h3>
                             <span>Count Entities</span>
                         </a>
                         <hr class="divider" role="separator"  />
+                        <a class="list-group-item" href="/application/domain/delete/all" th:href="@{/application/domain/delete/all}">
+                            <i class="fa fa-database" aria-hidden="true"></i>
+                            <span>Delete All Entities</span>
+                        </a>
+                        <hr class="divider" role="separator"  />
                         <a class="list-group-item" href="/user/all" th:href="@{/user/all}">
                             <i class="fa fa-user" aria-hidden="true"></i>
                             <span>List All Users</span>