refactor(module-web,module-ejb): refactor code

.gitignore

@@ -1,50 +1,2 @@
-# Compiled source #
+/module-ejb/target/
-###################
+/module-web/target/
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-.classpath
-.project
-.settings
-~*
-*.idea
-*.iml
-MANIFEST.MF
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sqlite
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
-
-# Directory #
-#############
-bin/
-out/
-target/
-.vscode/launch.json

_gitignore

@@ -0,0 +1,50 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+.classpath
+.project
+.settings
+~*
+*.idea
+*.iml
+MANIFEST.MF
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Directory #
+#############
+bin/
+out/
+target/
+.vscode/launch.json

module-ejb/src/main/java/pl/myboardgames/boardgame/db/BoardGameDao.java

@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.db;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -8,6 +8,8 @@ import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+
 @Stateless
 public class BoardGameDao {
 

module-ejb/src/main/java/pl/myboardgames/boardgame/model/BoardGameEntity.java

@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.model;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -13,7 +13,7 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
-import pl.myboardgames.user.UserEntity;
+import pl.myboardgames.user.model.UserEntity;
 
 @Entity
 @Table(name = "boardgames")

module-ejb/src/main/java/pl/myboardgames/user/db/UserDao.java

@@ -1,7 +1,6 @@
-package pl.myboardgames.user;
+package pl.myboardgames.user.db;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
@@ -9,7 +8,8 @@ import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import pl.myboardgames.boardgame.BoardGameEntity;
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+import pl.myboardgames.user.model.UserEntity;
 
 @Stateless
 public class UserDao {

module-ejb/src/main/java/pl/myboardgames/user/model/UserEntity.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.model;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -15,7 +15,7 @@ import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
-import pl.myboardgames.boardgame.BoardGameEntity;
+import pl.myboardgames.boardgame.model.BoardGameEntity;
 
 /**
  *

module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameDto.java

@@ -3,12 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.dto;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-import pl.myboardgames.user.UserShortDto;
+
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+import pl.myboardgames.user.dto.UserShortDto;
 
 
 /**

module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameMapper.java

@@ -3,13 +3,15 @@
  * To change ret template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.dto;
+
+import pl.myboardgames.boardgame.model.BoardGameEntity;
 
 /**
  *
  * @author Nao
  */
-class BoardGameMapper {
+public class BoardGameMapper {
 
     public BoardGameMapper() {
     }

module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameShortDto.java

@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.dto;
+
+import pl.myboardgames.boardgame.model.BoardGameEntity;
 
 /**
  *

module-web/src/main/java/pl/myboardgames/boardgame/resources/BoardGameResource.java

@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame;
+package pl.myboardgames.boardgame.resources;
 
 import java.util.stream.Collectors;
 import javax.ejb.EJB;
@@ -13,9 +13,15 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
+import pl.myboardgames.boardgame.db.BoardGameDao;
+import pl.myboardgames.boardgame.dto.BoardGameDto;
+import pl.myboardgames.boardgame.dto.BoardGameMapper;
+import pl.myboardgames.boardgame.dto.BoardGameShortDto;
+import pl.myboardgames.boardgame.model.BoardGameEntity;
+
 @Path("/boardgame")
 @RequestScoped
-public class BoardGameController {
+public class BoardGameResource {
 
     @EJB
     BoardGameDao boardGameDatabase;

module-web/src/main/java/pl/myboardgames/user/dto/UserDto.java

@@ -3,13 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.dto;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import pl.myboardgames.boardgame.BoardGameShortDto;
+import pl.myboardgames.boardgame.dto.BoardGameShortDto;
+import pl.myboardgames.user.model.UserEntity;
 
 /**
  *

module-web/src/main/java/pl/myboardgames/user/dto/UserMapper.java

@@ -3,13 +3,15 @@
  * To change ret template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.dto;
+
+import pl.myboardgames.user.model.UserEntity;
 
 /**
  *
  * @author Nao
  */
-class UserMapper {
+public class UserMapper {
 
     public UserMapper() {
     }

module-web/src/main/java/pl/myboardgames/user/dto/UserShortDto.java

@@ -3,7 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user;
+package pl.myboardgames.user.dto;
+
+import pl.myboardgames.user.model.UserEntity;
 
 /**
  *

module-web/src/main/java/pl/myboardgames/user/resources/UserResource.java

@@ -1,4 +1,4 @@
-package pl.myboardgames.user;
+package pl.myboardgames.user.resources;
 
 import java.util.stream.Collectors;
 import javax.ejb.EJB;
@@ -12,11 +12,17 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
-import pl.myboardgames.boardgame.BoardGameShortDto;
+
+import pl.myboardgames.boardgame.dto.BoardGameShortDto;
+import pl.myboardgames.user.db.UserDao;
+import pl.myboardgames.user.dto.UserDto;
+import pl.myboardgames.user.dto.UserMapper;
+import pl.myboardgames.user.dto.UserShortDto;
+import pl.myboardgames.user.model.UserEntity;
 
 @Path("/user")
 @RequestScoped
-public class UserController {
+public class UserResource {
 
    @EJB
    UserDao userDatabase;