From 8476fa70a14f8bde043ac4feb634ad5c0933072b Mon Sep 17 00:00:00 2001
From: Damian Pierzchalski <damian.pierzchalski@xdsnet.pl>
Date: Mon, 17 Dec 2018 15:47:14 +0100
Subject: [PATCH] refactor(module-web,module-ejb): again refactor

---
 .../{boardgame => }/db/BoardGameDao.java           |  4 ++--
 .../pl/myboardgames/{user => }/db/UserDao.java     |  6 +++---
 .../{boardgame => }/model/BoardGameEntity.java     |  3 +--
 .../myboardgames/{user => }/model/UserEntity.java  |  4 ++--
 .../{boardgame => }/dto/BoardGameDto.java          |  5 ++---
 .../{boardgame => }/dto/BoardGameMapper.java       |  4 ++--
 .../{boardgame => }/dto/BoardGameShortDto.java     |  4 ++--
 .../pl/myboardgames/{user => }/dto/UserDto.java    |  6 +++---
 .../pl/myboardgames/{user => }/dto/UserMapper.java |  4 ++--
 .../myboardgames/{user => }/dto/UserShortDto.java  |  4 ++--
 .../resources/BoardGameResource.java               | 12 ++++++------
 .../{user => }/resources/UserResource.java         | 14 +++++++-------
 12 files changed, 34 insertions(+), 36 deletions(-)
 rename module-ejb/src/main/java/pl/myboardgames/{boardgame => }/db/BoardGameDao.java (91%)
 rename module-ejb/src/main/java/pl/myboardgames/{user => }/db/UserDao.java (91%)
 rename module-ejb/src/main/java/pl/myboardgames/{boardgame => }/model/BoardGameEntity.java (96%)
 rename module-ejb/src/main/java/pl/myboardgames/{user => }/model/UserEntity.java (91%)
 rename module-web/src/main/java/pl/myboardgames/{boardgame => }/dto/BoardGameDto.java (88%)
 rename module-web/src/main/java/pl/myboardgames/{boardgame => }/dto/BoardGameMapper.java (87%)
 rename module-web/src/main/java/pl/myboardgames/{boardgame => }/dto/BoardGameShortDto.java (83%)
 rename module-web/src/main/java/pl/myboardgames/{user => }/dto/UserDto.java (88%)
 rename module-web/src/main/java/pl/myboardgames/{user => }/dto/UserMapper.java (86%)
 rename module-web/src/main/java/pl/myboardgames/{user => }/dto/UserShortDto.java (89%)
 rename module-web/src/main/java/pl/myboardgames/{boardgame => }/resources/BoardGameResource.java (87%)
 rename module-web/src/main/java/pl/myboardgames/{user => }/resources/UserResource.java (88%)

diff --git a/module-ejb/src/main/java/pl/myboardgames/boardgame/db/BoardGameDao.java b/module-ejb/src/main/java/pl/myboardgames/db/BoardGameDao.java
similarity index 91%
rename from module-ejb/src/main/java/pl/myboardgames/boardgame/db/BoardGameDao.java
rename to module-ejb/src/main/java/pl/myboardgames/db/BoardGameDao.java
index 8c24ee9..b774551 100644
--- a/module-ejb/src/main/java/pl/myboardgames/boardgame/db/BoardGameDao.java
+++ b/module-ejb/src/main/java/pl/myboardgames/db/BoardGameDao.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame.db;
+package pl.myboardgames.db;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -8,7 +8,7 @@ import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import pl.myboardgames.boardgame.model.BoardGameEntity;
+import pl.myboardgames.model.BoardGameEntity;
 
 @Stateless
 public class BoardGameDao {
diff --git a/module-ejb/src/main/java/pl/myboardgames/user/db/UserDao.java b/module-ejb/src/main/java/pl/myboardgames/db/UserDao.java
similarity index 91%
rename from module-ejb/src/main/java/pl/myboardgames/user/db/UserDao.java
rename to module-ejb/src/main/java/pl/myboardgames/db/UserDao.java
index ac94c9f..ead089a 100644
--- a/module-ejb/src/main/java/pl/myboardgames/user/db/UserDao.java
+++ b/module-ejb/src/main/java/pl/myboardgames/db/UserDao.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.user.db;
+package pl.myboardgames.db;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -8,8 +8,8 @@ import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import pl.myboardgames.boardgame.model.BoardGameEntity;
-import pl.myboardgames.user.model.UserEntity;
+import pl.myboardgames.model.BoardGameEntity;
+import pl.myboardgames.model.UserEntity;
 
 @Stateless
 public class UserDao {
diff --git a/module-ejb/src/main/java/pl/myboardgames/boardgame/model/BoardGameEntity.java b/module-ejb/src/main/java/pl/myboardgames/model/BoardGameEntity.java
similarity index 96%
rename from module-ejb/src/main/java/pl/myboardgames/boardgame/model/BoardGameEntity.java
rename to module-ejb/src/main/java/pl/myboardgames/model/BoardGameEntity.java
index 4618b2d..2db9b71 100644
--- a/module-ejb/src/main/java/pl/myboardgames/boardgame/model/BoardGameEntity.java
+++ b/module-ejb/src/main/java/pl/myboardgames/model/BoardGameEntity.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame.model;
+package pl.myboardgames.model;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -13,7 +13,6 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
-import pl.myboardgames.user.model.UserEntity;
 
 @Entity
 @Table(name = "boardgames")
diff --git a/module-ejb/src/main/java/pl/myboardgames/user/model/UserEntity.java b/module-ejb/src/main/java/pl/myboardgames/model/UserEntity.java
similarity index 91%
rename from module-ejb/src/main/java/pl/myboardgames/user/model/UserEntity.java
rename to module-ejb/src/main/java/pl/myboardgames/model/UserEntity.java
index 889725b..42b5ebb 100644
--- a/module-ejb/src/main/java/pl/myboardgames/user/model/UserEntity.java
+++ b/module-ejb/src/main/java/pl/myboardgames/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.model;
+package pl.myboardgames.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.model.BoardGameEntity;
+import pl.myboardgames.model.BoardGameEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameDto.java b/module-web/src/main/java/pl/myboardgames/dto/BoardGameDto.java
similarity index 88%
rename from module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameDto.java
rename to module-web/src/main/java/pl/myboardgames/dto/BoardGameDto.java
index 0aff455..b13ac5f 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameDto.java
+++ b/module-web/src/main/java/pl/myboardgames/dto/BoardGameDto.java
@@ -3,14 +3,13 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame.dto;
+package pl.myboardgames.dto;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import pl.myboardgames.boardgame.model.BoardGameEntity;
-import pl.myboardgames.user.dto.UserShortDto;
+import pl.myboardgames.model.BoardGameEntity;
 
 
 /**
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameMapper.java b/module-web/src/main/java/pl/myboardgames/dto/BoardGameMapper.java
similarity index 87%
rename from module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameMapper.java
rename to module-web/src/main/java/pl/myboardgames/dto/BoardGameMapper.java
index ce0053a..70c8702 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameMapper.java
+++ b/module-web/src/main/java/pl/myboardgames/dto/BoardGameMapper.java
@@ -3,9 +3,9 @@
  * To change ret template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame.dto;
+package pl.myboardgames.dto;
 
-import pl.myboardgames.boardgame.model.BoardGameEntity;
+import pl.myboardgames.model.BoardGameEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameShortDto.java b/module-web/src/main/java/pl/myboardgames/dto/BoardGameShortDto.java
similarity index 83%
rename from module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameShortDto.java
rename to module-web/src/main/java/pl/myboardgames/dto/BoardGameShortDto.java
index 52fa5a1..180567c 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/dto/BoardGameShortDto.java
+++ b/module-web/src/main/java/pl/myboardgames/dto/BoardGameShortDto.java
@@ -3,9 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.boardgame.dto;
+package pl.myboardgames.dto;
 
-import pl.myboardgames.boardgame.model.BoardGameEntity;
+import pl.myboardgames.model.BoardGameEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/user/dto/UserDto.java b/module-web/src/main/java/pl/myboardgames/dto/UserDto.java
similarity index 88%
rename from module-web/src/main/java/pl/myboardgames/user/dto/UserDto.java
rename to module-web/src/main/java/pl/myboardgames/dto/UserDto.java
index ad73f18..0a0094b 100644
--- a/module-web/src/main/java/pl/myboardgames/user/dto/UserDto.java
+++ b/module-web/src/main/java/pl/myboardgames/dto/UserDto.java
@@ -3,14 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user.dto;
+package pl.myboardgames.dto;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import pl.myboardgames.boardgame.dto.BoardGameShortDto;
-import pl.myboardgames.user.model.UserEntity;
+import pl.myboardgames.dto.BoardGameShortDto;
+import pl.myboardgames.model.UserEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/user/dto/UserMapper.java b/module-web/src/main/java/pl/myboardgames/dto/UserMapper.java
similarity index 86%
rename from module-web/src/main/java/pl/myboardgames/user/dto/UserMapper.java
rename to module-web/src/main/java/pl/myboardgames/dto/UserMapper.java
index 42b170d..9fa5c1e 100644
--- a/module-web/src/main/java/pl/myboardgames/user/dto/UserMapper.java
+++ b/module-web/src/main/java/pl/myboardgames/dto/UserMapper.java
@@ -3,9 +3,9 @@
  * To change ret template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user.dto;
+package pl.myboardgames.dto;
 
-import pl.myboardgames.user.model.UserEntity;
+import pl.myboardgames.model.UserEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/user/dto/UserShortDto.java b/module-web/src/main/java/pl/myboardgames/dto/UserShortDto.java
similarity index 89%
rename from module-web/src/main/java/pl/myboardgames/user/dto/UserShortDto.java
rename to module-web/src/main/java/pl/myboardgames/dto/UserShortDto.java
index 6e92479..860dc6f 100644
--- a/module-web/src/main/java/pl/myboardgames/user/dto/UserShortDto.java
+++ b/module-web/src/main/java/pl/myboardgames/dto/UserShortDto.java
@@ -3,9 +3,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package pl.myboardgames.user.dto;
+package pl.myboardgames.dto;
 
-import pl.myboardgames.user.model.UserEntity;
+import pl.myboardgames.model.UserEntity;
 
 /**
  *
diff --git a/module-web/src/main/java/pl/myboardgames/boardgame/resources/BoardGameResource.java b/module-web/src/main/java/pl/myboardgames/resources/BoardGameResource.java
similarity index 87%
rename from module-web/src/main/java/pl/myboardgames/boardgame/resources/BoardGameResource.java
rename to module-web/src/main/java/pl/myboardgames/resources/BoardGameResource.java
index 6048c32..7f84940 100644
--- a/module-web/src/main/java/pl/myboardgames/boardgame/resources/BoardGameResource.java
+++ b/module-web/src/main/java/pl/myboardgames/resources/BoardGameResource.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.boardgame.resources;
+package pl.myboardgames.resources;
 
 import java.util.stream.Collectors;
 import javax.ejb.EJB;
@@ -13,11 +13,11 @@ 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;
+import pl.myboardgames.db.BoardGameDao;
+import pl.myboardgames.dto.BoardGameDto;
+import pl.myboardgames.dto.BoardGameMapper;
+import pl.myboardgames.dto.BoardGameShortDto;
+import pl.myboardgames.model.BoardGameEntity;
 
 @Path("/boardgame")
 @RequestScoped
diff --git a/module-web/src/main/java/pl/myboardgames/user/resources/UserResource.java b/module-web/src/main/java/pl/myboardgames/resources/UserResource.java
similarity index 88%
rename from module-web/src/main/java/pl/myboardgames/user/resources/UserResource.java
rename to module-web/src/main/java/pl/myboardgames/resources/UserResource.java
index b4008ee..f637e6a 100644
--- a/module-web/src/main/java/pl/myboardgames/user/resources/UserResource.java
+++ b/module-web/src/main/java/pl/myboardgames/resources/UserResource.java
@@ -1,4 +1,4 @@
-package pl.myboardgames.user.resources;
+package pl.myboardgames.resources;
 
 import java.util.stream.Collectors;
 import javax.ejb.EJB;
@@ -13,12 +13,12 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
-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;
+import pl.myboardgames.dto.BoardGameShortDto;
+import pl.myboardgames.db.UserDao;
+import pl.myboardgames.dto.UserDto;
+import pl.myboardgames.dto.UserMapper;
+import pl.myboardgames.dto.UserShortDto;
+import pl.myboardgames.model.UserEntity;
 
 @Path("/user")
 @RequestScoped