working on #157

phasenraum2010 · phasenraum2010 · commit 12bae5e78be4 · 2017-07-29T14:46:00.000+02:00
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/UserController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/UserController.java
@@ -143,7 +143,7 @@ public String getNotYetFriendUsers(
         String symbol = Symbols.USER_NOT_YET_FRIENDS.toString();
         String title = "Not Yet Friends";
         model = controllerHelper.setupPage(model, title, subtitle, symbol);
-        return "user/list/notyetfriends";
+        return "user/list/friendsNotYet";
     }
 
     @RequestMapping("/list/friends")
@@ -199,7 +199,7 @@ public String getNotYetOnList(
         String symbol = Symbols.USER_NOT_YET_ON_LIST.toString();
         String title = "Not Yet On List";
         model = controllerHelper.setupPage(model, title, subtitle, symbol);
-        return "user/list/notyetonlist";
+        return "user/list/onlistNotYet";
     }
 
     @RequestMapping("/list/onlist")
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/entities/HashTag.java b/src/main/java/org/woehlke/twitterwall/oodm/entities/HashTag.java
@@ -1,6 +1,7 @@
 package org.woehlke.twitterwall.oodm.entities;
 
 import org.hibernate.validator.constraints.SafeHtml;
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
 import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
@@ -27,7 +28,7 @@
     )
 })
 @EntityListeners(HashTagListener.class)
-public class HashTag extends AbstractDomainObject<HashTag> implements DomainObject<HashTag>,DomainObjectWithTask<HashTag> {
+public class HashTag extends AbstractDomainObject<HashTag> implements DomainObjectEntity<HashTag>, DomainObject<HashTag>,DomainObjectWithTask<HashTag> {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/entities/Media.java b/src/main/java/org/woehlke/twitterwall/oodm/entities/Media.java
@@ -2,6 +2,7 @@
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.constraints.URL;
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
 import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithIdTwitter;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
@@ -36,7 +37,7 @@
     )
 })
 @EntityListeners(MediaListener.class)
-public class Media extends AbstractDomainObject<Media> implements DomainObjectWithIdTwitter<Media>,DomainObjectWithUrl<Media>,DomainObjectWithTask<Media> {
+public class Media extends AbstractDomainObject<Media> implements DomainObjectEntity<Media>,DomainObjectWithIdTwitter<Media>,DomainObjectWithUrl<Media>,DomainObjectWithTask<Media> {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/entities/Mention.java b/src/main/java/org/woehlke/twitterwall/oodm/entities/Mention.java
@@ -1,6 +1,7 @@
 package org.woehlke.twitterwall.oodm.entities;
 
 import org.hibernate.validator.constraints.NotEmpty;
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
 import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithIdTwitter;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithScreenName;
@@ -37,7 +38,7 @@
     )
 })
 @EntityListeners(MentionListener.class)
-public class Mention extends AbstractDomainObject<Mention> implements DomainObjectWithIdTwitter<Mention>, DomainObjectWithScreenName<Mention>,DomainObjectWithTask<Mention> {
+public class Mention extends AbstractDomainObject<Mention> implements DomainObjectEntity<Mention>,DomainObjectWithIdTwitter<Mention>, DomainObjectWithScreenName<Mention>,DomainObjectWithTask<Mention> {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/entities/TickerSymbol.java b/src/main/java/org/woehlke/twitterwall/oodm/entities/TickerSymbol.java
@@ -3,6 +3,7 @@
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.constraints.SafeHtml;
 import org.hibernate.validator.constraints.URL;
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
 import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithUrl;
@@ -27,7 +28,7 @@
     )
 })
 @EntityListeners(TickerSymbolListener.class)
-public class TickerSymbol extends AbstractDomainObject<TickerSymbol> implements DomainObjectWithUrl<TickerSymbol>,DomainObjectWithTask<TickerSymbol> {
+public class TickerSymbol extends AbstractDomainObject<TickerSymbol> implements DomainObjectEntity<TickerSymbol>,DomainObjectWithUrl<TickerSymbol>,DomainObjectWithTask<TickerSymbol> {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/entities/Url.java b/src/main/java/org/woehlke/twitterwall/oodm/entities/Url.java
@@ -2,6 +2,7 @@
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.constraints.URL;
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
 import org.woehlke.twitterwall.oodm.entities.parts.AbstractDomainObject;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithTask;
 import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithUrl;
@@ -31,7 +32,7 @@
     )
 })
 @EntityListeners(UrlListener.class)
-public class Url extends AbstractDomainObject<Url> implements DomainObjectWithUrl<Url>,DomainObjectWithTask<Url> {
+public class Url extends AbstractDomainObject<Url> implements DomainObjectEntity<Url>,DomainObjectWithUrl<Url>,DomainObjectWithTask<Url> {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/entities/common/DomainObjectEntity.java b/src/main/java/org/woehlke/twitterwall/oodm/entities/common/DomainObjectEntity.java
@@ -0,0 +1,5 @@
+package org.woehlke.twitterwall.oodm.entities.common;
+
+public interface DomainObjectEntity<T extends DomainObjectEntity> extends DomainObjectWithTask<T>  {
+
+}
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/entities/common/DomainObjectWithEntities.java b/src/main/java/org/woehlke/twitterwall/oodm/entities/common/DomainObjectWithEntities.java
@@ -2,7 +2,7 @@
 
 import org.woehlke.twitterwall.oodm.entities.parts.Entities;
 
-public interface DomainObjectWithEntities<T extends DomainObjectWithEntities> extends DomainObjectWithIdTwitter<T>  {
+public interface DomainObjectWithEntities<T extends DomainObjectWithEntities> extends DomainObjectWithIdTwitter<T>,DomainObjectWithTask<T>  {
 
     void removeAllEntities();
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/common/DomainObjectEntityRepository.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/common/DomainObjectEntityRepository.java
@@ -0,0 +1,6 @@
+package org.woehlke.twitterwall.oodm.repositories.common;
+
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
+
+public interface DomainObjectEntityRepository<T extends DomainObjectEntity> extends DomainObjectMinimalRepository<T> {
+}
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/common/DomainObjectWithEntitiesRepository.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/common/DomainObjectWithEntitiesRepository.java
@@ -0,0 +1,6 @@
+package org.woehlke.twitterwall.oodm.repositories.common;
+
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithEntities;
+
+public interface DomainObjectWithEntitiesRepository<T extends DomainObjectWithEntities> extends DomainObjectMinimalRepository<T> {
+}
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/HashTagRepositoryCustom.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/HashTagRepositoryCustom.java
@@ -1,9 +1,9 @@
 package org.woehlke.twitterwall.oodm.repositories.custom;
 
 import org.woehlke.twitterwall.oodm.entities.HashTag;
-import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
+import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectEntityRepository;
 
-public interface HashTagRepositoryCustom extends DomainObjectMinimalRepository<HashTag> {
+public interface HashTagRepositoryCustom extends DomainObjectEntityRepository<HashTag> {
 
     HashTag findByUniqueId(HashTag domainObject);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/MediaRepositoryCustom.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/MediaRepositoryCustom.java
@@ -1,9 +1,9 @@
 package org.woehlke.twitterwall.oodm.repositories.custom;
 
 import org.woehlke.twitterwall.oodm.entities.Media;
-import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
+import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectEntityRepository;
 
-public interface MediaRepositoryCustom extends DomainObjectMinimalRepository<Media>{
+public interface MediaRepositoryCustom extends DomainObjectEntityRepository<Media> {
 
     Media findByUniqueId(Media domainObject);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/MentionRepositoryCustom.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/MentionRepositoryCustom.java
@@ -1,9 +1,9 @@
 package org.woehlke.twitterwall.oodm.repositories.custom;
 
 import org.woehlke.twitterwall.oodm.entities.Mention;
-import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
+import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectEntityRepository;
 
-public interface MentionRepositoryCustom extends DomainObjectMinimalRepository<Mention> {
+public interface MentionRepositoryCustom extends DomainObjectEntityRepository<Mention>  {
 
     Mention findByUniqueId(Mention domainObject);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/TickerSymbolRepositoryCustom.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/TickerSymbolRepositoryCustom.java
@@ -1,9 +1,9 @@
 package org.woehlke.twitterwall.oodm.repositories.custom;
 
 import org.woehlke.twitterwall.oodm.entities.TickerSymbol;
-import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
+import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectEntityRepository;
 
-public interface TickerSymbolRepositoryCustom extends DomainObjectMinimalRepository<TickerSymbol> {
+public interface TickerSymbolRepositoryCustom extends DomainObjectEntityRepository<TickerSymbol> {
 
     TickerSymbol findByUniqueId(TickerSymbol domainObject);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/TweetRepositoryCustom.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/TweetRepositoryCustom.java
@@ -4,9 +4,9 @@
 import org.springframework.data.domain.Pageable;
 import org.woehlke.twitterwall.oodm.entities.Tweet;
 import org.woehlke.twitterwall.oodm.entities.transients.*;
-import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
+import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectWithEntitiesRepository;
 
-public interface TweetRepositoryCustom extends DomainObjectMinimalRepository<Tweet> {
+public interface TweetRepositoryCustom extends DomainObjectWithEntitiesRepository<Tweet> {
 
     Tweet findByUniqueId(Tweet domainObject);
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/UrlRepositoryCustom.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/UrlRepositoryCustom.java
@@ -1,9 +1,9 @@
 package org.woehlke.twitterwall.oodm.repositories.custom;
 
 import org.woehlke.twitterwall.oodm.entities.Url;
-import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
+import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectEntityRepository;
 
-public interface UrlRepositoryCustom extends DomainObjectMinimalRepository<Url> {
+public interface UrlRepositoryCustom extends DomainObjectEntityRepository<Url> {
 
     Url findByUniqueId(Url domainObject);
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/UserRepositoryCustom.java b/src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/UserRepositoryCustom.java
@@ -4,9 +4,9 @@
 import org.springframework.data.domain.Pageable;
 import org.woehlke.twitterwall.oodm.entities.User;
 import org.woehlke.twitterwall.oodm.entities.transients.*;
-import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
+import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectWithEntitiesRepository;
 
-public interface UserRepositoryCustom extends DomainObjectMinimalRepository<User> {
+public interface UserRepositoryCustom extends DomainObjectWithEntitiesRepository<User> {
 
     User findByUniqueId(User domainObject);
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/HashTagService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/HashTagService.java
@@ -1,14 +1,14 @@
 package org.woehlke.twitterwall.oodm.service;
 
 import org.woehlke.twitterwall.oodm.entities.HashTag;
+import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
 import org.woehlke.twitterwall.oodm.service.common.DomainService;
-import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 
 
 /**
  * Created by tw on 12.06.17.
  */
-public interface HashTagService extends DomainService<HashTag>,DomainServiceWithTask<HashTag> {
+public interface HashTagService extends DomainService<HashTag>,DomainObjectEntityService<HashTag> {
 
     HashTag findByText(String text);
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/MediaService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/MediaService.java
@@ -1,6 +1,7 @@
 package org.woehlke.twitterwall.oodm.service;
 
 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;
@@ -9,6 +10,6 @@
 /**
  * Created by tw on 12.06.17.
  */
-public interface MediaService extends DomainServiceWithIdTwitter<Media>,DomainServiceWithUrl<Media>,DomainServiceWithTask<Media> {
+public interface MediaService extends DomainServiceWithIdTwitter<Media>,DomainServiceWithUrl<Media>,DomainObjectEntityService<Media> {
 
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/MentionService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/MentionService.java
@@ -4,6 +4,7 @@
 import org.springframework.data.domain.Pageable;
 import org.woehlke.twitterwall.oodm.entities.Task;
 import org.woehlke.twitterwall.oodm.entities.Mention;
+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;
@@ -12,7 +13,7 @@
 /**
  * Created by tw on 12.06.17.
  */
-public interface MentionService extends DomainServiceWithScreenName<Mention>,DomainServiceWithIdTwitter<Mention>,DomainServiceWithTask<Mention> {
+public interface MentionService extends DomainServiceWithScreenName<Mention>,DomainServiceWithIdTwitter<Mention>,DomainObjectEntityService<Mention> {
 
     Mention createProxyMention(Mention mention, Task task);
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/TickerSymbolService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/TickerSymbolService.java
@@ -1,13 +1,14 @@
 package org.woehlke.twitterwall.oodm.service;
 
 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;
 
 
 /**
  * Created by tw on 12.06.17.
  */
-public interface TickerSymbolService extends DomainServiceWithUrl<TickerSymbol>,DomainServiceWithTask<TickerSymbol> {
+public interface TickerSymbolService extends DomainServiceWithUrl<TickerSymbol>,DomainObjectEntityService<TickerSymbol> {
 
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/TweetService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/TweetService.java
@@ -6,14 +6,15 @@
 import org.woehlke.twitterwall.oodm.entities.Tweet;
 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.DomainServiceWithTask;
 
 
 /**
  * Created by tw on 10.06.17.
  */
-public interface TweetService extends DomainServiceWithIdTwitter<Tweet>,DomainServiceWithTask<Tweet> {
+public interface TweetService extends DomainObjectWithEntitiesService<Tweet>,DomainServiceWithIdTwitter<Tweet>,DomainServiceWithTask<Tweet> {
 
     Page<Tweet> findTweetsForHashTag(HashTag hashtag, Pageable pageRequest);
 
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/UrlService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/UrlService.java
@@ -1,13 +1,14 @@
 package org.woehlke.twitterwall.oodm.service;
 
 import org.woehlke.twitterwall.oodm.entities.Url;
+import org.woehlke.twitterwall.oodm.service.common.DomainObjectEntityService;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithTask;
 import org.woehlke.twitterwall.oodm.service.common.DomainServiceWithUrl;
 
 
 /**
  * Created by tw on 12.06.17.
  */
-public interface UrlService extends DomainServiceWithUrl<Url>,DomainServiceWithTask<Url> {
+public interface UrlService extends DomainObjectEntityService<Url>,DomainServiceWithUrl<Url> {
 
 }
diff --git a/src/main/java/org/woehlke/twitterwall/oodm/service/UserService.java b/src/main/java/org/woehlke/twitterwall/oodm/service/UserService.java
@@ -5,6 +5,7 @@
 import org.woehlke.twitterwall.oodm.entities.HashTag;
 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;
@@ -13,7 +14,7 @@
 /**
  * Created by tw on 11.06.17.
  */
-public interface UserService extends DomainServiceWithIdTwitter<User>,DomainServiceWithScreenName<User>,DomainServiceWithTask<User> {
+public interface UserService extends DomainObjectWithEntitiesService<User>,DomainServiceWithScreenName<User> {
 
     Page<User> getTweetingUsers(Pageable pageRequest);
 
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
@@ -0,0 +1,6 @@
+package org.woehlke.twitterwall.oodm.service.common;
+
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectEntity;
+
+public interface DomainObjectEntityService<T extends DomainObjectEntity> extends DomainServiceWithTask<T> {
+}
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
@@ -0,0 +1,6 @@
+package org.woehlke.twitterwall.oodm.service.common;
+
+import org.woehlke.twitterwall.oodm.entities.common.DomainObjectWithEntities;
+
+public interface DomainObjectWithEntitiesService<T extends DomainObjectWithEntities> extends DomainServiceWithIdTwitter<T>,DomainServiceWithTask<T> {
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package org.woehlke.twitterwall.oodm.entities.common;
++
 +public interface DomainObjectEntity<T extends DomainObjectEntity> extends DomainObjectWithTask<T>  {
++
 +}