Skip to content

Commit 27ff01d

Browse files
iluwatariluwatar
committed
Organize to packages.
1 parent 3d38289 commit 27ff01d

File tree

17 files changed

+70
-17
lines changed

17 files changed

+70
-17
lines changed

‎service-layer/src/main/java/com/iluwatar/App.java renamed to ‎service-layer/src/main/java/com/iluwatar/app/App.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
package com.iluwatar;
1+
package com.iluwatar.app;
2+
3+
import com.iluwatar.magic.MagicService;
4+
import com.iluwatar.magic.MagicServiceImpl;
5+
import com.iluwatar.spell.Spell;
6+
import com.iluwatar.spell.SpellDao;
7+
import com.iluwatar.spell.SpellDaoImpl;
8+
import com.iluwatar.spellbook.Spellbook;
9+
import com.iluwatar.spellbook.SpellbookDao;
10+
import com.iluwatar.spellbook.SpellbookDaoImpl;
11+
import com.iluwatar.wizard.Wizard;
12+
import com.iluwatar.wizard.WizardDao;
13+
import com.iluwatar.wizard.WizardDaoImpl;
214

315

416
/**

‎service-layer/src/main/java/com/iluwatar/BaseEntity.java renamed to ‎service-layer/src/main/java/com/iluwatar/common/BaseEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.common;
22

33
import javax.persistence.Inheritance;
44
import javax.persistence.InheritanceType;

‎service-layer/src/main/java/com/iluwatar/Dao.java renamed to ‎service-layer/src/main/java/com/iluwatar/common/Dao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.common;
22

33
import java.util.List;
44

‎service-layer/src/main/java/com/iluwatar/DaoBaseImpl.java renamed to ‎service-layer/src/main/java/com/iluwatar/common/DaoBaseImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.common;
22

33
import java.lang.reflect.ParameterizedType;
44
import java.util.List;
@@ -8,6 +8,8 @@
88
import org.hibernate.Transaction;
99
import org.hibernate.criterion.Restrictions;
1010

11+
import com.iluwatar.hibernate.HibernateUtil;
12+
1113
public abstract class DaoBaseImpl<E extends BaseEntity> implements Dao<E> {
1214

1315
@SuppressWarnings("unchecked")

‎service-layer/src/main/java/com/iluwatar/HibernateUtil.java renamed to ‎service-layer/src/main/java/com/iluwatar/hibernate/HibernateUtil.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
package com.iluwatar;
1+
package com.iluwatar.hibernate;
22

33
import org.hibernate.SessionFactory;
44
import org.hibernate.cfg.Configuration;
55

6+
import com.iluwatar.spell.Spell;
7+
import com.iluwatar.spellbook.Spellbook;
8+
import com.iluwatar.wizard.Wizard;
9+
610
public class HibernateUtil {
711

812
private static final SessionFactory sessionFactory;

‎service-layer/src/main/java/com/iluwatar/MagicService.java renamed to ‎service-layer/src/main/java/com/iluwatar/magic/MagicService.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
package com.iluwatar;
1+
package com.iluwatar.magic;
22

33
import java.util.List;
44

5+
import com.iluwatar.spell.Spell;
6+
import com.iluwatar.spellbook.Spellbook;
7+
import com.iluwatar.wizard.Wizard;
8+
59

610
public interface MagicService {
711

‎service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java renamed to ‎service-layer/src/main/java/com/iluwatar/magic/MagicServiceImpl.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1-
package com.iluwatar;
1+
package com.iluwatar.magic;
22

33
import java.util.List;
44

5+
import com.iluwatar.spell.Spell;
6+
import com.iluwatar.spell.SpellDao;
7+
import com.iluwatar.spellbook.Spellbook;
8+
import com.iluwatar.spellbook.SpellbookDao;
9+
import com.iluwatar.wizard.Wizard;
10+
import com.iluwatar.wizard.WizardDao;
11+
512
public class MagicServiceImpl implements MagicService {
613

714
private WizardDao wizardDao;

‎service-layer/src/main/java/com/iluwatar/Spell.java renamed to ‎service-layer/src/main/java/com/iluwatar/spell/Spell.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.spell;
22

33
import javax.persistence.Column;
44
import javax.persistence.Entity;
@@ -8,6 +8,9 @@
88
import javax.persistence.ManyToOne;
99
import javax.persistence.Table;
1010

11+
import com.iluwatar.common.BaseEntity;
12+
import com.iluwatar.spellbook.Spellbook;
13+
1114
@Entity
1215
@Table(name="SPELL")
1316
public class Spell extends BaseEntity {

‎service-layer/src/main/java/com/iluwatar/SpellDao.java renamed to ‎service-layer/src/main/java/com/iluwatar/spell/SpellDao.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.iluwatar;
1+
package com.iluwatar.spell;
2+
3+
import com.iluwatar.common.Dao;
24

35
public interface SpellDao extends Dao<Spell> {
46

‎service-layer/src/main/java/com/iluwatar/SpellDaoImpl.java renamed to ‎service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package com.iluwatar;
1+
package com.iluwatar.spell;
22

33
import org.hibernate.Criteria;
44
import org.hibernate.Session;
55
import org.hibernate.Transaction;
66
import org.hibernate.criterion.Expression;
77

8+
import com.iluwatar.common.DaoBaseImpl;
9+
810
public class SpellDaoImpl extends DaoBaseImpl<Spell> implements SpellDao {
911

1012
@Override

‎service-layer/src/main/java/com/iluwatar/Spellbook.java renamed to ‎service-layer/src/main/java/com/iluwatar/spellbook/Spellbook.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.spellbook;
22

33
import java.util.HashSet;
44
import java.util.Set;
@@ -12,6 +12,10 @@
1212
import javax.persistence.OneToMany;
1313
import javax.persistence.Table;
1414

15+
import com.iluwatar.common.BaseEntity;
16+
import com.iluwatar.spell.Spell;
17+
import com.iluwatar.wizard.Wizard;
18+
1519
@Entity
1620
@Table(name="SPELLBOOK")
1721
public class Spellbook extends BaseEntity {

‎service-layer/src/main/java/com/iluwatar/SpellbookDao.java renamed to ‎service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDao.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.iluwatar;
1+
package com.iluwatar.spellbook;
2+
3+
import com.iluwatar.common.Dao;
24

35
public interface SpellbookDao extends Dao<Spellbook> {
46

‎service-layer/src/main/java/com/iluwatar/SpellbookDaoImpl.java renamed to ‎service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package com.iluwatar;
1+
package com.iluwatar.spellbook;
22

33
import org.hibernate.Criteria;
44
import org.hibernate.Session;
55
import org.hibernate.Transaction;
66
import org.hibernate.criterion.Expression;
77

8+
import com.iluwatar.common.DaoBaseImpl;
9+
810
public class SpellbookDaoImpl extends DaoBaseImpl<Spellbook> implements SpellbookDao {
911

1012
@Override

‎service-layer/src/main/java/com/iluwatar/Wizard.java renamed to ‎service-layer/src/main/java/com/iluwatar/wizard/Wizard.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar;
1+
package com.iluwatar.wizard;
22

33
import java.util.HashSet;
44
import java.util.Set;
@@ -11,6 +11,9 @@
1111
import javax.persistence.ManyToMany;
1212
import javax.persistence.Table;
1313

14+
import com.iluwatar.common.BaseEntity;
15+
import com.iluwatar.spellbook.Spellbook;
16+
1417
@Entity
1518
@Table(name="WIZARD")
1619
public class Wizard extends BaseEntity {

‎service-layer/src/main/java/com/iluwatar/WizardDao.java renamed to ‎service-layer/src/main/java/com/iluwatar/wizard/WizardDao.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.iluwatar;
1+
package com.iluwatar.wizard;
2+
3+
import com.iluwatar.common.Dao;
24

35
public interface WizardDao extends Dao<Wizard> {
46

‎service-layer/src/main/java/com/iluwatar/WizardDaoImpl.java renamed to ‎service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package com.iluwatar;
1+
package com.iluwatar.wizard;
22

33
import org.hibernate.Criteria;
44
import org.hibernate.Session;
55
import org.hibernate.Transaction;
66
import org.hibernate.criterion.Expression;
77

8+
import com.iluwatar.common.DaoBaseImpl;
9+
810
public class WizardDaoImpl extends DaoBaseImpl<Wizard> implements WizardDao {
911

1012
@Override

‎service-layer/src/test/java/com/iluwatar/AppTest.java renamed to ‎service-layer/src/test/java/com/iluwatar/app/AppTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
package com.iluwatar;
1+
package com.iluwatar.app;
22

33
import org.junit.Test;
44

5+
import com.iluwatar.app.App;
6+
57
public class AppTest {
68

79
@Test

0 commit comments

Comments
 (0)