closes #176 #179

justinhrobbins · Feb 17, 2015 · 14b47f6 · 14b47f6
1 parent 9078f89
commit 14b47f6
Show file tree

Hide file tree

Showing 116 changed files with 660 additions and 592 deletions.
diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java
@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FlashcardFacade extends GenericCrudFacade<FlashCardDto>
+public interface FlashcardFacade extends GenericCrudFacade<FlashCardDto, String>
 {
     List<FlashCardDto> findByTagsIn(final Set<TagDto> tags) throws FlashcardsException;
     List<FlashCardDto> findByTagsIn(final Set<TagDto> tags, final PageRequest page)
@@ -19,5 +19,5 @@ List<FlashCardDto> findByTagsIn(final Set<TagDto> tags, final PageRequest page)
     List<FlashCardDto> findByQuestionLike(final String question, final PageRequest page)
             throws FlashcardsException;
     FlashCardDto findByQuestion(final String question) throws FlashcardsException;
-    List<FlashCardDto> findFlashcardsForTag(final Long tagId, final Set<String> fields) throws FlashcardsException;
+    List<FlashCardDto> findFlashcardsForTag(final String tagId, final Set<String> fields) throws FlashcardsException;
 }
diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/TagFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/TagFacade.java
@@ -9,8 +9,8 @@
 import java.util.List;
 import java.util.Set;
 
-public interface TagFacade extends GenericCrudFacade<TagDto> {
+public interface TagFacade extends GenericCrudFacade<TagDto, String> {
 
     TagDto findByName(final String name) throws FlashcardsException;
-    List<TagDto> findTagsForFlashcard(final Long flashcardId, final Set<String> fields) throws FlashcardsException;
+    List<TagDto> findTagsForFlashcard(final String flashcardId, final Set<String> fields) throws FlashcardsException;
 }
diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/UserFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/UserFacade.java
@@ -5,7 +5,7 @@
 import org.robbins.flashcards.exceptions.FlashcardsException;
 import org.robbins.flashcards.facade.base.GenericCrudFacade;
 
-public interface UserFacade extends GenericCrudFacade<UserDto> {
+public interface UserFacade extends GenericCrudFacade<UserDto, String> {
 
     UserDto findUserByOpenid(String openid) throws FlashcardsException;
 }
diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/base/GenericCrudFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/base/GenericCrudFacade.java
@@ -6,17 +6,17 @@
 import java.util.List;
 import java.util.Set;
 
-public interface GenericCrudFacade<D> {
+public interface GenericCrudFacade<D, ID> {
 
     List<D> list() throws FlashcardsException;
     List<D> list(Integer page, Integer size, String sort, String direction)
             throws FlashcardsException;
     List<D> list(Integer page, Integer size, String sort, String direction,
             Set<String> fields) throws FlashcardsException;
     Long count();
-    D findOne(Long id) throws FlashcardsException;
-    D findOne(Long id, Set<String> fields) throws FlashcardsException;
-    D save(D entity) throws FlashcardsException;
-    void delete(Long id);
-    List<D> findByCreatedBy(final Long userId, final Set<String> fields) throws FlashcardsException;
+    D findOne(final ID id) throws FlashcardsException;
+    D findOne(final ID id, Set<String> fields) throws FlashcardsException;
+    D save(final D entity) throws FlashcardsException;
+    void delete(final ID id);
+    List<D> findByCreatedBy(final ID userId, final Set<String> fields) throws FlashcardsException;
 }
diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/AbstractCrudClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/AbstractCrudClient.java
@@ -12,7 +12,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.HttpClientErrorException;
 
-public abstract class AbstractCrudClient<E extends AbstractPersistableDto> extends AbstractClient implements GenericRestCrudFacade<E> {
+public abstract class AbstractCrudClient<E extends AbstractPersistableDto, ID> extends AbstractClient implements GenericRestCrudFacade<E, ID> {
 
     /**
      * Gets the entity list url.
@@ -83,7 +83,7 @@ public List<E> list() {
     }
 
     @Override
-    public List<E> list(Integer page, Integer size, String sort, String direction, Set<String> fields) {
+    public List<E> list(final Integer page, final Integer size, final String sort, final String direction, final Set<String> fields) {
         // set the Authentication header
         @SuppressWarnings({ "unchecked", "rawtypes" })
         final HttpEntity httpEntity = new HttpEntity(getAuthHeaders());
@@ -96,7 +96,7 @@ public List<E> list(Integer page, Integer size, String sort, String direction, S
     }
 
     @Override
-    public List<E> list(Integer page, Integer size, String sort, String direction) {
+    public List<E> list(final Integer page, final Integer size, final String sort, final String direction) {
         return list(page, size, sort, direction, null);
     }
 
@@ -115,12 +115,12 @@ public Long count() {
     }
 
     @Override
-    public E findOne(Long id) {
+    public E findOne(final ID id) {
         return findOne(id, null);
     }
 
     @Override
-    public E findOne(Long id, Set<String> fields) {
+    public E findOne(final ID id, Set<String> fields) {
         // set the Authentication header
         @SuppressWarnings({ "unchecked", "rawtypes" })
         final HttpEntity httpEntity = new HttpEntity(getAuthHeaders());
@@ -134,7 +134,7 @@ public E findOne(Long id, Set<String> fields) {
     }
 
     @Override
-    public E save(E entity) throws ServiceException {
+    public E save(final E entity) throws ServiceException {
         // set the Authentication header
         @SuppressWarnings({ "unchecked", "rawtypes" })
         final HttpEntity httpEntity = new HttpEntity(entity, getAuthHeaders());
@@ -152,7 +152,7 @@ public E save(E entity) throws ServiceException {
     }
 
     @Override
-    public void delete(Long id) {
+    public void delete(final ID id) {
         final HttpHeaders httpHeaders = getAuthHeaders();
         httpHeaders.set("Accept", "application/json");
 
@@ -167,7 +167,7 @@ public void delete(Long id) {
     }
 
     @Override
-    public void update(E entity) {
+    public void update(final E entity) {
         final  HttpHeaders httpHeaders = getAuthHeaders();
         httpHeaders.set("Accept", "application/json");
 
@@ -181,7 +181,7 @@ public void update(E entity) {
     }
 
     @Override
-    public void put(E entity) {
+    public void put(final E entity) {
         final  HttpHeaders httpHeaders = getAuthHeaders();
         httpHeaders.set("Accept", "application/json");
 
@@ -195,7 +195,7 @@ public void put(E entity) {
     }
 
     @Override
-    public List<E> findByCreatedBy(Long userId, Set<String> fields) throws FlashcardsException {
+    public List<E> findByCreatedBy(final ID userId, final Set<String> fields) throws FlashcardsException {
         Map<String, String> uriVariables = new HashMap<String, String>();
         uriVariables.put("userId", String.valueOf(userId));
         return Arrays.asList(searchEntities(getEntityListUrl(), uriVariables, getClazzArray()));

diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java
@@ -12,7 +12,7 @@
 
 
 @Component
-public class DefaultFlashcardClient extends AbstractCrudClient<FlashCardDto> implements FlashcardClient {
+public class DefaultFlashcardClient extends AbstractCrudClient<FlashCardDto, String> implements FlashcardClient {
     @Override
     public String getEntityListUrl() {
         return getServerAddress() + ResourceUrls.flashCards;
@@ -124,7 +124,7 @@ public FlashCardDto findByQuestion(final String question) throws ServiceExceptio
     }
 
     @Override
-    public List<FlashCardDto> findFlashcardsForTag(Long tagId, Set<String> fields) throws FlashcardsException {
+    public List<FlashCardDto> findFlashcardsForTag(String tagId, Set<String> fields) throws FlashcardsException {
         Map<String, String> uriVariables = new HashMap<String, String>();
         uriVariables.put("tagId", String.valueOf(tagId));
         return Arrays.asList(searchEntities(getServerAddress() + ResourceUrls.flashcardsForTag, uriVariables, FlashCardDto[].class));

diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultTagClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultTagClient.java
@@ -8,7 +8,7 @@
 import java.util.*;
 
 @Component
-public class DefaultTagClient extends AbstractCrudClient<TagDto> implements TagClient {
+public class DefaultTagClient extends AbstractCrudClient<TagDto, String> implements TagClient {
 
     @Override
     public String getEntityListUrl() {
@@ -61,7 +61,7 @@ public TagDto findByName(final String name) throws ServiceException {
     }
 
     @Override
-    public List<TagDto> findTagsForFlashcard(final Long flashcardId, final Set<String> fields) {
+    public List<TagDto> findTagsForFlashcard(final String flashcardId, final Set<String> fields) {
         Map<String, String> uriVariables = new HashMap<String, String>();
         uriVariables.put("flashcardId", String.valueOf(flashcardId));
         return Arrays.asList(searchEntities(getServerAddress() + ResourceUrls.tagsForFlashcard, uriVariables, TagDto[].class));

diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultUserClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultUserClient.java
@@ -9,7 +9,7 @@
 import java.util.Map;
 
 @Component
-public class DefaultUserClient extends AbstractCrudClient<UserDto> implements UserClient {
+public class DefaultUserClient extends AbstractCrudClient<UserDto, String> implements UserClient {
 
     @Override
     public String getEntityListUrl() {

diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java
@@ -3,5 +3,5 @@
 import org.robbins.flashcards.dto.FlashCardDto;
 import org.robbins.flashcards.facade.FlashcardFacade;
 
-public interface FlashcardClient extends FlashcardFacade, GenericRestCrudFacade<FlashCardDto> {
+public interface FlashcardClient extends FlashcardFacade, GenericRestCrudFacade<FlashCardDto, String> {
 }
diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/GenericRestCrudFacade.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/GenericRestCrudFacade.java
@@ -3,9 +3,10 @@
 import org.robbins.flashcards.exceptions.ServiceException;
 import org.robbins.flashcards.facade.base.GenericCrudFacade;
 
+import java.net.IDN;
 import java.util.Map;
 
-public interface GenericRestCrudFacade<E> extends GenericCrudFacade<E>, GenericClient {
+public interface GenericRestCrudFacade<E, ID> extends GenericCrudFacade<E, ID>, GenericClient {
 
     void put(E entity) throws ServiceException;
     void update(E entity) throws ServiceException;

diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/TagClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/TagClient.java
@@ -3,5 +3,5 @@
 import org.robbins.flashcards.dto.TagDto;
 import org.robbins.flashcards.facade.TagFacade;
 
-public interface TagClient extends TagFacade, GenericRestCrudFacade<TagDto> {
+public interface TagClient extends TagFacade, GenericRestCrudFacade<TagDto, String> {
 }
diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/UserClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/UserClient.java
@@ -3,5 +3,5 @@
 import org.robbins.flashcards.dto.UserDto;
 import org.robbins.flashcards.facade.UserFacade;
 
-public interface UserClient extends UserFacade, GenericRestCrudFacade<UserDto> {
+public interface UserClient extends UserFacade, GenericRestCrudFacade<UserDto, String> {
 }
diff --git a/FlashCards_DTO/pom.xml b/FlashCards_DTO/pom.xml
@@ -41,5 +41,18 @@
     </dependencies>
     <build>
         <finalName>FlashCards_DTO</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/AbstractPersistableDto.java b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/AbstractPersistableDto.java
@@ -1,22 +1,21 @@
 
 package org.robbins.flashcards.dto;
 
-import org.springframework.data.domain.Persistable;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.data.domain.Persistable;
 
-public abstract class AbstractPersistableDto implements Persistable<Long> {
+public abstract class AbstractPersistableDto implements Persistable<String> {
 
     private static final long serialVersionUID = -7383983165721894674L;
 
-    private Long id;
+    private String id;
 
     @Override
-    public Long getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(final Long id) {
+    public void setId(final String id) {
         this.id = id;
     }
 

diff --git a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/FlashCardDto.java b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/FlashCardDto.java
@@ -1,20 +1,19 @@
 
 package org.robbins.flashcards.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(value = Include.NON_NULL)
 @XmlRootElement(name = "flashcard")
@@ -34,7 +33,7 @@ public class FlashCardDto extends AbstractAuditableDto implements Serializable {
     public FlashCardDto() {
     }
 
-    public FlashCardDto(final Long flashCardId) {
+    public FlashCardDto(final String flashCardId) {
         setId(flashCardId);
     }
 

diff --git a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/TagDto.java b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/TagDto.java
@@ -1,17 +1,16 @@
 
 package org.robbins.flashcards.dto;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(value = Include.NON_NULL)
@@ -28,14 +27,10 @@ public class TagDto extends AbstractAuditableDto implements Serializable {
     public TagDto() {
     }
 
-    public TagDto(final Long id) {
+    public TagDto(final String id) {
         setId(id);
     }
 
-    public TagDto(final String name) {
-        this.name = name;
-    }
-
     public String getName() {
         return this.name;
     }

diff --git a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/UserDto.java b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/UserDto.java
@@ -1,16 +1,15 @@
 
 package org.robbins.flashcards.dto;
 
-import java.io.Serializable;
-import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import java.io.Serializable;
+import java.util.Date;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(value = Include.NON_NULL)
@@ -41,7 +40,7 @@ public class UserDto extends AbstractPersistableDto implements Serializable {
     public UserDto() {
     }
 
-    public UserDto(final Long userId) {
+    public UserDto(final String userId) {
         setId(userId);
     }