workin on #161

phasenraum2010 · phasenraum2010 · commit ac5493c81362 · 2017-07-31T01:02:52.000+02:00
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/MediaService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/MediaService.java
@@ -3,7 +3,6 @@
 import org.woehlke.twitterwall.oodm.entities.Media;
 import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithIdTwitter;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithUrl;
 
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/MentionService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/MentionService.java
@@ -7,7 +7,6 @@
 import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithIdTwitter;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithScreenName;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 
 
 /**
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/TaskHistoryService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/TaskHistoryService.java
@@ -11,13 +11,9 @@
  */
 public interface TaskHistoryService extends DomainObjectMinimalService<TaskHistory> {
 
-    TaskHistory store(TaskHistory domainObject);
-
-    TaskHistory create(TaskHistory domainObject);
-
-    TaskHistory update(TaskHistory domainObject);
-
     Page<TaskHistory> findByTask(Task oneTask, Pageable pageRequest);
 
     TaskHistory findById(long id);
+
+    TaskHistory store(TaskHistory domainObject);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/TickerSymbolService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/TickerSymbolService.java
@@ -2,7 +2,6 @@
 
 import org.woehlke.twitterwall.oodm.entities.TickerSymbol;
 import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithUrl;
 
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/TweetService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/TweetService.java
@@ -8,13 +8,12 @@
 import org.woehlke.twitterwall.oodm.entities.transients.*;
 import org.woehlke.twitterwall.oodm.service.common.DomainObjectWithEntitiesService;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithIdTwitter;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 
 
 /**
  * Created by tw on 10.06.17.
  */
-public interface TweetService extends DomainObjectWithEntitiesService<Tweet>,DomainServiceWithIdTwitter<Tweet>,DomainServiceWithTask<Tweet> {
+public interface TweetService extends DomainObjectWithEntitiesService<Tweet>,DomainServiceWithIdTwitter<Tweet> {
 
     Page<Tweet> findTweetsForHashTag(HashTag hashtag, Pageable pageRequest);
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/UrlCacheService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/UrlCacheService.java
@@ -1,12 +1,13 @@
 package org.woehlke.twitterwall.oodm.service;
 
 import org.woehlke.twitterwall.oodm.entities.UrlCache;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithUrl;
 
 /**
  * Created by tw on 23.06.17.
  */
-public interface UrlCacheService extends DomainServiceWithUrl<UrlCache>,DomainServiceWithTask<UrlCache> {
+public interface UrlCacheService extends DomainServiceWithUrl<UrlCache> {
+
+    void delete(UrlCache urlCache);
 
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/UserService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/UserService.java
@@ -6,9 +6,7 @@
 import org.woehlke.twitterwall.oodm.entities.User;
 import org.woehlke.twitterwall.oodm.entities.transients.*;
 import org.woehlke.twitterwall.oodm.service.common.DomainObjectWithEntitiesService;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithIdTwitter;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithScreenName;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 
 
 /**
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainObjectEntityService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainObjectEntityService.java
@@ -2,5 +2,5 @@
 
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
 
-public interface DomainObjectEntityService<T extends DomainObjectEntity> extends DomainServiceWithTask<T> {
+public interface DomainObjectEntityService<T extends DomainObjectEntity> {
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainObjectWithEntitiesService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainObjectWithEntitiesService.java
@@ -2,5 +2,5 @@
 
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithEntities;
 
-public interface DomainObjectWithEntitiesService<T extends DomainObjectWithEntities> extends DomainServiceWithIdTwitter<T>,DomainServiceWithTask<T> {
+public interface DomainObjectWithEntitiesService<T extends DomainObjectWithEntities> extends DomainServiceWithIdTwitter<T> {
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainService.java
@@ -1,10 +1,11 @@
 package org.woehlke.twitterwall.oodm.service.common;
 
+import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObject;
 
 /**
  * Created by tw on 24.06.17.
  */
 public interface DomainService<T extends DomainObject> extends DomainObjectMinimalService<T> {
-
+    T store(T domainObject, Task task);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainServiceWithScreenName.java b/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainServiceWithScreenName.java
@@ -5,9 +5,6 @@
 /**
  * Created by tw on 14.07.17.
  */
-
-//DomainServiceWithIdTwitter<T extends DomainObjectWithIdTwitter> extends DomainService<T>
-
 public interface DomainServiceWithScreenName<T extends DomainObjectWithScreenName> extends DomainService<T> {
 
     T findByScreenName(String screenName);
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainServiceWithTask.java b/src/main/java/org/woehlke/twitterwall/oodm/service/common/DomainServiceWithTask.java
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/DomainServiceWithTaskImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/DomainServiceWithTaskImpl.java
@@ -4,13 +4,17 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
 import org.woehlke.twitterwall.oodm.repositories.TaskRepository;
 import org.woehlke.twitterwall.oodm.repositories.common.DomainRepository;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
+import org.woehlke.twitterwall.oodm.service.common.DomainService;
 
-public abstract class DomainServiceWithTaskImpl<T extends DomainObjectWithTask> implements DomainServiceWithTask<T> {
+
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
+public abstract class DomainServiceWithTaskImpl<T extends DomainObjectWithTask> implements DomainService<T> {
 
     private static final Logger log = LoggerFactory.getLogger(DomainServiceWithTaskImpl.class);
 
@@ -39,6 +43,7 @@ public long count() {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public T store(T domainObject, Task task) {
         String msg = "store "+domainObject.getUniqueId()+" in Task "+task.getUniqueId()+" ";
         T domainObjectResult = null;
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/HashTagServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/HashTagServiceImpl.java
@@ -15,7 +15,7 @@
  * Created by tw on 12.06.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class HashTagServiceImpl extends DomainServiceWithTaskImpl<HashTag> implements HashTagService {
 
     private static final Logger log = LoggerFactory.getLogger(HashTagServiceImpl.class);
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/MediaServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/MediaServiceImpl.java
@@ -15,7 +15,7 @@
  * Created by tw on 12.06.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class MediaServiceImpl extends DomainServiceWithTaskImpl<Media> implements MediaService {
 
     private static final Logger log = LoggerFactory.getLogger(MediaServiceImpl.class);
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/MentionServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/MentionServiceImpl.java
@@ -21,7 +21,7 @@
  * Created by tw on 12.06.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class MentionServiceImpl extends DomainServiceWithTaskImpl<Mention> implements MentionService {
 
     private static final Logger log = LoggerFactory.getLogger(MentionServiceImpl.class);
@@ -48,6 +48,7 @@ public Mention findByScreenName(String screenName) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Mention createProxyMention(Mention mention, Task task) {
         long lowestIdTwitter = 0;
         int page = 0;
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TaskHistoryServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TaskHistoryServiceImpl.java
@@ -11,43 +11,30 @@
 import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.entities.TaskHistory;
 import org.woehlke.twitterwall.oodm.repositories.TaskHistoryRepository;
-import org.woehlke.twitterwall.oodm.repositories.TaskRepository;
 import org.woehlke.twitterwall.oodm.service.TaskHistoryService;
 
 /**
  * Created by tw on 11.07.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class TaskHistoryServiceImpl implements TaskHistoryService {
 
     private static final Logger log = LoggerFactory.getLogger(TaskHistoryServiceImpl.class);
 
     private final TaskHistoryRepository taskHistoryRepository;
 
-    private final TaskRepository taskRepository;
-
     @Autowired
-    public TaskHistoryServiceImpl(TaskHistoryRepository taskHistoryRepository, TaskRepository taskRepository) {
+    public TaskHistoryServiceImpl(TaskHistoryRepository taskHistoryRepository) {
         this.taskHistoryRepository = taskHistoryRepository;
-        this.taskRepository = taskRepository;
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public TaskHistory store(TaskHistory domainObject) {
         return taskHistoryRepository.save(domainObject);
     }
 
-    @Override
-    public TaskHistory create(TaskHistory domainObject) {
-        return taskHistoryRepository.save(domainObject);
-    }
-
-    @Override
-    public TaskHistory update(TaskHistory domainObject) {
-        return taskHistoryRepository.save(domainObject);
-    }
-
     @Override
     public Page<TaskHistory> getAll(Pageable pageRequest) {
         return taskHistoryRepository.findAll(pageRequest);
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TaskServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TaskServiceImpl.java
@@ -23,7 +23,7 @@
  * Created by tw on 09.07.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class TaskServiceImpl implements TaskService {
 
     private static final Logger log = LoggerFactory.getLogger(TaskServiceImpl.class);
@@ -59,6 +59,7 @@ public Task findByUniqueId(Task example) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task create(String msg,TaskType type,CountedEntities countedEntities) {
         Task task = new Task("start: "+msg,type);
         task.setTaskStatus(TaskStatus.RUNNING);
@@ -73,6 +74,7 @@ public Task create(String msg,TaskType type,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task done(Task task,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.FINISHED);
         task.setTimeLastUpdate(new Date());
@@ -86,6 +88,7 @@ public Task done(Task task,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task error(Task task,Exception e,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.ERROR);
         task.setTimeLastUpdate(new Date());
@@ -99,6 +102,7 @@ public Task error(Task task,Exception e,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task error(Task task, Exception e, String msg,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.ERROR);
         task.setTimeLastUpdate(new Date());
@@ -112,6 +116,7 @@ public Task error(Task task, Exception e, String msg,CountedEntities countedEnti
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task warn(Task task, Exception e,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.WARN);
         task.setTimeLastUpdate(new Date());
@@ -125,6 +130,7 @@ public Task warn(Task task, Exception e,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task warn(Task task, Exception e, String msg,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.WARN);
         task.setTimeLastUpdate(new Date());
@@ -150,6 +156,7 @@ public Task event(Task task, String msg,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task warn(Task task, String msg,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.WARN);
         task.setTimeLastUpdate(new Date());
@@ -163,6 +170,7 @@ public Task warn(Task task, String msg,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task error(Task task, String msg,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.ERROR);
         task.setTimeLastUpdate(new Date());
@@ -176,6 +184,7 @@ public Task error(Task task, String msg,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task start(Task task,CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.RUNNING);
         task.setTimeLastUpdate(new Date());
@@ -189,6 +198,7 @@ public Task start(Task task,CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task finalError(Task task, String msg, CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.ERROR);
         task.setTimeLastUpdate(new Date());
@@ -202,6 +212,7 @@ public Task finalError(Task task, String msg, CountedEntities countedEntities) {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task done(String logMsg, Task task, CountedEntities countedEntities) {
         task.setTaskStatus(TaskStatus.FINISHED);
         task.setTimeLastUpdate(new Date());
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TickerSymbolServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TickerSymbolServiceImpl.java
@@ -16,7 +16,7 @@
  * Created by tw on 12.06.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class TickerSymbolServiceImpl extends DomainServiceWithTaskImpl<TickerSymbol> implements TickerSymbolService {
 
     private static final Logger log = LoggerFactory.getLogger(TickerSymbolServiceImpl.class);
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TweetServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/TweetServiceImpl.java
@@ -21,7 +21,7 @@
  * Created by tw on 10.06.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class TweetServiceImpl extends DomainServiceWithTaskImpl<Tweet> implements TweetService {
 
     private static final Logger log = LoggerFactory.getLogger(TweetServiceImpl.class);
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/UrlCacheServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/UrlCacheServiceImpl.java
@@ -16,7 +16,7 @@
  * Created by tw on 23.06.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UrlCacheServiceImpl extends DomainServiceWithTaskImpl<UrlCache> implements UrlCacheService {
 
     private static final Logger log = LoggerFactory.getLogger(TickerSymbolServiceImpl.class);
@@ -41,4 +41,9 @@ public UrlCache findByUrl(String url) {
     public UrlCache findByUniqueId(UrlCache example) {
         return this.urlCacheRepository.findByUniqueId(example);
     }
+
+    @Override
+    public void delete(UrlCache urlCache) {
+        this.urlCacheRepository.delete(urlCache);
+    }
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/UrlServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/UrlServiceImpl.java
@@ -15,7 +15,7 @@
  * Created by tw on 12.06.17.
  */
 @Service
-@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
+@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
 public class UrlServiceImpl extends DomainServiceWithTaskImpl<Url> implements UrlService {
 
     private static final Logger log = LoggerFactory.getLogger(UrlServiceImpl.class);
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/impl/UserServiceImpl.java b/src/main/java/org/woehlke/twitterwall/oodm/service/impl/UserServiceImpl.java
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/CreatePersistentUrlImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/CreatePersistentUrlImpl.java
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/StoreEntitiesProcessImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/StoreEntitiesProcessImpl.java
diff --git a/src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/StoreUserProcessImpl.java b/src/main/java/org/woehlke/twitterwall/scheduled/service/persist/impl/StoreUserProcessImpl.java

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;`
`4`	`4`
`5`		`-public interface DomainObjectEntityService<T extends DomainObjectEntity> extends DomainServiceWithTask<T> {`
	`5`	`+public interface DomainObjectEntityService<T extends DomainObjectEntity> {`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`
`3`	`3`	`import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithEntities;`
`4`	`4`
`5`		`-public interface DomainObjectWithEntitiesService<T extends DomainObjectWithEntities> extends DomainServiceWithIdTwitter<T>,DomainServiceWithTask<T> {`
	`5`	`+public interface DomainObjectWithEntitiesService<T extends DomainObjectWithEntities> extends DomainServiceWithIdTwitter<T> {`
`6`	`6`	`}`