diff --git a/abstract-factory/etc/test.ucls b/abstract-factory/etc/test.ucls index f0ff437e7..59d8d3746 100644 --- a/abstract-factory/etc/test.ucls +++ b/abstract-factory/etc/test.ucls @@ -1,183 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abstract-factory/src/main/java/com/iluwatar/Army.java b/abstract-factory/src/main/java/com/iluwatar/Army.java deleted file mode 100644 index 0365fad96..000000000 --- a/abstract-factory/src/main/java/com/iluwatar/Army.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iluwatar; - -public interface Army { - -} diff --git a/abstract-factory/src/main/java/com/iluwatar/Castle.java b/abstract-factory/src/main/java/com/iluwatar/Castle.java deleted file mode 100644 index 4cc765bee..000000000 --- a/abstract-factory/src/main/java/com/iluwatar/Castle.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iluwatar; - -public interface Castle { - -} diff --git a/abstract-factory/src/main/java/com/iluwatar/King.java b/abstract-factory/src/main/java/com/iluwatar/King.java deleted file mode 100644 index 2a63cb3b1..000000000 --- a/abstract-factory/src/main/java/com/iluwatar/King.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iluwatar; - -public interface King { - -} diff --git a/abstract-factory/src/main/java/com/iluwatar/App.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java similarity index 91% rename from abstract-factory/src/main/java/com/iluwatar/App.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java index 0796e8f3f..3f77a521c 100644 --- a/abstract-factory/src/main/java/com/iluwatar/App.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; /** * diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Army.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Army.java new file mode 100644 index 000000000..39e023e3b --- /dev/null +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Army.java @@ -0,0 +1,5 @@ +package com.iluwatar.abstractfactory; + +public interface Army { + +} diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Castle.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Castle.java new file mode 100644 index 000000000..277daea56 --- /dev/null +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Castle.java @@ -0,0 +1,5 @@ +package com.iluwatar.abstractfactory; + +public interface Castle { + +} diff --git a/abstract-factory/src/main/java/com/iluwatar/ElfArmy.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfArmy.java similarity index 71% rename from abstract-factory/src/main/java/com/iluwatar/ElfArmy.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfArmy.java index 467640ff9..473106222 100644 --- a/abstract-factory/src/main/java/com/iluwatar/ElfArmy.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfArmy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; public class ElfArmy implements Army { diff --git a/abstract-factory/src/main/java/com/iluwatar/ElfCastle.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfCastle.java similarity index 72% rename from abstract-factory/src/main/java/com/iluwatar/ElfCastle.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfCastle.java index b4741840c..851baf84f 100644 --- a/abstract-factory/src/main/java/com/iluwatar/ElfCastle.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfCastle.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; public class ElfCastle implements Castle { diff --git a/abstract-factory/src/main/java/com/iluwatar/ElfKing.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKing.java similarity index 71% rename from abstract-factory/src/main/java/com/iluwatar/ElfKing.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKing.java index 63315aead..eafaccf49 100644 --- a/abstract-factory/src/main/java/com/iluwatar/ElfKing.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKing.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; public class ElfKing implements King { diff --git a/abstract-factory/src/main/java/com/iluwatar/ElfKingdomFactory.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKingdomFactory.java similarity index 82% rename from abstract-factory/src/main/java/com/iluwatar/ElfKingdomFactory.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKingdomFactory.java index adec4f96c..eb4b99685 100644 --- a/abstract-factory/src/main/java/com/iluwatar/ElfKingdomFactory.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/ElfKingdomFactory.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; /** * diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/King.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/King.java new file mode 100644 index 000000000..12a9c1f13 --- /dev/null +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/King.java @@ -0,0 +1,5 @@ +package com.iluwatar.abstractfactory; + +public interface King { + +} diff --git a/abstract-factory/src/main/java/com/iluwatar/KingdomFactory.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/KingdomFactory.java similarity index 73% rename from abstract-factory/src/main/java/com/iluwatar/KingdomFactory.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/KingdomFactory.java index c73016568..e5b4b4050 100644 --- a/abstract-factory/src/main/java/com/iluwatar/KingdomFactory.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/KingdomFactory.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; /** * diff --git a/abstract-factory/src/main/java/com/iluwatar/OrcArmy.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcArmy.java similarity index 71% rename from abstract-factory/src/main/java/com/iluwatar/OrcArmy.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcArmy.java index e11c1e15e..b0e202d51 100644 --- a/abstract-factory/src/main/java/com/iluwatar/OrcArmy.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcArmy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; public class OrcArmy implements Army { diff --git a/abstract-factory/src/main/java/com/iluwatar/OrcCastle.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcCastle.java similarity index 72% rename from abstract-factory/src/main/java/com/iluwatar/OrcCastle.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcCastle.java index 670cc0054..785884a59 100644 --- a/abstract-factory/src/main/java/com/iluwatar/OrcCastle.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcCastle.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; public class OrcCastle implements Castle { diff --git a/abstract-factory/src/main/java/com/iluwatar/OrcKing.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKing.java similarity index 71% rename from abstract-factory/src/main/java/com/iluwatar/OrcKing.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKing.java index 79b90fc52..27ea8afd4 100644 --- a/abstract-factory/src/main/java/com/iluwatar/OrcKing.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKing.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; public class OrcKing implements King { diff --git a/abstract-factory/src/main/java/com/iluwatar/OrcKingdomFactory.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKingdomFactory.java similarity index 82% rename from abstract-factory/src/main/java/com/iluwatar/OrcKingdomFactory.java rename to abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKingdomFactory.java index b20265c91..2f2a2a54d 100644 --- a/abstract-factory/src/main/java/com/iluwatar/OrcKingdomFactory.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/OrcKingdomFactory.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; /** * diff --git a/abstract-factory/src/test/java/com/iluwatar/AppTest.java b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java similarity index 57% rename from abstract-factory/src/test/java/com/iluwatar/AppTest.java rename to abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java index 58c74fe79..0241ed8ce 100644 --- a/abstract-factory/src/test/java/com/iluwatar/AppTest.java +++ b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java @@ -1,7 +1,7 @@ -package com.iluwatar; +package com.iluwatar.abstractfactory; import org.junit.Test; -import com.iluwatar.App; +import com.iluwatar.abstractfactory.App; public class AppTest { diff --git a/adapter/etc/test.ucls b/adapter/etc/test.ucls index c21f79f25..59d8d3746 100644 --- a/adapter/etc/test.ucls +++ b/adapter/etc/test.ucls @@ -1,81 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/adapter/src/main/java/com/iluwatar/App.java b/adapter/src/main/java/com/iluwatar/adapter/App.java similarity index 91% rename from adapter/src/main/java/com/iluwatar/App.java rename to adapter/src/main/java/com/iluwatar/adapter/App.java index e029ea33f..43a93fa44 100644 --- a/adapter/src/main/java/com/iluwatar/App.java +++ b/adapter/src/main/java/com/iluwatar/adapter/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.adapter; /** * diff --git a/adapter/src/main/java/com/iluwatar/Engineer.java b/adapter/src/main/java/com/iluwatar/adapter/Engineer.java similarity index 71% rename from adapter/src/main/java/com/iluwatar/Engineer.java rename to adapter/src/main/java/com/iluwatar/adapter/Engineer.java index 8df7ac878..7478b5b69 100644 --- a/adapter/src/main/java/com/iluwatar/Engineer.java +++ b/adapter/src/main/java/com/iluwatar/adapter/Engineer.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.adapter; /** * diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java similarity index 88% rename from adapter/src/main/java/com/iluwatar/GnomeEngineer.java rename to adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java index 03ad912d9..62fab599f 100644 --- a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java +++ b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.adapter; /** * diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java similarity index 86% rename from adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java rename to adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java index a5cfc159a..6d0010d74 100644 --- a/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java +++ b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.adapter; /** * diff --git a/adapter/src/main/java/com/iluwatar/GoblinGlider.java b/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java similarity index 85% rename from adapter/src/main/java/com/iluwatar/GoblinGlider.java rename to adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java index 4424d3e13..ff1dbeb8d 100644 --- a/adapter/src/main/java/com/iluwatar/GoblinGlider.java +++ b/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.adapter; /** * diff --git a/adapter/src/test/java/com/iluwatar/adapter/AppTest.java b/adapter/src/test/java/com/iluwatar/adapter/AppTest.java new file mode 100644 index 000000000..cd9d713b0 --- /dev/null +++ b/adapter/src/test/java/com/iluwatar/adapter/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.adapter; + +import org.junit.Test; + +import com.iluwatar.adapter.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/bridge/etc/test.ucls b/bridge/etc/test.ucls index df5ed1eb7..59d8d3746 100644 --- a/bridge/etc/test.ucls +++ b/bridge/etc/test.ucls @@ -1,149 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bridge/src/main/java/com/iluwatar/App.java b/bridge/src/main/java/com/iluwatar/bridge/App.java similarity index 93% rename from bridge/src/main/java/com/iluwatar/App.java rename to bridge/src/main/java/com/iluwatar/bridge/App.java index 1c0aea839..3797653d4 100644 --- a/bridge/src/main/java/com/iluwatar/App.java +++ b/bridge/src/main/java/com/iluwatar/bridge/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; /** * diff --git a/bridge/src/main/java/com/iluwatar/BlindingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java similarity index 88% rename from bridge/src/main/java/com/iluwatar/BlindingMagicWeapon.java rename to bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java index 14c9a1846..5421c6d5e 100644 --- a/bridge/src/main/java/com/iluwatar/BlindingMagicWeapon.java +++ b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public class BlindingMagicWeapon extends MagicWeapon { diff --git a/bridge/src/main/java/com/iluwatar/BlindingMagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImp.java similarity index 75% rename from bridge/src/main/java/com/iluwatar/BlindingMagicWeaponImp.java rename to bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImp.java index 5f8cc7bb7..0686ce917 100644 --- a/bridge/src/main/java/com/iluwatar/BlindingMagicWeaponImp.java +++ b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImp.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public abstract class BlindingMagicWeaponImp extends MagicWeaponImp { diff --git a/bridge/src/main/java/com/iluwatar/Excalibur.java b/bridge/src/main/java/com/iluwatar/bridge/Excalibur.java similarity index 89% rename from bridge/src/main/java/com/iluwatar/Excalibur.java rename to bridge/src/main/java/com/iluwatar/bridge/Excalibur.java index dfbe49c20..52298c900 100644 --- a/bridge/src/main/java/com/iluwatar/Excalibur.java +++ b/bridge/src/main/java/com/iluwatar/bridge/Excalibur.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public class Excalibur extends BlindingMagicWeaponImp { diff --git a/bridge/src/main/java/com/iluwatar/FlyingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java similarity index 87% rename from bridge/src/main/java/com/iluwatar/FlyingMagicWeapon.java rename to bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java index f81dad9b5..9cb1902f9 100644 --- a/bridge/src/main/java/com/iluwatar/FlyingMagicWeapon.java +++ b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public class FlyingMagicWeapon extends MagicWeapon { diff --git a/bridge/src/main/java/com/iluwatar/FlyingMagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImp.java similarity index 74% rename from bridge/src/main/java/com/iluwatar/FlyingMagicWeaponImp.java rename to bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImp.java index 5860f110d..37fa8a0f9 100644 --- a/bridge/src/main/java/com/iluwatar/FlyingMagicWeaponImp.java +++ b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImp.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public abstract class FlyingMagicWeaponImp extends MagicWeaponImp { diff --git a/bridge/src/main/java/com/iluwatar/MagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java similarity index 85% rename from bridge/src/main/java/com/iluwatar/MagicWeapon.java rename to bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java index a32a49ff5..b03435c51 100644 --- a/bridge/src/main/java/com/iluwatar/MagicWeapon.java +++ b/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; /** * diff --git a/bridge/src/main/java/com/iluwatar/MagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImp.java similarity index 81% rename from bridge/src/main/java/com/iluwatar/MagicWeaponImp.java rename to bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImp.java index e05adb305..cf972c115 100644 --- a/bridge/src/main/java/com/iluwatar/MagicWeaponImp.java +++ b/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImp.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; /** * diff --git a/bridge/src/main/java/com/iluwatar/Mjollnir.java b/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java similarity index 89% rename from bridge/src/main/java/com/iluwatar/Mjollnir.java rename to bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java index ec26f3e2c..0c21f8d07 100644 --- a/bridge/src/main/java/com/iluwatar/Mjollnir.java +++ b/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public class Mjollnir extends FlyingMagicWeaponImp { diff --git a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java similarity index 88% rename from bridge/src/main/java/com/iluwatar/SoulEatingMagicWeapon.java rename to bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java index cc61fd5eb..dbbec102d 100644 --- a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeapon.java +++ b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public class SoulEatingMagicWeapon extends MagicWeapon { diff --git a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImp.java similarity index 75% rename from bridge/src/main/java/com/iluwatar/SoulEatingMagicWeaponImp.java rename to bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImp.java index da0917647..3c1a557dd 100644 --- a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeaponImp.java +++ b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImp.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public abstract class SoulEatingMagicWeaponImp extends MagicWeaponImp { diff --git a/bridge/src/main/java/com/iluwatar/Stormbringer.java b/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java similarity index 89% rename from bridge/src/main/java/com/iluwatar/Stormbringer.java rename to bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java index 673ed99a7..55b5960c9 100644 --- a/bridge/src/main/java/com/iluwatar/Stormbringer.java +++ b/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.bridge; public class Stormbringer extends SoulEatingMagicWeaponImp { diff --git a/bridge/src/test/java/com/iluwatar/bridge/AppTest.java b/bridge/src/test/java/com/iluwatar/bridge/AppTest.java new file mode 100644 index 000000000..196008950 --- /dev/null +++ b/bridge/src/test/java/com/iluwatar/bridge/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.bridge; + +import org.junit.Test; + +import com.iluwatar.bridge.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/builder/src/main/java/com/iluwatar/App.java b/builder/src/main/java/com/iluwatar/builder/App.java similarity index 91% rename from builder/src/main/java/com/iluwatar/App.java rename to builder/src/main/java/com/iluwatar/builder/App.java index 59348de6e..e38e5a0c3 100644 --- a/builder/src/main/java/com/iluwatar/App.java +++ b/builder/src/main/java/com/iluwatar/builder/App.java @@ -1,6 +1,6 @@ -package com.iluwatar; +package com.iluwatar.builder; -import com.iluwatar.Hero.HeroBuilder; +import com.iluwatar. builder.Hero.HeroBuilder; /** * diff --git a/builder/src/main/java/com/iluwatar/Armor.java b/builder/src/main/java/com/iluwatar/builder/Armor.java similarity index 85% rename from builder/src/main/java/com/iluwatar/Armor.java rename to builder/src/main/java/com/iluwatar/builder/Armor.java index 22ab4d59f..ebec6a47d 100644 --- a/builder/src/main/java/com/iluwatar/Armor.java +++ b/builder/src/main/java/com/iluwatar/builder/Armor.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.builder; public enum Armor { diff --git a/builder/src/main/java/com/iluwatar/HairColor.java b/builder/src/main/java/com/iluwatar/builder/HairColor.java similarity index 76% rename from builder/src/main/java/com/iluwatar/HairColor.java rename to builder/src/main/java/com/iluwatar/builder/HairColor.java index db44a3f64..a73044754 100644 --- a/builder/src/main/java/com/iluwatar/HairColor.java +++ b/builder/src/main/java/com/iluwatar/builder/HairColor.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.builder; public enum HairColor { diff --git a/builder/src/main/java/com/iluwatar/HairType.java b/builder/src/main/java/com/iluwatar/builder/HairType.java similarity index 85% rename from builder/src/main/java/com/iluwatar/HairType.java rename to builder/src/main/java/com/iluwatar/builder/HairType.java index ec5508712..075699a58 100644 --- a/builder/src/main/java/com/iluwatar/HairType.java +++ b/builder/src/main/java/com/iluwatar/builder/HairType.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.builder; public enum HairType { diff --git a/builder/src/main/java/com/iluwatar/Hero.java b/builder/src/main/java/com/iluwatar/builder/Hero.java similarity index 98% rename from builder/src/main/java/com/iluwatar/Hero.java rename to builder/src/main/java/com/iluwatar/builder/Hero.java index 8fb00667b..75513eeda 100644 --- a/builder/src/main/java/com/iluwatar/Hero.java +++ b/builder/src/main/java/com/iluwatar/builder/Hero.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.builder; /** * diff --git a/builder/src/main/java/com/iluwatar/Profession.java b/builder/src/main/java/com/iluwatar/builder/Profession.java similarity index 76% rename from builder/src/main/java/com/iluwatar/Profession.java rename to builder/src/main/java/com/iluwatar/builder/Profession.java index a21d9730c..487fc5133 100644 --- a/builder/src/main/java/com/iluwatar/Profession.java +++ b/builder/src/main/java/com/iluwatar/builder/Profession.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.builder; public enum Profession { diff --git a/builder/src/main/java/com/iluwatar/Weapon.java b/builder/src/main/java/com/iluwatar/builder/Weapon.java similarity index 76% rename from builder/src/main/java/com/iluwatar/Weapon.java rename to builder/src/main/java/com/iluwatar/builder/Weapon.java index ddc66fb43..99622ddac 100644 --- a/builder/src/main/java/com/iluwatar/Weapon.java +++ b/builder/src/main/java/com/iluwatar/builder/Weapon.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.builder; public enum Weapon { diff --git a/builder/src/test/java/com/iluwatar/builder/AppTest.java b/builder/src/test/java/com/iluwatar/builder/AppTest.java new file mode 100644 index 000000000..462ad3a9a --- /dev/null +++ b/builder/src/test/java/com/iluwatar/builder/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.builder; + +import org.junit.Test; + +import com.iluwatar. builder.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/callback/src/main/java/com/iluwatar/App.java b/callback/src/main/java/com/iluwatar/callback/App.java similarity index 93% rename from callback/src/main/java/com/iluwatar/App.java rename to callback/src/main/java/com/iluwatar/callback/App.java index 2d79d8edf..546a6b507 100644 --- a/callback/src/main/java/com/iluwatar/App.java +++ b/callback/src/main/java/com/iluwatar/callback/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.callback; /** * Callback pattern is more native for functional languages where function is treated as first-class citizen. diff --git a/callback/src/main/java/com/iluwatar/Callback.java b/callback/src/main/java/com/iluwatar/callback/Callback.java similarity index 72% rename from callback/src/main/java/com/iluwatar/Callback.java rename to callback/src/main/java/com/iluwatar/callback/Callback.java index f1c0baf75..9e757e218 100644 --- a/callback/src/main/java/com/iluwatar/Callback.java +++ b/callback/src/main/java/com/iluwatar/callback/Callback.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.callback; /** * Callback interface diff --git a/callback/src/main/java/com/iluwatar/SimpleTask.java b/callback/src/main/java/com/iluwatar/callback/SimpleTask.java similarity index 86% rename from callback/src/main/java/com/iluwatar/SimpleTask.java rename to callback/src/main/java/com/iluwatar/callback/SimpleTask.java index 703474a90..f8a27ba10 100644 --- a/callback/src/main/java/com/iluwatar/SimpleTask.java +++ b/callback/src/main/java/com/iluwatar/callback/SimpleTask.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.callback; /** * Implementation of task that need to be executed diff --git a/callback/src/main/java/com/iluwatar/Task.java b/callback/src/main/java/com/iluwatar/callback/Task.java similarity index 88% rename from callback/src/main/java/com/iluwatar/Task.java rename to callback/src/main/java/com/iluwatar/callback/Task.java index ad3a0f14b..df7bf8ae8 100644 --- a/callback/src/main/java/com/iluwatar/Task.java +++ b/callback/src/main/java/com/iluwatar/callback/Task.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.callback; /** * Template-method class for callback hook execution diff --git a/callback/src/test/java/com/iluwatar/AppTest.java b/callback/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 6db5ad214..000000000 --- a/callback/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/specification/src/test/java/com/iluwatar/app/AppTest.java b/callback/src/test/java/com/iluwatar/callback/AppTest.java similarity index 65% rename from specification/src/test/java/com/iluwatar/app/AppTest.java rename to callback/src/test/java/com/iluwatar/callback/AppTest.java index d3a934a63..5d7febcee 100644 --- a/specification/src/test/java/com/iluwatar/app/AppTest.java +++ b/callback/src/test/java/com/iluwatar/callback/AppTest.java @@ -1,8 +1,8 @@ -package com.iluwatar.app; +package com.iluwatar.callback; import org.junit.Test; -import com.iluwatar.app.App; +import com.iluwatar.callback.App; public class AppTest { diff --git a/chain/src/main/java/com/iluwatar/App.java b/chain/src/main/java/com/iluwatar/chain/App.java similarity index 92% rename from chain/src/main/java/com/iluwatar/App.java rename to chain/src/main/java/com/iluwatar/chain/App.java index 480ddc169..21d206696 100644 --- a/chain/src/main/java/com/iluwatar/App.java +++ b/chain/src/main/java/com/iluwatar/chain/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; /** * diff --git a/chain/src/main/java/com/iluwatar/OrcCommander.java b/chain/src/main/java/com/iluwatar/chain/OrcCommander.java similarity index 88% rename from chain/src/main/java/com/iluwatar/OrcCommander.java rename to chain/src/main/java/com/iluwatar/chain/OrcCommander.java index 1f3b6169b..1f5f4de86 100644 --- a/chain/src/main/java/com/iluwatar/OrcCommander.java +++ b/chain/src/main/java/com/iluwatar/chain/OrcCommander.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; public class OrcCommander extends RequestHandler { diff --git a/chain/src/main/java/com/iluwatar/OrcKing.java b/chain/src/main/java/com/iluwatar/chain/OrcKing.java similarity index 86% rename from chain/src/main/java/com/iluwatar/OrcKing.java rename to chain/src/main/java/com/iluwatar/chain/OrcKing.java index 0d3f38ba2..afd2616fe 100644 --- a/chain/src/main/java/com/iluwatar/OrcKing.java +++ b/chain/src/main/java/com/iluwatar/chain/OrcKing.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; /** * diff --git a/chain/src/main/java/com/iluwatar/OrcOfficer.java b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java similarity index 88% rename from chain/src/main/java/com/iluwatar/OrcOfficer.java rename to chain/src/main/java/com/iluwatar/chain/OrcOfficer.java index 9a9030eca..c09729cc8 100644 --- a/chain/src/main/java/com/iluwatar/OrcOfficer.java +++ b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; public class OrcOfficer extends RequestHandler { diff --git a/chain/src/main/java/com/iluwatar/OrcSoldier.java b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java similarity index 88% rename from chain/src/main/java/com/iluwatar/OrcSoldier.java rename to chain/src/main/java/com/iluwatar/chain/OrcSoldier.java index 0e5a5a603..f52c7d543 100644 --- a/chain/src/main/java/com/iluwatar/OrcSoldier.java +++ b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; public class OrcSoldier extends RequestHandler { diff --git a/chain/src/main/java/com/iluwatar/Request.java b/chain/src/main/java/com/iluwatar/chain/Request.java similarity index 91% rename from chain/src/main/java/com/iluwatar/Request.java rename to chain/src/main/java/com/iluwatar/chain/Request.java index 00cd23972..ad55522f0 100644 --- a/chain/src/main/java/com/iluwatar/Request.java +++ b/chain/src/main/java/com/iluwatar/chain/Request.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; public class Request { diff --git a/chain/src/main/java/com/iluwatar/RequestHandler.java b/chain/src/main/java/com/iluwatar/chain/RequestHandler.java similarity index 88% rename from chain/src/main/java/com/iluwatar/RequestHandler.java rename to chain/src/main/java/com/iluwatar/chain/RequestHandler.java index 19dc33fce..dbb8b10a6 100644 --- a/chain/src/main/java/com/iluwatar/RequestHandler.java +++ b/chain/src/main/java/com/iluwatar/chain/RequestHandler.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; public abstract class RequestHandler { diff --git a/chain/src/main/java/com/iluwatar/RequestType.java b/chain/src/main/java/com/iluwatar/chain/RequestType.java similarity index 68% rename from chain/src/main/java/com/iluwatar/RequestType.java rename to chain/src/main/java/com/iluwatar/chain/RequestType.java index 02176a088..21727535e 100644 --- a/chain/src/main/java/com/iluwatar/RequestType.java +++ b/chain/src/main/java/com/iluwatar/chain/RequestType.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.chain; public enum RequestType { diff --git a/chain/src/test/java/com/iluwatar/AppTest.java b/chain/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/chain/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/chain/src/test/java/com/iluwatar/chain/AppTest.java b/chain/src/test/java/com/iluwatar/chain/AppTest.java new file mode 100644 index 000000000..5edba69bb --- /dev/null +++ b/chain/src/test/java/com/iluwatar/chain/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.chain; + +import org.junit.Test; + +import com.iluwatar.chain.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/command/src/main/java/com/iluwatar/App.java b/command/src/main/java/com/iluwatar/command/App.java similarity index 91% rename from command/src/main/java/com/iluwatar/App.java rename to command/src/main/java/com/iluwatar/command/App.java index 9e1b43b1a..0e47b4ce1 100644 --- a/command/src/main/java/com/iluwatar/App.java +++ b/command/src/main/java/com/iluwatar/command/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; /** * diff --git a/command/src/main/java/com/iluwatar/Command.java b/command/src/main/java/com/iluwatar/command/Command.java similarity index 82% rename from command/src/main/java/com/iluwatar/Command.java rename to command/src/main/java/com/iluwatar/command/Command.java index 9a8446149..9ffeed24d 100644 --- a/command/src/main/java/com/iluwatar/Command.java +++ b/command/src/main/java/com/iluwatar/command/Command.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; /** * diff --git a/command/src/main/java/com/iluwatar/Goblin.java b/command/src/main/java/com/iluwatar/command/Goblin.java similarity index 80% rename from command/src/main/java/com/iluwatar/Goblin.java rename to command/src/main/java/com/iluwatar/command/Goblin.java index 6bb614554..16da93819 100644 --- a/command/src/main/java/com/iluwatar/Goblin.java +++ b/command/src/main/java/com/iluwatar/command/Goblin.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; public class Goblin extends Target { diff --git a/command/src/main/java/com/iluwatar/InvisibilitySpell.java b/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java similarity index 89% rename from command/src/main/java/com/iluwatar/InvisibilitySpell.java rename to command/src/main/java/com/iluwatar/command/InvisibilitySpell.java index 175aef4fc..858bd9537 100644 --- a/command/src/main/java/com/iluwatar/InvisibilitySpell.java +++ b/command/src/main/java/com/iluwatar/command/InvisibilitySpell.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; public class InvisibilitySpell extends Command { diff --git a/command/src/main/java/com/iluwatar/ShrinkSpell.java b/command/src/main/java/com/iluwatar/command/ShrinkSpell.java similarity index 89% rename from command/src/main/java/com/iluwatar/ShrinkSpell.java rename to command/src/main/java/com/iluwatar/command/ShrinkSpell.java index bb7d93831..6f8a9bb37 100644 --- a/command/src/main/java/com/iluwatar/ShrinkSpell.java +++ b/command/src/main/java/com/iluwatar/command/ShrinkSpell.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; public class ShrinkSpell extends Command { diff --git a/command/src/main/java/com/iluwatar/Size.java b/command/src/main/java/com/iluwatar/command/Size.java similarity index 85% rename from command/src/main/java/com/iluwatar/Size.java rename to command/src/main/java/com/iluwatar/command/Size.java index d06210aad..a9c20bd59 100644 --- a/command/src/main/java/com/iluwatar/Size.java +++ b/command/src/main/java/com/iluwatar/command/Size.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; /** * diff --git a/command/src/main/java/com/iluwatar/Target.java b/command/src/main/java/com/iluwatar/command/Target.java similarity index 89% rename from command/src/main/java/com/iluwatar/Target.java rename to command/src/main/java/com/iluwatar/command/Target.java index a35374911..6ea2681d3 100644 --- a/command/src/main/java/com/iluwatar/Target.java +++ b/command/src/main/java/com/iluwatar/command/Target.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; /** * diff --git a/command/src/main/java/com/iluwatar/Visibility.java b/command/src/main/java/com/iluwatar/command/Visibility.java similarity index 85% rename from command/src/main/java/com/iluwatar/Visibility.java rename to command/src/main/java/com/iluwatar/command/Visibility.java index 7fbdc4e44..3316ac9e3 100644 --- a/command/src/main/java/com/iluwatar/Visibility.java +++ b/command/src/main/java/com/iluwatar/command/Visibility.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; /** * diff --git a/command/src/main/java/com/iluwatar/Wizard.java b/command/src/main/java/com/iluwatar/command/Wizard.java similarity index 93% rename from command/src/main/java/com/iluwatar/Wizard.java rename to command/src/main/java/com/iluwatar/command/Wizard.java index 69995b9aa..05f33d9be 100644 --- a/command/src/main/java/com/iluwatar/Wizard.java +++ b/command/src/main/java/com/iluwatar/command/Wizard.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.command; import java.util.Deque; import java.util.LinkedList; diff --git a/command/src/test/java/com/iluwatar/AppTest.java b/command/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/command/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/command/src/test/java/com/iluwatar/command/AppTest.java b/command/src/test/java/com/iluwatar/command/AppTest.java new file mode 100644 index 000000000..454f92b63 --- /dev/null +++ b/command/src/test/java/com/iluwatar/command/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.command; + +import org.junit.Test; + +import com.iluwatar.command.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/composite/src/main/java/com/iluwatar/App.java b/composite/src/main/java/com/iluwatar/composite/App.java similarity index 90% rename from composite/src/main/java/com/iluwatar/App.java rename to composite/src/main/java/com/iluwatar/composite/App.java index 5d1b6b477..6dd62a552 100644 --- a/composite/src/main/java/com/iluwatar/App.java +++ b/composite/src/main/java/com/iluwatar/composite/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.composite; /** * diff --git a/composite/src/main/java/com/iluwatar/Letter.java b/composite/src/main/java/com/iluwatar/composite/Letter.java similarity index 82% rename from composite/src/main/java/com/iluwatar/Letter.java rename to composite/src/main/java/com/iluwatar/composite/Letter.java index f0a25b6d4..9df8b95f7 100644 --- a/composite/src/main/java/com/iluwatar/Letter.java +++ b/composite/src/main/java/com/iluwatar/composite/Letter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.composite; public class Letter extends LetterComposite { diff --git a/composite/src/main/java/com/iluwatar/LetterComposite.java b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java similarity index 89% rename from composite/src/main/java/com/iluwatar/LetterComposite.java rename to composite/src/main/java/com/iluwatar/composite/LetterComposite.java index b187241f8..e58d51b25 100644 --- a/composite/src/main/java/com/iluwatar/LetterComposite.java +++ b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.composite; import java.util.ArrayList; import java.util.List; diff --git a/composite/src/main/java/com/iluwatar/Messenger.java b/composite/src/main/java/com/iluwatar/composite/Messenger.java similarity index 95% rename from composite/src/main/java/com/iluwatar/Messenger.java rename to composite/src/main/java/com/iluwatar/composite/Messenger.java index 6179bef23..a849408ca 100644 --- a/composite/src/main/java/com/iluwatar/Messenger.java +++ b/composite/src/main/java/com/iluwatar/composite/Messenger.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.composite; import java.util.ArrayList; import java.util.Arrays; diff --git a/composite/src/main/java/com/iluwatar/Sentence.java b/composite/src/main/java/com/iluwatar/composite/Sentence.java similarity index 84% rename from composite/src/main/java/com/iluwatar/Sentence.java rename to composite/src/main/java/com/iluwatar/composite/Sentence.java index 0b48454ed..c83c520de 100644 --- a/composite/src/main/java/com/iluwatar/Sentence.java +++ b/composite/src/main/java/com/iluwatar/composite/Sentence.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.composite; import java.util.List; diff --git a/composite/src/main/java/com/iluwatar/Word.java b/composite/src/main/java/com/iluwatar/composite/Word.java similarity index 84% rename from composite/src/main/java/com/iluwatar/Word.java rename to composite/src/main/java/com/iluwatar/composite/Word.java index a8cfa4d9a..393cd2019 100644 --- a/composite/src/main/java/com/iluwatar/Word.java +++ b/composite/src/main/java/com/iluwatar/composite/Word.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.composite; import java.util.List; diff --git a/composite/src/test/java/com/iluwatar/AppTest.java b/composite/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/composite/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/composite/src/test/java/com/iluwatar/composite/AppTest.java b/composite/src/test/java/com/iluwatar/composite/AppTest.java new file mode 100644 index 000000000..5057efe68 --- /dev/null +++ b/composite/src/test/java/com/iluwatar/composite/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.composite; + +import org.junit.Test; + +import com.iluwatar.composite.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/dao/src/main/java/com/iluwatar/App.java b/dao/src/main/java/com/iluwatar/dao/App.java similarity index 95% rename from dao/src/main/java/com/iluwatar/App.java rename to dao/src/main/java/com/iluwatar/dao/App.java index 29578d74e..dd96cf807 100644 --- a/dao/src/main/java/com/iluwatar/App.java +++ b/dao/src/main/java/com/iluwatar/dao/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dao; import java.util.ArrayList; import java.util.List; diff --git a/dao/src/main/java/com/iluwatar/Customer.java b/dao/src/main/java/com/iluwatar/dao/Customer.java similarity index 98% rename from dao/src/main/java/com/iluwatar/Customer.java rename to dao/src/main/java/com/iluwatar/dao/Customer.java index d3f892cab..7900fee67 100644 --- a/dao/src/main/java/com/iluwatar/Customer.java +++ b/dao/src/main/java/com/iluwatar/dao/Customer.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dao; public class Customer { private int id; diff --git a/dao/src/main/java/com/iluwatar/CustomerDao.java b/dao/src/main/java/com/iluwatar/dao/CustomerDao.java similarity index 91% rename from dao/src/main/java/com/iluwatar/CustomerDao.java rename to dao/src/main/java/com/iluwatar/dao/CustomerDao.java index 0c4cf2155..f201d945d 100644 --- a/dao/src/main/java/com/iluwatar/CustomerDao.java +++ b/dao/src/main/java/com/iluwatar/dao/CustomerDao.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dao; import java.util.List; diff --git a/dao/src/main/java/com/iluwatar/CustomerDaoImpl.java b/dao/src/main/java/com/iluwatar/dao/CustomerDaoImpl.java similarity index 98% rename from dao/src/main/java/com/iluwatar/CustomerDaoImpl.java rename to dao/src/main/java/com/iluwatar/dao/CustomerDaoImpl.java index d2069d672..ff5332798 100644 --- a/dao/src/main/java/com/iluwatar/CustomerDaoImpl.java +++ b/dao/src/main/java/com/iluwatar/dao/CustomerDaoImpl.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dao; import java.util.List; diff --git a/dao/src/test/java/com/iluwatar/AppTest.java b/dao/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/dao/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/bridge/src/test/java/com/iluwatar/AppTest.java b/dao/src/test/java/com/iluwatar/dao/AppTest.java similarity index 63% rename from bridge/src/test/java/com/iluwatar/AppTest.java rename to dao/src/test/java/com/iluwatar/dao/AppTest.java index 89b9e61d8..d45e0ef18 100644 --- a/bridge/src/test/java/com/iluwatar/AppTest.java +++ b/dao/src/test/java/com/iluwatar/dao/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.dao; import org.junit.Test; +import com.iluwatar.dao.App; + public class AppTest { @Test diff --git a/decorator/src/main/java/com/iluwatar/App.java b/decorator/src/main/java/com/iluwatar/decorator/App.java similarity index 92% rename from decorator/src/main/java/com/iluwatar/App.java rename to decorator/src/main/java/com/iluwatar/decorator/App.java index 8318091da..f424f51b9 100644 --- a/decorator/src/main/java/com/iluwatar/App.java +++ b/decorator/src/main/java/com/iluwatar/decorator/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.decorator; /** * diff --git a/decorator/src/main/java/com/iluwatar/Hostile.java b/decorator/src/main/java/com/iluwatar/decorator/Hostile.java similarity index 72% rename from decorator/src/main/java/com/iluwatar/Hostile.java rename to decorator/src/main/java/com/iluwatar/decorator/Hostile.java index ff748a682..4df751cca 100644 --- a/decorator/src/main/java/com/iluwatar/Hostile.java +++ b/decorator/src/main/java/com/iluwatar/decorator/Hostile.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.decorator; /** * diff --git a/decorator/src/main/java/com/iluwatar/SmartTroll.java b/decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java similarity index 90% rename from decorator/src/main/java/com/iluwatar/SmartTroll.java rename to decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java index 39ffe0249..9baa729f3 100644 --- a/decorator/src/main/java/com/iluwatar/SmartTroll.java +++ b/decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.decorator; /** * SmartTroll is a decorator for Hostile objects. diff --git a/decorator/src/main/java/com/iluwatar/Troll.java b/decorator/src/main/java/com/iluwatar/decorator/Troll.java similarity index 85% rename from decorator/src/main/java/com/iluwatar/Troll.java rename to decorator/src/main/java/com/iluwatar/decorator/Troll.java index a0494a1f6..8d6cd0aa5 100644 --- a/decorator/src/main/java/com/iluwatar/Troll.java +++ b/decorator/src/main/java/com/iluwatar/decorator/Troll.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.decorator; /** * diff --git a/decorator/src/test/java/com/iluwatar/AppTest.java b/decorator/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/decorator/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/decorator/src/test/java/com/iluwatar/decorator/AppTest.java b/decorator/src/test/java/com/iluwatar/decorator/AppTest.java new file mode 100644 index 000000000..28776c930 --- /dev/null +++ b/decorator/src/test/java/com/iluwatar/decorator/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.decorator; + +import org.junit.Test; + +import com.iluwatar.decorator.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/dependency-injection/src/main/java/com/iluwatar/AdvancedWizard.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/AdvancedWizard.java similarity index 89% rename from dependency-injection/src/main/java/com/iluwatar/AdvancedWizard.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/AdvancedWizard.java index 42cbd91eb..5c4b12eef 100644 --- a/dependency-injection/src/main/java/com/iluwatar/AdvancedWizard.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/AdvancedWizard.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; /** * diff --git a/dependency-injection/src/main/java/com/iluwatar/App.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/App.java similarity index 97% rename from dependency-injection/src/main/java/com/iluwatar/App.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/App.java index a93332b4f..907eaaa9d 100644 --- a/dependency-injection/src/main/java/com/iluwatar/App.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; import com.google.inject.Guice; import com.google.inject.Injector; diff --git a/dependency-injection/src/main/java/com/iluwatar/GuiceWizard.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/GuiceWizard.java similarity index 90% rename from dependency-injection/src/main/java/com/iluwatar/GuiceWizard.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/GuiceWizard.java index 33218d9a5..dbbd0a144 100644 --- a/dependency-injection/src/main/java/com/iluwatar/GuiceWizard.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/GuiceWizard.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; import javax.inject.Inject; diff --git a/dependency-injection/src/main/java/com/iluwatar/OldTobyTobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/OldTobyTobacco.java similarity index 73% rename from dependency-injection/src/main/java/com/iluwatar/OldTobyTobacco.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/OldTobyTobacco.java index 1376db896..6ebe44033 100644 --- a/dependency-injection/src/main/java/com/iluwatar/OldTobyTobacco.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/OldTobyTobacco.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; /** * diff --git a/dependency-injection/src/main/java/com/iluwatar/RivendellTobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/RivendellTobacco.java similarity index 73% rename from dependency-injection/src/main/java/com/iluwatar/RivendellTobacco.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/RivendellTobacco.java index 84fc24a42..08bebfac0 100644 --- a/dependency-injection/src/main/java/com/iluwatar/RivendellTobacco.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/RivendellTobacco.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; /** * diff --git a/dependency-injection/src/main/java/com/iluwatar/SecondBreakfastTobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SecondBreakfastTobacco.java similarity index 75% rename from dependency-injection/src/main/java/com/iluwatar/SecondBreakfastTobacco.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SecondBreakfastTobacco.java index 5d0bdba67..d0831a34a 100644 --- a/dependency-injection/src/main/java/com/iluwatar/SecondBreakfastTobacco.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SecondBreakfastTobacco.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; /** * diff --git a/dependency-injection/src/main/java/com/iluwatar/SimpleWizard.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SimpleWizard.java similarity index 87% rename from dependency-injection/src/main/java/com/iluwatar/SimpleWizard.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SimpleWizard.java index b8ca045b9..18031d840 100644 --- a/dependency-injection/src/main/java/com/iluwatar/SimpleWizard.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/SimpleWizard.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; /** * diff --git a/dependency-injection/src/main/java/com/iluwatar/Tobacco.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Tobacco.java similarity index 84% rename from dependency-injection/src/main/java/com/iluwatar/Tobacco.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Tobacco.java index 97e2a33c2..a10f648c9 100644 --- a/dependency-injection/src/main/java/com/iluwatar/Tobacco.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Tobacco.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; /** * diff --git a/dependency-injection/src/main/java/com/iluwatar/TobaccoModule.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/TobaccoModule.java similarity index 86% rename from dependency-injection/src/main/java/com/iluwatar/TobaccoModule.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/TobaccoModule.java index 40b17d7e1..3a687e8fd 100644 --- a/dependency-injection/src/main/java/com/iluwatar/TobaccoModule.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/TobaccoModule.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; import com.google.inject.AbstractModule; diff --git a/dependency-injection/src/main/java/com/iluwatar/Wizard.java b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Wizard.java similarity index 66% rename from dependency-injection/src/main/java/com/iluwatar/Wizard.java rename to dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Wizard.java index 30799d8d9..e133265ca 100644 --- a/dependency-injection/src/main/java/com/iluwatar/Wizard.java +++ b/dependency-injection/src/main/java/com/iluwatar/dependencyinjection/Wizard.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; /** * diff --git a/dependency-injection/src/test/java/com/iluwatar/AppTest.java b/dependency-injection/src/test/java/com/iluwatar/dependencyinjection/AppTest.java similarity index 58% rename from dependency-injection/src/test/java/com/iluwatar/AppTest.java rename to dependency-injection/src/test/java/com/iluwatar/dependencyinjection/AppTest.java index 3dc7b26dd..a8944c490 100644 --- a/dependency-injection/src/test/java/com/iluwatar/AppTest.java +++ b/dependency-injection/src/test/java/com/iluwatar/dependencyinjection/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.dependencyinjection; import org.junit.Test; +import com.iluwatar.dependencyinjection.App; + public class AppTest { @Test diff --git a/double-checked-locking/src/main/java/com/iluwatar/App.java b/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/App.java similarity index 94% rename from double-checked-locking/src/main/java/com/iluwatar/App.java rename to double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/App.java index 5b731cdfe..863f20882 100644 --- a/double-checked-locking/src/main/java/com/iluwatar/App.java +++ b/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doublecheckedlocking; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/double-checked-locking/src/main/java/com/iluwatar/Inventory.java b/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java similarity index 94% rename from double-checked-locking/src/main/java/com/iluwatar/Inventory.java rename to double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java index aad29a440..368be2f9a 100644 --- a/double-checked-locking/src/main/java/com/iluwatar/Inventory.java +++ b/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doublecheckedlocking; import java.util.ArrayList; import java.util.List; diff --git a/double-checked-locking/src/main/java/com/iluwatar/Item.java b/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java similarity index 53% rename from double-checked-locking/src/main/java/com/iluwatar/Item.java rename to double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java index 76e095e7e..bca41c51e 100644 --- a/double-checked-locking/src/main/java/com/iluwatar/Item.java +++ b/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doublecheckedlocking; public class Item { String name; diff --git a/double-checked-locking/src/test/java/com/iluwatar/AppTest.java b/double-checked-locking/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/double-checked-locking/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/double-checked-locking/src/test/java/com/iluwatar/doublecheckedlocking/AppTest.java b/double-checked-locking/src/test/java/com/iluwatar/doublecheckedlocking/AppTest.java new file mode 100644 index 000000000..ca3d82871 --- /dev/null +++ b/double-checked-locking/src/test/java/com/iluwatar/doublecheckedlocking/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.doublecheckedlocking; + +import org.junit.Test; + +import com.iluwatar.doublecheckedlocking.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/double-dispatch/src/main/java/com/iluwatar/App.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/App.java similarity index 98% rename from double-dispatch/src/main/java/com/iluwatar/App.java rename to double-dispatch/src/main/java/com/iluwatar/doubledispatch/App.java index c95ca8a21..fa799ecfc 100644 --- a/double-dispatch/src/main/java/com/iluwatar/App.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; import java.util.ArrayList; import java.util.List; diff --git a/double-dispatch/src/main/java/com/iluwatar/FlamingAsteroid.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/FlamingAsteroid.java similarity index 89% rename from double-dispatch/src/main/java/com/iluwatar/FlamingAsteroid.java rename to double-dispatch/src/main/java/com/iluwatar/doubledispatch/FlamingAsteroid.java index 755e8f7c3..73b633e5b 100644 --- a/double-dispatch/src/main/java/com/iluwatar/FlamingAsteroid.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/FlamingAsteroid.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; /** * diff --git a/double-dispatch/src/main/java/com/iluwatar/GameObject.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/GameObject.java similarity index 96% rename from double-dispatch/src/main/java/com/iluwatar/GameObject.java rename to double-dispatch/src/main/java/com/iluwatar/doubledispatch/GameObject.java index f6b77fb59..afe05e9b2 100644 --- a/double-dispatch/src/main/java/com/iluwatar/GameObject.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/GameObject.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; /** * diff --git a/double-dispatch/src/main/java/com/iluwatar/Meteoroid.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Meteoroid.java similarity index 96% rename from double-dispatch/src/main/java/com/iluwatar/Meteoroid.java rename to double-dispatch/src/main/java/com/iluwatar/doubledispatch/Meteoroid.java index 4ce55308c..fb59c49b4 100644 --- a/double-dispatch/src/main/java/com/iluwatar/Meteoroid.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Meteoroid.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; /** * diff --git a/double-dispatch/src/main/java/com/iluwatar/Rectangle.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java similarity index 95% rename from double-dispatch/src/main/java/com/iluwatar/Rectangle.java rename to double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java index 86fef6d21..12aca0056 100644 --- a/double-dispatch/src/main/java/com/iluwatar/Rectangle.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/Rectangle.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; /** * diff --git a/double-dispatch/src/main/java/com/iluwatar/SpaceStationIss.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationIss.java similarity index 89% rename from double-dispatch/src/main/java/com/iluwatar/SpaceStationIss.java rename to double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationIss.java index f655fad03..50eae3df8 100644 --- a/double-dispatch/src/main/java/com/iluwatar/SpaceStationIss.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationIss.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; /** * diff --git a/double-dispatch/src/main/java/com/iluwatar/SpaceStationMir.java b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationMir.java similarity index 97% rename from double-dispatch/src/main/java/com/iluwatar/SpaceStationMir.java rename to double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationMir.java index 0a020a434..059b41271 100644 --- a/double-dispatch/src/main/java/com/iluwatar/SpaceStationMir.java +++ b/double-dispatch/src/main/java/com/iluwatar/doubledispatch/SpaceStationMir.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; /** * diff --git a/double-dispatch/src/test/java/com/iluwatar/AppTest.java b/double-dispatch/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index b81f7499d..000000000 --- a/double-dispatch/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/multiton/src/test/java/com/iluwatar/AppTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/AppTest.java similarity index 61% rename from multiton/src/test/java/com/iluwatar/AppTest.java rename to double-dispatch/src/test/java/com/iluwatar/doubledispatch/AppTest.java index b81f7499d..892772e09 100644 --- a/multiton/src/test/java/com/iluwatar/AppTest.java +++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; import org.junit.Test; +import com.iluwatar.doubledispatch.App; + public class AppTest { @Test diff --git a/double-dispatch/src/test/java/com/iluwatar/RectangleTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/RectangleTest.java similarity index 85% rename from double-dispatch/src/test/java/com/iluwatar/RectangleTest.java rename to double-dispatch/src/test/java/com/iluwatar/doubledispatch/RectangleTest.java index 886bc7130..bb8aa954e 100644 --- a/double-dispatch/src/test/java/com/iluwatar/RectangleTest.java +++ b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/RectangleTest.java @@ -1,8 +1,10 @@ -package com.iluwatar; +package com.iluwatar.doubledispatch; import org.junit.Assert; import org.junit.Test; +import com.iluwatar.doubledispatch.Rectangle; + /** * * Unit test for Rectangle diff --git a/event-aggregator/src/main/java/com/iluwatar/App.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/App.java similarity index 92% rename from event-aggregator/src/main/java/com/iluwatar/App.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/App.java index 6a917c3b9..1b13dfdaa 100644 --- a/event-aggregator/src/main/java/com/iluwatar/App.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; import java.util.ArrayList; import java.util.List; diff --git a/event-aggregator/src/main/java/com/iluwatar/Event.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Event.java similarity index 85% rename from event-aggregator/src/main/java/com/iluwatar/Event.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/Event.java index 8f62af015..fbceeb01d 100644 --- a/event-aggregator/src/main/java/com/iluwatar/Event.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Event.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; /** * diff --git a/event-aggregator/src/main/java/com/iluwatar/EventEmitter.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventEmitter.java similarity index 89% rename from event-aggregator/src/main/java/com/iluwatar/EventEmitter.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventEmitter.java index b698dca38..88c23178f 100644 --- a/event-aggregator/src/main/java/com/iluwatar/EventEmitter.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventEmitter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; import java.util.LinkedList; import java.util.List; diff --git a/event-aggregator/src/main/java/com/iluwatar/EventObserver.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventObserver.java similarity index 71% rename from event-aggregator/src/main/java/com/iluwatar/EventObserver.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventObserver.java index a642754ca..c3dc54a47 100644 --- a/event-aggregator/src/main/java/com/iluwatar/EventObserver.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventObserver.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; /** * diff --git a/event-aggregator/src/main/java/com/iluwatar/KingJoffrey.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingJoffrey.java similarity index 82% rename from event-aggregator/src/main/java/com/iluwatar/KingJoffrey.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingJoffrey.java index b37cd5e20..642dfc787 100644 --- a/event-aggregator/src/main/java/com/iluwatar/KingJoffrey.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingJoffrey.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; /** * diff --git a/event-aggregator/src/main/java/com/iluwatar/KingsHand.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingsHand.java similarity index 85% rename from event-aggregator/src/main/java/com/iluwatar/KingsHand.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingsHand.java index 09bec7502..2b8e1e769 100644 --- a/event-aggregator/src/main/java/com/iluwatar/KingsHand.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingsHand.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; /** * diff --git a/event-aggregator/src/main/java/com/iluwatar/LordBaelish.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordBaelish.java similarity index 84% rename from event-aggregator/src/main/java/com/iluwatar/LordBaelish.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordBaelish.java index 38022546c..e3f0223a1 100644 --- a/event-aggregator/src/main/java/com/iluwatar/LordBaelish.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordBaelish.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; /** * diff --git a/event-aggregator/src/main/java/com/iluwatar/LordVarys.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordVarys.java similarity index 84% rename from event-aggregator/src/main/java/com/iluwatar/LordVarys.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordVarys.java index 5d5a25fe8..0afaaf150 100644 --- a/event-aggregator/src/main/java/com/iluwatar/LordVarys.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordVarys.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; /** * diff --git a/event-aggregator/src/main/java/com/iluwatar/Scout.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Scout.java similarity index 83% rename from event-aggregator/src/main/java/com/iluwatar/Scout.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/Scout.java index cdb43742a..6376182b7 100644 --- a/event-aggregator/src/main/java/com/iluwatar/Scout.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Scout.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; /** * diff --git a/event-aggregator/src/main/java/com/iluwatar/Weekday.java b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Weekday.java similarity index 85% rename from event-aggregator/src/main/java/com/iluwatar/Weekday.java rename to event-aggregator/src/main/java/com/iluwatar/eventaggregator/Weekday.java index f7552867f..b62cbb106 100644 --- a/event-aggregator/src/main/java/com/iluwatar/Weekday.java +++ b/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Weekday.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.eventaggregator; public enum Weekday { diff --git a/event-aggregator/src/test/java/com/iluwatar/AppTest.java b/event-aggregator/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 58c74fe79..000000000 --- a/event-aggregator/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.iluwatar; -import org.junit.Test; - -import com.iluwatar.App; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/event-aggregator/src/test/java/com/iluwatar/eventaggregator/AppTest.java b/event-aggregator/src/test/java/com/iluwatar/eventaggregator/AppTest.java new file mode 100644 index 000000000..42710f378 --- /dev/null +++ b/event-aggregator/src/test/java/com/iluwatar/eventaggregator/AppTest.java @@ -0,0 +1,13 @@ +package com.iluwatar.eventaggregator; +import org.junit.Test; + +import com.iluwatar.eventaggregator.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/execute-around/src/main/java/com/iluwatar/App.java b/execute-around/src/main/java/com/iluwatar/executearound/App.java similarity index 96% rename from execute-around/src/main/java/com/iluwatar/App.java rename to execute-around/src/main/java/com/iluwatar/executearound/App.java index d3db00045..783693fac 100644 --- a/execute-around/src/main/java/com/iluwatar/App.java +++ b/execute-around/src/main/java/com/iluwatar/executearound/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.executearound; import java.io.FileWriter; import java.io.IOException; diff --git a/execute-around/src/main/java/com/iluwatar/FileWriterAction.java b/execute-around/src/main/java/com/iluwatar/executearound/FileWriterAction.java similarity index 86% rename from execute-around/src/main/java/com/iluwatar/FileWriterAction.java rename to execute-around/src/main/java/com/iluwatar/executearound/FileWriterAction.java index 3f4fcd16c..12eea7f66 100644 --- a/execute-around/src/main/java/com/iluwatar/FileWriterAction.java +++ b/execute-around/src/main/java/com/iluwatar/executearound/FileWriterAction.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.executearound; import java.io.FileWriter; import java.io.IOException; diff --git a/execute-around/src/main/java/com/iluwatar/SimpleFileWriter.java b/execute-around/src/main/java/com/iluwatar/executearound/SimpleFileWriter.java similarity index 93% rename from execute-around/src/main/java/com/iluwatar/SimpleFileWriter.java rename to execute-around/src/main/java/com/iluwatar/executearound/SimpleFileWriter.java index c4be8a9fa..ee7f23360 100644 --- a/execute-around/src/main/java/com/iluwatar/SimpleFileWriter.java +++ b/execute-around/src/main/java/com/iluwatar/executearound/SimpleFileWriter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.executearound; import java.io.FileWriter; import java.io.IOException; diff --git a/execute-around/src/test/java/com/iluwatar/AppTest.java b/execute-around/src/test/java/com/iluwatar/executearound/AppTest.java similarity index 83% rename from execute-around/src/test/java/com/iluwatar/AppTest.java rename to execute-around/src/test/java/com/iluwatar/executearound/AppTest.java index 0b1004d54..263595cd8 100644 --- a/execute-around/src/test/java/com/iluwatar/AppTest.java +++ b/execute-around/src/test/java/com/iluwatar/executearound/AppTest.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.executearound; import java.io.File; import java.io.IOException; @@ -7,6 +7,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.iluwatar.executearound.App; + /** * * Tests execute-around example. diff --git a/facade/src/main/java/com/iluwatar/App.java b/facade/src/main/java/com/iluwatar/facade/App.java similarity index 87% rename from facade/src/main/java/com/iluwatar/App.java rename to facade/src/main/java/com/iluwatar/facade/App.java index 6a99d0322..09d5d1a0b 100644 --- a/facade/src/main/java/com/iluwatar/App.java +++ b/facade/src/main/java/com/iluwatar/facade/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.facade; /** * diff --git a/facade/src/main/java/com/iluwatar/DwarvenCartOperator.java b/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java similarity index 86% rename from facade/src/main/java/com/iluwatar/DwarvenCartOperator.java rename to facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java index dcb440c04..7c33fd267 100644 --- a/facade/src/main/java/com/iluwatar/DwarvenCartOperator.java +++ b/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.facade; /** * diff --git a/facade/src/main/java/com/iluwatar/DwarvenGoldDigger.java b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java similarity index 85% rename from facade/src/main/java/com/iluwatar/DwarvenGoldDigger.java rename to facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java index 50c1d4e09..b503889b7 100644 --- a/facade/src/main/java/com/iluwatar/DwarvenGoldDigger.java +++ b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.facade; /** * diff --git a/facade/src/main/java/com/iluwatar/DwarvenGoldmineFacade.java b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java similarity index 94% rename from facade/src/main/java/com/iluwatar/DwarvenGoldmineFacade.java rename to facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java index b3a01a3d9..83a989fa7 100644 --- a/facade/src/main/java/com/iluwatar/DwarvenGoldmineFacade.java +++ b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.facade; import java.util.ArrayList; import java.util.Collection; diff --git a/facade/src/main/java/com/iluwatar/DwarvenMineWorker.java b/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java similarity index 93% rename from facade/src/main/java/com/iluwatar/DwarvenMineWorker.java rename to facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java index 74ff80984..3dd51f907 100644 --- a/facade/src/main/java/com/iluwatar/DwarvenMineWorker.java +++ b/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.facade; /** * diff --git a/facade/src/main/java/com/iluwatar/DwarvenTunnelDigger.java b/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java similarity index 86% rename from facade/src/main/java/com/iluwatar/DwarvenTunnelDigger.java rename to facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java index 02f7807a7..05fe02fb6 100644 --- a/facade/src/main/java/com/iluwatar/DwarvenTunnelDigger.java +++ b/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.facade; /** * diff --git a/facade/src/test/java/com/iluwatar/AppTest.java b/facade/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/facade/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/facade/src/test/java/com/iluwatar/facade/AppTest.java b/facade/src/test/java/com/iluwatar/facade/AppTest.java new file mode 100644 index 000000000..b32b16bb1 --- /dev/null +++ b/facade/src/test/java/com/iluwatar/facade/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.facade; + +import org.junit.Test; + +import com.iluwatar.facade.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/factory-method/src/main/java/com/iluwatar/Weapon.java b/factory-method/src/main/java/com/iluwatar/Weapon.java deleted file mode 100644 index 0787c38f3..000000000 --- a/factory-method/src/main/java/com/iluwatar/Weapon.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iluwatar; - -public interface Weapon { - -} diff --git a/factory-method/src/main/java/com/iluwatar/App.java b/factory-method/src/main/java/com/iluwatar/factorymethod/App.java similarity index 92% rename from factory-method/src/main/java/com/iluwatar/App.java rename to factory-method/src/main/java/com/iluwatar/factorymethod/App.java index bd3a1b894..90d14dfb0 100644 --- a/factory-method/src/main/java/com/iluwatar/App.java +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.factorymethod; /** * diff --git a/factory-method/src/main/java/com/iluwatar/Blacksmith.java b/factory-method/src/main/java/com/iluwatar/factorymethod/Blacksmith.java similarity index 76% rename from factory-method/src/main/java/com/iluwatar/Blacksmith.java rename to factory-method/src/main/java/com/iluwatar/factorymethod/Blacksmith.java index 17c427398..b18a5c6df 100644 --- a/factory-method/src/main/java/com/iluwatar/Blacksmith.java +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/Blacksmith.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.factorymethod; /** * diff --git a/factory-method/src/main/java/com/iluwatar/ElfBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factorymethod/ElfBlacksmith.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/ElfBlacksmith.java rename to factory-method/src/main/java/com/iluwatar/factorymethod/ElfBlacksmith.java index 63652de4a..21c6aacdf 100644 --- a/factory-method/src/main/java/com/iluwatar/ElfBlacksmith.java +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/ElfBlacksmith.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.factorymethod; /** * diff --git a/factory-method/src/main/java/com/iluwatar/ElfWeapon.java b/factory-method/src/main/java/com/iluwatar/factorymethod/ElfWeapon.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/ElfWeapon.java rename to factory-method/src/main/java/com/iluwatar/factorymethod/ElfWeapon.java index fe6e81a20..7e90f3b38 100644 --- a/factory-method/src/main/java/com/iluwatar/ElfWeapon.java +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/ElfWeapon.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.factorymethod; public class ElfWeapon implements Weapon { diff --git a/factory-method/src/main/java/com/iluwatar/OrcBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factorymethod/OrcBlacksmith.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/OrcBlacksmith.java rename to factory-method/src/main/java/com/iluwatar/factorymethod/OrcBlacksmith.java index 2f163b009..297dd6b98 100644 --- a/factory-method/src/main/java/com/iluwatar/OrcBlacksmith.java +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/OrcBlacksmith.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.factorymethod; /** * diff --git a/factory-method/src/main/java/com/iluwatar/OrcWeapon.java b/factory-method/src/main/java/com/iluwatar/factorymethod/OrcWeapon.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/OrcWeapon.java rename to factory-method/src/main/java/com/iluwatar/factorymethod/OrcWeapon.java index 7aa42621c..2d7b19adb 100644 --- a/factory-method/src/main/java/com/iluwatar/OrcWeapon.java +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/OrcWeapon.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.factorymethod; public class OrcWeapon implements Weapon { diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java b/factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java new file mode 100644 index 000000000..3a9346d03 --- /dev/null +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java @@ -0,0 +1,5 @@ +package com.iluwatar.factorymethod; + +public interface Weapon { + +} diff --git a/factory-method/src/main/java/com/iluwatar/WeaponType.java b/factory-method/src/main/java/com/iluwatar/factorymethod/WeaponType.java similarity index 82% rename from factory-method/src/main/java/com/iluwatar/WeaponType.java rename to factory-method/src/main/java/com/iluwatar/factorymethod/WeaponType.java index 8d5ab54cc..45e1f82de 100644 --- a/factory-method/src/main/java/com/iluwatar/WeaponType.java +++ b/factory-method/src/main/java/com/iluwatar/factorymethod/WeaponType.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.factorymethod; public enum WeaponType { diff --git a/factory-method/src/test/java/com/iluwatar/AppTest.java b/factory-method/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/factory-method/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/factory-method/src/test/java/com/iluwatar/factorymethod/AppTest.java b/factory-method/src/test/java/com/iluwatar/factorymethod/AppTest.java new file mode 100644 index 000000000..0abf55c2d --- /dev/null +++ b/factory-method/src/test/java/com/iluwatar/factorymethod/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.factorymethod; + +import org.junit.Test; + +import com.iluwatar.factorymethod.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/flux/src/main/java/com/iluwatar/action/Action.java b/flux/src/main/java/com/iluwatar/flux/action/Action.java similarity index 88% rename from flux/src/main/java/com/iluwatar/action/Action.java rename to flux/src/main/java/com/iluwatar/flux/action/Action.java index 6b26a81ae..24d294be7 100644 --- a/flux/src/main/java/com/iluwatar/action/Action.java +++ b/flux/src/main/java/com/iluwatar/flux/action/Action.java @@ -1,4 +1,4 @@ -package com.iluwatar.action; +package com.iluwatar.flux.action; /** * diff --git a/flux/src/main/java/com/iluwatar/action/ActionType.java b/flux/src/main/java/com/iluwatar/flux/action/ActionType.java similarity index 75% rename from flux/src/main/java/com/iluwatar/action/ActionType.java rename to flux/src/main/java/com/iluwatar/flux/action/ActionType.java index 4cc8e060c..318ca1b12 100644 --- a/flux/src/main/java/com/iluwatar/action/ActionType.java +++ b/flux/src/main/java/com/iluwatar/flux/action/ActionType.java @@ -1,4 +1,4 @@ -package com.iluwatar.action; +package com.iluwatar.flux.action; /** * diff --git a/flux/src/main/java/com/iluwatar/action/Content.java b/flux/src/main/java/com/iluwatar/flux/action/Content.java similarity index 90% rename from flux/src/main/java/com/iluwatar/action/Content.java rename to flux/src/main/java/com/iluwatar/flux/action/Content.java index f4f5d830b..e53871d89 100644 --- a/flux/src/main/java/com/iluwatar/action/Content.java +++ b/flux/src/main/java/com/iluwatar/flux/action/Content.java @@ -1,4 +1,4 @@ -package com.iluwatar.action; +package com.iluwatar.flux.action; /** * diff --git a/flux/src/main/java/com/iluwatar/action/ContentAction.java b/flux/src/main/java/com/iluwatar/flux/action/ContentAction.java similarity index 89% rename from flux/src/main/java/com/iluwatar/action/ContentAction.java rename to flux/src/main/java/com/iluwatar/flux/action/ContentAction.java index 7ab20e55b..2c1a40e6e 100644 --- a/flux/src/main/java/com/iluwatar/action/ContentAction.java +++ b/flux/src/main/java/com/iluwatar/flux/action/ContentAction.java @@ -1,4 +1,4 @@ -package com.iluwatar.action; +package com.iluwatar.flux.action; /** * diff --git a/flux/src/main/java/com/iluwatar/action/MenuAction.java b/flux/src/main/java/com/iluwatar/flux/action/MenuAction.java similarity index 89% rename from flux/src/main/java/com/iluwatar/action/MenuAction.java rename to flux/src/main/java/com/iluwatar/flux/action/MenuAction.java index b1a5fbda7..a3dd9875e 100644 --- a/flux/src/main/java/com/iluwatar/action/MenuAction.java +++ b/flux/src/main/java/com/iluwatar/flux/action/MenuAction.java @@ -1,4 +1,4 @@ -package com.iluwatar.action; +package com.iluwatar.flux.action; /** diff --git a/flux/src/main/java/com/iluwatar/action/MenuItem.java b/flux/src/main/java/com/iluwatar/flux/action/MenuItem.java similarity index 88% rename from flux/src/main/java/com/iluwatar/action/MenuItem.java rename to flux/src/main/java/com/iluwatar/flux/action/MenuItem.java index 2d3086b80..d842fca78 100644 --- a/flux/src/main/java/com/iluwatar/action/MenuItem.java +++ b/flux/src/main/java/com/iluwatar/flux/action/MenuItem.java @@ -1,4 +1,4 @@ -package com.iluwatar.action; +package com.iluwatar.flux.action; /** * diff --git a/flux/src/main/java/com/iluwatar/app/App.java b/flux/src/main/java/com/iluwatar/flux/app/App.java similarity index 84% rename from flux/src/main/java/com/iluwatar/app/App.java rename to flux/src/main/java/com/iluwatar/flux/app/App.java index 48e78bfab..d0c7763e7 100644 --- a/flux/src/main/java/com/iluwatar/app/App.java +++ b/flux/src/main/java/com/iluwatar/flux/app/App.java @@ -1,11 +1,11 @@ -package com.iluwatar.app; +package com.iluwatar.flux.app; -import com.iluwatar.action.MenuItem; -import com.iluwatar.dispatcher.Dispatcher; -import com.iluwatar.store.ContentStore; -import com.iluwatar.store.MenuStore; -import com.iluwatar.view.ContentView; -import com.iluwatar.view.MenuView; +import com.iluwatar.flux.action.MenuItem; +import com.iluwatar.flux.dispatcher.Dispatcher; +import com.iluwatar.flux.store.ContentStore; +import com.iluwatar.flux.store.MenuStore; +import com.iluwatar.flux.view.ContentView; +import com.iluwatar.flux.view.MenuView; /** * diff --git a/flux/src/main/java/com/iluwatar/dispatcher/Dispatcher.java b/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java similarity index 74% rename from flux/src/main/java/com/iluwatar/dispatcher/Dispatcher.java rename to flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java index 6372a6fb8..8bf03e4b0 100644 --- a/flux/src/main/java/com/iluwatar/dispatcher/Dispatcher.java +++ b/flux/src/main/java/com/iluwatar/flux/dispatcher/Dispatcher.java @@ -1,14 +1,14 @@ -package com.iluwatar.dispatcher; +package com.iluwatar.flux.dispatcher; import java.util.LinkedList; import java.util.List; -import com.iluwatar.action.Action; -import com.iluwatar.action.Content; -import com.iluwatar.action.ContentAction; -import com.iluwatar.action.MenuAction; -import com.iluwatar.action.MenuItem; -import com.iluwatar.store.Store; +import com.iluwatar.flux.action.Action; +import com.iluwatar.flux.action.Content; +import com.iluwatar.flux.action.ContentAction; +import com.iluwatar.flux.action.MenuAction; +import com.iluwatar.flux.action.MenuItem; +import com.iluwatar.flux.store.Store; /** * diff --git a/flux/src/main/java/com/iluwatar/store/ContentStore.java b/flux/src/main/java/com/iluwatar/flux/store/ContentStore.java similarity index 67% rename from flux/src/main/java/com/iluwatar/store/ContentStore.java rename to flux/src/main/java/com/iluwatar/flux/store/ContentStore.java index 0587763a9..15d031abd 100644 --- a/flux/src/main/java/com/iluwatar/store/ContentStore.java +++ b/flux/src/main/java/com/iluwatar/flux/store/ContentStore.java @@ -1,9 +1,9 @@ -package com.iluwatar.store; +package com.iluwatar.flux.store; -import com.iluwatar.action.Action; -import com.iluwatar.action.ActionType; -import com.iluwatar.action.Content; -import com.iluwatar.action.ContentAction; +import com.iluwatar.flux.action.Action; +import com.iluwatar.flux.action.ActionType; +import com.iluwatar.flux.action.Content; +import com.iluwatar.flux.action.ContentAction; /** * diff --git a/flux/src/main/java/com/iluwatar/store/MenuStore.java b/flux/src/main/java/com/iluwatar/flux/store/MenuStore.java similarity index 67% rename from flux/src/main/java/com/iluwatar/store/MenuStore.java rename to flux/src/main/java/com/iluwatar/flux/store/MenuStore.java index ba78d0c11..3e614ac73 100644 --- a/flux/src/main/java/com/iluwatar/store/MenuStore.java +++ b/flux/src/main/java/com/iluwatar/flux/store/MenuStore.java @@ -1,9 +1,9 @@ -package com.iluwatar.store; +package com.iluwatar.flux.store; -import com.iluwatar.action.Action; -import com.iluwatar.action.ActionType; -import com.iluwatar.action.MenuAction; -import com.iluwatar.action.MenuItem; +import com.iluwatar.flux.action.Action; +import com.iluwatar.flux.action.ActionType; +import com.iluwatar.flux.action.MenuAction; +import com.iluwatar.flux.action.MenuItem; /** * diff --git a/flux/src/main/java/com/iluwatar/store/Store.java b/flux/src/main/java/com/iluwatar/flux/store/Store.java similarity index 78% rename from flux/src/main/java/com/iluwatar/store/Store.java rename to flux/src/main/java/com/iluwatar/flux/store/Store.java index 66edfb643..326af404b 100644 --- a/flux/src/main/java/com/iluwatar/store/Store.java +++ b/flux/src/main/java/com/iluwatar/flux/store/Store.java @@ -1,10 +1,10 @@ -package com.iluwatar.store; +package com.iluwatar.flux.store; import java.util.LinkedList; import java.util.List; -import com.iluwatar.action.Action; -import com.iluwatar.view.View; +import com.iluwatar.flux.action.Action; +import com.iluwatar.flux.view.View; /** * diff --git a/flux/src/main/java/com/iluwatar/view/ContentView.java b/flux/src/main/java/com/iluwatar/flux/view/ContentView.java similarity index 71% rename from flux/src/main/java/com/iluwatar/view/ContentView.java rename to flux/src/main/java/com/iluwatar/flux/view/ContentView.java index f2ecf006f..b12c8b7a2 100644 --- a/flux/src/main/java/com/iluwatar/view/ContentView.java +++ b/flux/src/main/java/com/iluwatar/flux/view/ContentView.java @@ -1,8 +1,8 @@ -package com.iluwatar.view; +package com.iluwatar.flux.view; -import com.iluwatar.action.Content; -import com.iluwatar.store.ContentStore; -import com.iluwatar.store.Store; +import com.iluwatar.flux.action.Content; +import com.iluwatar.flux.store.ContentStore; +import com.iluwatar.flux.store.Store; /** * diff --git a/flux/src/main/java/com/iluwatar/view/MenuView.java b/flux/src/main/java/com/iluwatar/flux/view/MenuView.java similarity index 75% rename from flux/src/main/java/com/iluwatar/view/MenuView.java rename to flux/src/main/java/com/iluwatar/flux/view/MenuView.java index e94ec66f0..f37d21bb9 100644 --- a/flux/src/main/java/com/iluwatar/view/MenuView.java +++ b/flux/src/main/java/com/iluwatar/flux/view/MenuView.java @@ -1,9 +1,9 @@ -package com.iluwatar.view; +package com.iluwatar.flux.view; -import com.iluwatar.action.MenuItem; -import com.iluwatar.dispatcher.Dispatcher; -import com.iluwatar.store.MenuStore; -import com.iluwatar.store.Store; +import com.iluwatar.flux.action.MenuItem; +import com.iluwatar.flux.dispatcher.Dispatcher; +import com.iluwatar.flux.store.MenuStore; +import com.iluwatar.flux.store.Store; /** * diff --git a/flux/src/main/java/com/iluwatar/view/View.java b/flux/src/main/java/com/iluwatar/flux/view/View.java similarity index 68% rename from flux/src/main/java/com/iluwatar/view/View.java rename to flux/src/main/java/com/iluwatar/flux/view/View.java index 26994b73a..4eb6ee3fb 100644 --- a/flux/src/main/java/com/iluwatar/view/View.java +++ b/flux/src/main/java/com/iluwatar/flux/view/View.java @@ -1,6 +1,6 @@ -package com.iluwatar.view; +package com.iluwatar.flux.view; -import com.iluwatar.store.Store; +import com.iluwatar.flux.store.Store; /** * diff --git a/service-layer/src/test/java/com/iluwatar/app/AppTest.java b/flux/src/test/java/com/iluwatar/flux/app/AppTest.java similarity index 65% rename from service-layer/src/test/java/com/iluwatar/app/AppTest.java rename to flux/src/test/java/com/iluwatar/flux/app/AppTest.java index e0eb3d65e..902e5872e 100644 --- a/service-layer/src/test/java/com/iluwatar/app/AppTest.java +++ b/flux/src/test/java/com/iluwatar/flux/app/AppTest.java @@ -1,8 +1,8 @@ -package com.iluwatar.app; +package com.iluwatar.flux.app; import org.junit.Test; -import com.iluwatar.app.App; +import com.iluwatar.flux.app.App; public class AppTest { diff --git a/flyweight/src/main/java/com/iluwatar/AlchemistShop.java b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java similarity index 94% rename from flyweight/src/main/java/com/iluwatar/AlchemistShop.java rename to flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java index c41c273e0..bfeb27e6a 100644 --- a/flyweight/src/main/java/com/iluwatar/AlchemistShop.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; import java.util.ArrayList; import java.util.List; diff --git a/flyweight/src/main/java/com/iluwatar/App.java b/flyweight/src/main/java/com/iluwatar/flyweight/App.java similarity index 92% rename from flyweight/src/main/java/com/iluwatar/App.java rename to flyweight/src/main/java/com/iluwatar/flyweight/App.java index be4dea133..f88dd5346 100644 --- a/flyweight/src/main/java/com/iluwatar/App.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; /** * diff --git a/flyweight/src/main/java/com/iluwatar/HealingPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java similarity index 80% rename from flyweight/src/main/java/com/iluwatar/HealingPotion.java rename to flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java index 45a37cc6c..397cca428 100644 --- a/flyweight/src/main/java/com/iluwatar/HealingPotion.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; public class HealingPotion implements Potion { diff --git a/flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java similarity index 81% rename from flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java rename to flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java index 91fa2347e..df4c4009e 100644 --- a/flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; public class HolyWaterPotion implements Potion { diff --git a/flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java similarity index 81% rename from flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java rename to flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java index aa14b8633..2156b1017 100644 --- a/flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; public class InvisibilityPotion implements Potion { diff --git a/flyweight/src/main/java/com/iluwatar/PoisonPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java similarity index 81% rename from flyweight/src/main/java/com/iluwatar/PoisonPotion.java rename to flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java index 299aacf35..2dcfab7d3 100644 --- a/flyweight/src/main/java/com/iluwatar/PoisonPotion.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; public class PoisonPotion implements Potion { diff --git a/flyweight/src/main/java/com/iluwatar/Potion.java b/flyweight/src/main/java/com/iluwatar/flyweight/Potion.java similarity index 66% rename from flyweight/src/main/java/com/iluwatar/Potion.java rename to flyweight/src/main/java/com/iluwatar/flyweight/Potion.java index 126ce8b32..c4110201c 100644 --- a/flyweight/src/main/java/com/iluwatar/Potion.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/Potion.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; /** * diff --git a/flyweight/src/main/java/com/iluwatar/PotionFactory.java b/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java similarity index 92% rename from flyweight/src/main/java/com/iluwatar/PotionFactory.java rename to flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java index 71586dced..20ec110e3 100644 --- a/flyweight/src/main/java/com/iluwatar/PotionFactory.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; import java.util.EnumMap; import java.util.Map; diff --git a/flyweight/src/main/java/com/iluwatar/PotionType.java b/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java similarity index 75% rename from flyweight/src/main/java/com/iluwatar/PotionType.java rename to flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java index 9d63ee9f1..bbb9b6521 100644 --- a/flyweight/src/main/java/com/iluwatar/PotionType.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; /** * diff --git a/flyweight/src/main/java/com/iluwatar/StrengthPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java similarity index 81% rename from flyweight/src/main/java/com/iluwatar/StrengthPotion.java rename to flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java index 8b1d3ceb4..a1ffcdc53 100644 --- a/flyweight/src/main/java/com/iluwatar/StrengthPotion.java +++ b/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.flyweight; public class StrengthPotion implements Potion { diff --git a/flyweight/src/test/java/com/iluwatar/AppTest.java b/flyweight/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/flyweight/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/flyweight/src/test/java/com/iluwatar/flyweight/AppTest.java b/flyweight/src/test/java/com/iluwatar/flyweight/AppTest.java new file mode 100644 index 000000000..2c93d0e10 --- /dev/null +++ b/flyweight/src/test/java/com/iluwatar/flyweight/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.flyweight; + +import org.junit.Test; + +import com.iluwatar.flyweight.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/intercepting-filter/src/main/java/com/iluwatar/AbstractFilter.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AbstractFilter.java similarity index 94% rename from intercepting-filter/src/main/java/com/iluwatar/AbstractFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AbstractFilter.java index b24d28575..680738d6d 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/AbstractFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AbstractFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Base class for order processing filters. diff --git a/intercepting-filter/src/main/java/com/iluwatar/AddressFilter.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AddressFilter.java similarity index 91% rename from intercepting-filter/src/main/java/com/iluwatar/AddressFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AddressFilter.java index fadba0e0d..836cc3928 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/AddressFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AddressFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Concrete implementation of filter diff --git a/intercepting-filter/src/main/java/com/iluwatar/App.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/App.java similarity index 93% rename from intercepting-filter/src/main/java/com/iluwatar/App.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/App.java index c6c77d4f4..51e363663 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/App.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * diff --git a/intercepting-filter/src/main/java/com/iluwatar/Client.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Client.java similarity index 98% rename from intercepting-filter/src/main/java/com/iluwatar/Client.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Client.java index a2e20ced0..fde2b012d 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/Client.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Client.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; import java.awt.BorderLayout; import java.awt.GridLayout; diff --git a/intercepting-filter/src/main/java/com/iluwatar/ContactFilter.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/ContactFilter.java similarity index 94% rename from intercepting-filter/src/main/java/com/iluwatar/ContactFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/ContactFilter.java index 1a545a85c..449d00be1 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/ContactFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/ContactFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Concrete implementation of filter diff --git a/intercepting-filter/src/main/java/com/iluwatar/DepositFilter.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/DepositFilter.java similarity index 91% rename from intercepting-filter/src/main/java/com/iluwatar/DepositFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/DepositFilter.java index 7361834c3..aa46c149c 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/DepositFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/DepositFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Concrete implementation of filter diff --git a/intercepting-filter/src/main/java/com/iluwatar/Filter.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Filter.java similarity index 94% rename from intercepting-filter/src/main/java/com/iluwatar/Filter.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Filter.java index f6deb18b4..dc7e3445a 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/Filter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Filter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Filter interface Filters perform certain tasks prior or after execution of diff --git a/intercepting-filter/src/main/java/com/iluwatar/FilterChain.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterChain.java similarity index 93% rename from intercepting-filter/src/main/java/com/iluwatar/FilterChain.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterChain.java index 86acb4a9c..56446833d 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/FilterChain.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterChain.java @@ -1,4 +1,4 @@ - package com.iluwatar; + package com.iluwatar.interceptingfilter; /** diff --git a/intercepting-filter/src/main/java/com/iluwatar/FilterManager.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterManager.java similarity index 90% rename from intercepting-filter/src/main/java/com/iluwatar/FilterManager.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterManager.java index ad8d14d3a..f729ee734 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/FilterManager.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterManager.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Filter Manager manages the filters and Filter Chain. diff --git a/intercepting-filter/src/main/java/com/iluwatar/NameFilter.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/NameFilter.java similarity index 92% rename from intercepting-filter/src/main/java/com/iluwatar/NameFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/NameFilter.java index 93f79e7d5..ff4c9fd8d 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/NameFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/NameFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Concrete implementation of filter This filter checks if the input in the Name diff --git a/intercepting-filter/src/main/java/com/iluwatar/Order.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Order.java similarity index 96% rename from intercepting-filter/src/main/java/com/iluwatar/Order.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Order.java index d3ab5a96d..96a30fd0a 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/Order.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Order.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Order class carries the order data. diff --git a/intercepting-filter/src/main/java/com/iluwatar/OrderFilter.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/OrderFilter.java similarity index 90% rename from intercepting-filter/src/main/java/com/iluwatar/OrderFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/OrderFilter.java index e9afda424..b85fa3079 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/OrderFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/OrderFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; /** * Concrete implementation of filter This checks for the order field diff --git a/intercepting-filter/src/main/java/com/iluwatar/Target.java b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java similarity index 97% rename from intercepting-filter/src/main/java/com/iluwatar/Target.java rename to intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java index a268eef76..2e68c2380 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/Target.java +++ b/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interceptingfilter; import java.awt.BorderLayout; import java.awt.Dimension; diff --git a/interpreter/src/main/java/com/iluwatar/App.java b/interpreter/src/main/java/com/iluwatar/interpreter/App.java similarity index 94% rename from interpreter/src/main/java/com/iluwatar/App.java rename to interpreter/src/main/java/com/iluwatar/interpreter/App.java index 94bbc4466..56924f6b0 100644 --- a/interpreter/src/main/java/com/iluwatar/App.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interpreter; import java.util.Stack; diff --git a/interpreter/src/main/java/com/iluwatar/Expression.java b/interpreter/src/main/java/com/iluwatar/interpreter/Expression.java similarity index 73% rename from interpreter/src/main/java/com/iluwatar/Expression.java rename to interpreter/src/main/java/com/iluwatar/interpreter/Expression.java index 780a756ee..877e5db33 100644 --- a/interpreter/src/main/java/com/iluwatar/Expression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/Expression.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interpreter; public abstract class Expression { diff --git a/interpreter/src/main/java/com/iluwatar/MinusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java similarity index 88% rename from interpreter/src/main/java/com/iluwatar/MinusExpression.java rename to interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java index a12847863..03d088604 100644 --- a/interpreter/src/main/java/com/iluwatar/MinusExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interpreter; public class MinusExpression extends Expression { diff --git a/interpreter/src/main/java/com/iluwatar/MultiplyExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java similarity index 88% rename from interpreter/src/main/java/com/iluwatar/MultiplyExpression.java rename to interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java index 8a9b984c8..fa30e4236 100644 --- a/interpreter/src/main/java/com/iluwatar/MultiplyExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interpreter; public class MultiplyExpression extends Expression { diff --git a/interpreter/src/main/java/com/iluwatar/NumberExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java similarity index 85% rename from interpreter/src/main/java/com/iluwatar/NumberExpression.java rename to interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java index 6c947f370..041ddccae 100644 --- a/interpreter/src/main/java/com/iluwatar/NumberExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interpreter; public class NumberExpression extends Expression { diff --git a/interpreter/src/main/java/com/iluwatar/PlusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java similarity index 88% rename from interpreter/src/main/java/com/iluwatar/PlusExpression.java rename to interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java index f23df814d..843a66b62 100644 --- a/interpreter/src/main/java/com/iluwatar/PlusExpression.java +++ b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.interpreter; public class PlusExpression extends Expression { diff --git a/interpreter/src/test/java/com/iluwatar/AppTest.java b/interpreter/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/interpreter/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/interpreter/src/test/java/com/iluwatar/interpreter/AppTest.java b/interpreter/src/test/java/com/iluwatar/interpreter/AppTest.java new file mode 100644 index 000000000..f89150159 --- /dev/null +++ b/interpreter/src/test/java/com/iluwatar/interpreter/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.interpreter; + +import org.junit.Test; + +import com.iluwatar.interpreter.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/iterator/src/main/java/com/iluwatar/App.java b/iterator/src/main/java/com/iluwatar/iterator/App.java similarity index 93% rename from iterator/src/main/java/com/iluwatar/App.java rename to iterator/src/main/java/com/iluwatar/iterator/App.java index f1b99e7fc..22a6ea2d7 100644 --- a/iterator/src/main/java/com/iluwatar/App.java +++ b/iterator/src/main/java/com/iluwatar/iterator/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.iterator; /** * diff --git a/iterator/src/main/java/com/iluwatar/Item.java b/iterator/src/main/java/com/iluwatar/iterator/Item.java similarity index 85% rename from iterator/src/main/java/com/iluwatar/Item.java rename to iterator/src/main/java/com/iluwatar/iterator/Item.java index d3c1ff360..c22eba96f 100644 --- a/iterator/src/main/java/com/iluwatar/Item.java +++ b/iterator/src/main/java/com/iluwatar/iterator/Item.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.iterator; public class Item { diff --git a/iterator/src/main/java/com/iluwatar/ItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java similarity index 71% rename from iterator/src/main/java/com/iluwatar/ItemIterator.java rename to iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java index 30f11e1ce..b18cd608e 100644 --- a/iterator/src/main/java/com/iluwatar/ItemIterator.java +++ b/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.iterator; /** * diff --git a/iterator/src/main/java/com/iluwatar/ItemType.java b/iterator/src/main/java/com/iluwatar/iterator/ItemType.java similarity index 59% rename from iterator/src/main/java/com/iluwatar/ItemType.java rename to iterator/src/main/java/com/iluwatar/iterator/ItemType.java index 0ea0fba2c..a3d4d3f54 100644 --- a/iterator/src/main/java/com/iluwatar/ItemType.java +++ b/iterator/src/main/java/com/iluwatar/iterator/ItemType.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.iterator; public enum ItemType { diff --git a/iterator/src/main/java/com/iluwatar/TreasureChest.java b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java similarity index 93% rename from iterator/src/main/java/com/iluwatar/TreasureChest.java rename to iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java index 5131c403a..e20269023 100644 --- a/iterator/src/main/java/com/iluwatar/TreasureChest.java +++ b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.iterator; import java.util.ArrayList; import java.util.List; diff --git a/iterator/src/main/java/com/iluwatar/TreasureChestItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java similarity index 91% rename from iterator/src/main/java/com/iluwatar/TreasureChestItemIterator.java rename to iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java index b25eadb46..fca50725d 100644 --- a/iterator/src/main/java/com/iluwatar/TreasureChestItemIterator.java +++ b/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.iterator; import java.util.List; diff --git a/iterator/src/test/java/com/iluwatar/AppTest.java b/iterator/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/iterator/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/iterator/src/test/java/com/iluwatar/iterator/AppTest.java b/iterator/src/test/java/com/iluwatar/iterator/AppTest.java new file mode 100644 index 000000000..ffdbb9ba1 --- /dev/null +++ b/iterator/src/test/java/com/iluwatar/iterator/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.iterator; + +import org.junit.Test; + +import com.iluwatar.iterator.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/lazy-loading/src/main/java/com/iluwatar/App.java b/lazy-loading/src/main/java/com/iluwatar/lazyloading/App.java similarity index 96% rename from lazy-loading/src/main/java/com/iluwatar/App.java rename to lazy-loading/src/main/java/com/iluwatar/lazyloading/App.java index c0f4b0591..608c39b5f 100644 --- a/lazy-loading/src/main/java/com/iluwatar/App.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazyloading/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.lazyloading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/Heavy.java b/lazy-loading/src/main/java/com/iluwatar/lazyloading/Heavy.java similarity index 89% rename from lazy-loading/src/main/java/com/iluwatar/Heavy.java rename to lazy-loading/src/main/java/com/iluwatar/lazyloading/Heavy.java index 534b83c9e..d87d4b5f7 100644 --- a/lazy-loading/src/main/java/com/iluwatar/Heavy.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazyloading/Heavy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.lazyloading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/HolderNaive.java b/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderNaive.java similarity index 90% rename from lazy-loading/src/main/java/com/iluwatar/HolderNaive.java rename to lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderNaive.java index b741cb7d5..1abc6463a 100644 --- a/lazy-loading/src/main/java/com/iluwatar/HolderNaive.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderNaive.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.lazyloading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/HolderThreadSafe.java b/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderThreadSafe.java similarity index 92% rename from lazy-loading/src/main/java/com/iluwatar/HolderThreadSafe.java rename to lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderThreadSafe.java index ef8282bd3..eff35c14a 100644 --- a/lazy-loading/src/main/java/com/iluwatar/HolderThreadSafe.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderThreadSafe.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.lazyloading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/Java8Holder.java b/lazy-loading/src/main/java/com/iluwatar/lazyloading/Java8Holder.java similarity index 95% rename from lazy-loading/src/main/java/com/iluwatar/Java8Holder.java rename to lazy-loading/src/main/java/com/iluwatar/lazyloading/Java8Holder.java index c0241592a..6be5e374e 100644 --- a/lazy-loading/src/main/java/com/iluwatar/Java8Holder.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazyloading/Java8Holder.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.lazyloading; import java.util.function.Supplier; diff --git a/lazy-loading/src/test/java/com/iluwatar/AppTest.java b/lazy-loading/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 6db5ad214..000000000 --- a/lazy-loading/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/lazy-loading/src/test/java/com/iluwatar/lazyloading/AppTest.java b/lazy-loading/src/test/java/com/iluwatar/lazyloading/AppTest.java new file mode 100644 index 000000000..142da8f2e --- /dev/null +++ b/lazy-loading/src/test/java/com/iluwatar/lazyloading/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.lazyloading; + +import org.junit.Test; + +import com.iluwatar.lazyloading.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/mediator/src/main/java/com/iluwatar/Action.java b/mediator/src/main/java/com/iluwatar/mediator/Action.java similarity index 90% rename from mediator/src/main/java/com/iluwatar/Action.java rename to mediator/src/main/java/com/iluwatar/mediator/Action.java index eb237269f..a5b466342 100644 --- a/mediator/src/main/java/com/iluwatar/Action.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Action.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/App.java b/mediator/src/main/java/com/iluwatar/mediator/App.java similarity index 92% rename from mediator/src/main/java/com/iluwatar/App.java rename to mediator/src/main/java/com/iluwatar/mediator/App.java index bf8e64f88..6c5233d26 100644 --- a/mediator/src/main/java/com/iluwatar/App.java +++ b/mediator/src/main/java/com/iluwatar/mediator/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/Hobbit.java b/mediator/src/main/java/com/iluwatar/mediator/Hobbit.java similarity index 76% rename from mediator/src/main/java/com/iluwatar/Hobbit.java rename to mediator/src/main/java/com/iluwatar/mediator/Hobbit.java index 918c86645..5981a34a8 100644 --- a/mediator/src/main/java/com/iluwatar/Hobbit.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Hobbit.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/Hunter.java b/mediator/src/main/java/com/iluwatar/mediator/Hunter.java similarity index 76% rename from mediator/src/main/java/com/iluwatar/Hunter.java rename to mediator/src/main/java/com/iluwatar/mediator/Hunter.java index b6974968c..1487c836e 100644 --- a/mediator/src/main/java/com/iluwatar/Hunter.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Hunter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/Party.java b/mediator/src/main/java/com/iluwatar/mediator/Party.java similarity index 76% rename from mediator/src/main/java/com/iluwatar/Party.java rename to mediator/src/main/java/com/iluwatar/mediator/Party.java index 24b57e629..9328cdaa2 100644 --- a/mediator/src/main/java/com/iluwatar/Party.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Party.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/PartyImpl.java b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java similarity index 89% rename from mediator/src/main/java/com/iluwatar/PartyImpl.java rename to mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java index 634c3444b..5548f5163 100644 --- a/mediator/src/main/java/com/iluwatar/PartyImpl.java +++ b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; import java.util.ArrayList; import java.util.List; diff --git a/mediator/src/main/java/com/iluwatar/PartyMember.java b/mediator/src/main/java/com/iluwatar/mediator/PartyMember.java similarity index 81% rename from mediator/src/main/java/com/iluwatar/PartyMember.java rename to mediator/src/main/java/com/iluwatar/mediator/PartyMember.java index 126cf5250..4dbfd450b 100644 --- a/mediator/src/main/java/com/iluwatar/PartyMember.java +++ b/mediator/src/main/java/com/iluwatar/mediator/PartyMember.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/PartyMemberBase.java b/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java similarity index 90% rename from mediator/src/main/java/com/iluwatar/PartyMemberBase.java rename to mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java index d352b7b33..7a151c355 100644 --- a/mediator/src/main/java/com/iluwatar/PartyMemberBase.java +++ b/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/Rogue.java b/mediator/src/main/java/com/iluwatar/mediator/Rogue.java similarity index 76% rename from mediator/src/main/java/com/iluwatar/Rogue.java rename to mediator/src/main/java/com/iluwatar/mediator/Rogue.java index 4d13ec4c1..69974066f 100644 --- a/mediator/src/main/java/com/iluwatar/Rogue.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Rogue.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/main/java/com/iluwatar/Wizard.java b/mediator/src/main/java/com/iluwatar/mediator/Wizard.java similarity index 76% rename from mediator/src/main/java/com/iluwatar/Wizard.java rename to mediator/src/main/java/com/iluwatar/mediator/Wizard.java index 126f31018..d4d2594d7 100644 --- a/mediator/src/main/java/com/iluwatar/Wizard.java +++ b/mediator/src/main/java/com/iluwatar/mediator/Wizard.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.mediator; /** * diff --git a/mediator/src/test/java/com/iluwatar/AppTest.java b/mediator/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/mediator/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/mediator/src/test/java/com/iluwatar/mediator/AppTest.java b/mediator/src/test/java/com/iluwatar/mediator/AppTest.java new file mode 100644 index 000000000..79bd9478d --- /dev/null +++ b/mediator/src/test/java/com/iluwatar/mediator/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.mediator; + +import org.junit.Test; + +import com.iluwatar.mediator.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/memento/src/main/java/com/iluwatar/App.java b/memento/src/main/java/com/iluwatar/memento/App.java similarity index 93% rename from memento/src/main/java/com/iluwatar/App.java rename to memento/src/main/java/com/iluwatar/memento/App.java index 901734e3b..9411cb4fd 100644 --- a/memento/src/main/java/com/iluwatar/App.java +++ b/memento/src/main/java/com/iluwatar/memento/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.memento; import java.util.Stack; diff --git a/memento/src/main/java/com/iluwatar/Star.java b/memento/src/main/java/com/iluwatar/memento/Star.java similarity index 98% rename from memento/src/main/java/com/iluwatar/Star.java rename to memento/src/main/java/com/iluwatar/memento/Star.java index 52b76d53b..43b5c5c3c 100644 --- a/memento/src/main/java/com/iluwatar/Star.java +++ b/memento/src/main/java/com/iluwatar/memento/Star.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.memento; /** * diff --git a/memento/src/main/java/com/iluwatar/StarMemento.java b/memento/src/main/java/com/iluwatar/memento/StarMemento.java similarity index 68% rename from memento/src/main/java/com/iluwatar/StarMemento.java rename to memento/src/main/java/com/iluwatar/memento/StarMemento.java index e9511a9c9..a60f1f058 100644 --- a/memento/src/main/java/com/iluwatar/StarMemento.java +++ b/memento/src/main/java/com/iluwatar/memento/StarMemento.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.memento; /** * diff --git a/memento/src/main/java/com/iluwatar/StarType.java b/memento/src/main/java/com/iluwatar/memento/StarType.java similarity index 86% rename from memento/src/main/java/com/iluwatar/StarType.java rename to memento/src/main/java/com/iluwatar/memento/StarType.java index 5914e8528..442025525 100644 --- a/memento/src/main/java/com/iluwatar/StarType.java +++ b/memento/src/main/java/com/iluwatar/memento/StarType.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.memento; public enum StarType { diff --git a/memento/src/test/java/com/iluwatar/AppTest.java b/memento/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/memento/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/memento/src/test/java/com/iluwatar/memento/AppTest.java b/memento/src/test/java/com/iluwatar/memento/AppTest.java new file mode 100644 index 000000000..72bd5946d --- /dev/null +++ b/memento/src/test/java/com/iluwatar/memento/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.memento; + +import org.junit.Test; + +import com.iluwatar.memento.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/model-view-controller/src/main/java/com/iluwatar/App.java b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/App.java similarity index 97% rename from model-view-controller/src/main/java/com/iluwatar/App.java rename to model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/App.java index df54067d2..eb9fbdc8f 100644 --- a/model-view-controller/src/main/java/com/iluwatar/App.java +++ b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewcontroller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/Fatigue.java b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Fatigue.java similarity index 85% rename from model-view-controller/src/main/java/com/iluwatar/Fatigue.java rename to model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Fatigue.java index f4712fe5f..7faa5f71b 100644 --- a/model-view-controller/src/main/java/com/iluwatar/Fatigue.java +++ b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Fatigue.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewcontroller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/GiantController.java b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantController.java similarity index 95% rename from model-view-controller/src/main/java/com/iluwatar/GiantController.java rename to model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantController.java index 82f6c0406..ab5f6d127 100644 --- a/model-view-controller/src/main/java/com/iluwatar/GiantController.java +++ b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantController.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewcontroller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/GiantModel.java b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantModel.java similarity index 95% rename from model-view-controller/src/main/java/com/iluwatar/GiantModel.java rename to model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantModel.java index 94a8ac55d..f623cd0a1 100644 --- a/model-view-controller/src/main/java/com/iluwatar/GiantModel.java +++ b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantModel.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewcontroller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/GiantView.java b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantView.java similarity index 78% rename from model-view-controller/src/main/java/com/iluwatar/GiantView.java rename to model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantView.java index 12905fcb4..df23119c6 100644 --- a/model-view-controller/src/main/java/com/iluwatar/GiantView.java +++ b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantView.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewcontroller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/Health.java b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Health.java similarity index 85% rename from model-view-controller/src/main/java/com/iluwatar/Health.java rename to model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Health.java index 993b71c68..263182c20 100644 --- a/model-view-controller/src/main/java/com/iluwatar/Health.java +++ b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Health.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewcontroller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/Nourishment.java b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Nourishment.java similarity index 86% rename from model-view-controller/src/main/java/com/iluwatar/Nourishment.java rename to model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Nourishment.java index 55301ea65..799983e2a 100644 --- a/model-view-controller/src/main/java/com/iluwatar/Nourishment.java +++ b/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Nourishment.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewcontroller; /** * diff --git a/model-view-controller/src/test/java/com/iluwatar/modelviewcontroller/AppTest.java b/model-view-controller/src/test/java/com/iluwatar/modelviewcontroller/AppTest.java new file mode 100644 index 000000000..f9c8eca8e --- /dev/null +++ b/model-view-controller/src/test/java/com/iluwatar/modelviewcontroller/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.modelviewcontroller; + +import org.junit.Test; + +import com.iluwatar.modelviewcontroller.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileLoader.java similarity index 97% rename from model-view-presenter/src/main/java/com/iluwatar/FileLoader.java rename to model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileLoader.java index c36dca612..a0b0abdc9 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/FileLoader.java +++ b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileLoader.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewpresenter; import java.io.BufferedReader; import java.io.File; diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorJFrame.java b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorJFrame.java similarity index 98% rename from model-view-presenter/src/main/java/com/iluwatar/FileSelectorJFrame.java rename to model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorJFrame.java index d4003e97c..025d17dab 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorJFrame.java +++ b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorJFrame.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewpresenter; import java.awt.Color; import java.awt.event.ActionEvent; diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenter.java b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorPresenter.java similarity index 97% rename from model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenter.java rename to model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorPresenter.java index dbe9bdb20..80aac42ff 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorPresenter.java +++ b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorPresenter.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewpresenter; /** * Every instance of this class represents the Presenter component in the diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorStub.java b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorStub.java similarity index 98% rename from model-view-presenter/src/main/java/com/iluwatar/FileSelectorStub.java rename to model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorStub.java index f8283a4f5..8b7ff7dd6 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorStub.java +++ b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorStub.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewpresenter; /** * Every instance of this class represents the Stub component in the diff --git a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorView.java b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorView.java similarity index 96% rename from model-view-presenter/src/main/java/com/iluwatar/FileSelectorView.java rename to model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorView.java index 0927e5de6..424a0eed3 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/FileSelectorView.java +++ b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorView.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewpresenter; /** * This interface represents the View component in the Model-View-Presenter diff --git a/model-view-presenter/src/main/java/com/iluwatar/MainApp.java b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/MainApp.java similarity index 95% rename from model-view-presenter/src/main/java/com/iluwatar/MainApp.java rename to model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/MainApp.java index 678251fc5..96e2fdab2 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/MainApp.java +++ b/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/MainApp.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.modelviewpresenter; /** * diff --git a/model-view-presenter/src/test/java/com/iluwatar/FileSelectorPresenterTest.java b/model-view-presenter/src/test/java/com/iluwatar/modelviewpresenter/FileSelectorPresenterTest.java similarity index 92% rename from model-view-presenter/src/test/java/com/iluwatar/FileSelectorPresenterTest.java rename to model-view-presenter/src/test/java/com/iluwatar/modelviewpresenter/FileSelectorPresenterTest.java index aa5594fe2..9895b99d5 100644 --- a/model-view-presenter/src/test/java/com/iluwatar/FileSelectorPresenterTest.java +++ b/model-view-presenter/src/test/java/com/iluwatar/modelviewpresenter/FileSelectorPresenterTest.java @@ -1,10 +1,14 @@ -package com.iluwatar; +package com.iluwatar.modelviewpresenter; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; +import com.iluwatar.modelviewpresenter.FileLoader; +import com.iluwatar.modelviewpresenter.FileSelectorPresenter; +import com.iluwatar.modelviewpresenter.FileSelectorStub; + /** * This test case is responsible for testing our application by taking advantage * of the Model-View-Controller architectural pattern. diff --git a/multiton/src/main/java/com/iluwatar/App.java b/multiton/src/main/java/com/iluwatar/multiton/App.java similarity index 97% rename from multiton/src/main/java/com/iluwatar/App.java rename to multiton/src/main/java/com/iluwatar/multiton/App.java index e0f7eb880..7e3da2123 100644 --- a/multiton/src/main/java/com/iluwatar/App.java +++ b/multiton/src/main/java/com/iluwatar/multiton/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.multiton; /** * diff --git a/multiton/src/main/java/com/iluwatar/Nazgul.java b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java similarity index 97% rename from multiton/src/main/java/com/iluwatar/Nazgul.java rename to multiton/src/main/java/com/iluwatar/multiton/Nazgul.java index 7b85789df..a099f9322 100644 --- a/multiton/src/main/java/com/iluwatar/Nazgul.java +++ b/multiton/src/main/java/com/iluwatar/multiton/Nazgul.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.multiton; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/multiton/src/main/java/com/iluwatar/NazgulName.java b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java similarity index 84% rename from multiton/src/main/java/com/iluwatar/NazgulName.java rename to multiton/src/main/java/com/iluwatar/multiton/NazgulName.java index 60a8fe680..f0db192a4 100644 --- a/multiton/src/main/java/com/iluwatar/NazgulName.java +++ b/multiton/src/main/java/com/iluwatar/multiton/NazgulName.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.multiton; /** * diff --git a/flux/src/test/java/com/iluwatar/AppTest.java b/multiton/src/test/java/com/iluwatar/multiton/AppTest.java similarity index 65% rename from flux/src/test/java/com/iluwatar/AppTest.java rename to multiton/src/test/java/com/iluwatar/multiton/AppTest.java index ecb0b77b7..9f5f96792 100644 --- a/flux/src/test/java/com/iluwatar/AppTest.java +++ b/multiton/src/test/java/com/iluwatar/multiton/AppTest.java @@ -1,8 +1,8 @@ -package com.iluwatar; +package com.iluwatar.multiton; import org.junit.Test; -import com.iluwatar.app.App; +import com.iluwatar.multiton.App; public class AppTest { diff --git a/null-object/src/main/java/com/iluwatar/App.java b/null-object/src/main/java/com/iluwatar/nullobject/App.java similarity index 95% rename from null-object/src/main/java/com/iluwatar/App.java rename to null-object/src/main/java/com/iluwatar/nullobject/App.java index f6bef29a0..35b05061e 100644 --- a/null-object/src/main/java/com/iluwatar/App.java +++ b/null-object/src/main/java/com/iluwatar/nullobject/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.nullobject; /** * diff --git a/null-object/src/main/java/com/iluwatar/Node.java b/null-object/src/main/java/com/iluwatar/nullobject/Node.java similarity index 77% rename from null-object/src/main/java/com/iluwatar/Node.java rename to null-object/src/main/java/com/iluwatar/nullobject/Node.java index 1bb94927f..3d52087c9 100644 --- a/null-object/src/main/java/com/iluwatar/Node.java +++ b/null-object/src/main/java/com/iluwatar/nullobject/Node.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.nullobject; /** * diff --git a/null-object/src/main/java/com/iluwatar/NodeImpl.java b/null-object/src/main/java/com/iluwatar/nullobject/NodeImpl.java similarity index 90% rename from null-object/src/main/java/com/iluwatar/NodeImpl.java rename to null-object/src/main/java/com/iluwatar/nullobject/NodeImpl.java index dbd5a7eca..fc9c9c9e3 100644 --- a/null-object/src/main/java/com/iluwatar/NodeImpl.java +++ b/null-object/src/main/java/com/iluwatar/nullobject/NodeImpl.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.nullobject; /** * diff --git a/null-object/src/main/java/com/iluwatar/NullNode.java b/null-object/src/main/java/com/iluwatar/nullobject/NullNode.java similarity index 94% rename from null-object/src/main/java/com/iluwatar/NullNode.java rename to null-object/src/main/java/com/iluwatar/nullobject/NullNode.java index b63f561b4..dfa6963d0 100644 --- a/null-object/src/main/java/com/iluwatar/NullNode.java +++ b/null-object/src/main/java/com/iluwatar/nullobject/NullNode.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.nullobject; /** * diff --git a/null-object/src/test/java/com/iluwatar/AppTest.java b/null-object/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 6db5ad214..000000000 --- a/null-object/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/builder/src/test/java/com/iluwatar/AppTest.java b/null-object/src/test/java/com/iluwatar/nullobject/AppTest.java similarity index 63% rename from builder/src/test/java/com/iluwatar/AppTest.java rename to null-object/src/test/java/com/iluwatar/nullobject/AppTest.java index 89b9e61d8..eb12f3c4d 100644 --- a/builder/src/test/java/com/iluwatar/AppTest.java +++ b/null-object/src/test/java/com/iluwatar/nullobject/AppTest.java @@ -1,12 +1,14 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} +package com.iluwatar.nullobject; + +import org.junit.Test; + +import com.iluwatar.nullobject.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/object-pool/src/main/java/com/iluwatar/App.java b/object-pool/src/main/java/com/iluwatar/objectpool/App.java similarity index 96% rename from object-pool/src/main/java/com/iluwatar/App.java rename to object-pool/src/main/java/com/iluwatar/objectpool/App.java index 4fbc8044a..2c6c855e5 100644 --- a/object-pool/src/main/java/com/iluwatar/App.java +++ b/object-pool/src/main/java/com/iluwatar/objectpool/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.objectpool; /** * diff --git a/object-pool/src/main/java/com/iluwatar/ObjectPool.java b/object-pool/src/main/java/com/iluwatar/objectpool/ObjectPool.java similarity index 90% rename from object-pool/src/main/java/com/iluwatar/ObjectPool.java rename to object-pool/src/main/java/com/iluwatar/objectpool/ObjectPool.java index 4bb10faab..343f29aef 100644 --- a/object-pool/src/main/java/com/iluwatar/ObjectPool.java +++ b/object-pool/src/main/java/com/iluwatar/objectpool/ObjectPool.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.objectpool; import java.util.HashSet; diff --git a/object-pool/src/main/java/com/iluwatar/Oliphaunt.java b/object-pool/src/main/java/com/iluwatar/objectpool/Oliphaunt.java similarity index 86% rename from object-pool/src/main/java/com/iluwatar/Oliphaunt.java rename to object-pool/src/main/java/com/iluwatar/objectpool/Oliphaunt.java index 318387cae..29d02d2e8 100644 --- a/object-pool/src/main/java/com/iluwatar/Oliphaunt.java +++ b/object-pool/src/main/java/com/iluwatar/objectpool/Oliphaunt.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.objectpool; /** * diff --git a/object-pool/src/main/java/com/iluwatar/OliphauntPool.java b/object-pool/src/main/java/com/iluwatar/objectpool/OliphauntPool.java similarity index 78% rename from object-pool/src/main/java/com/iluwatar/OliphauntPool.java rename to object-pool/src/main/java/com/iluwatar/objectpool/OliphauntPool.java index 98db8df9e..25f591f00 100644 --- a/object-pool/src/main/java/com/iluwatar/OliphauntPool.java +++ b/object-pool/src/main/java/com/iluwatar/objectpool/OliphauntPool.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.objectpool; /** * diff --git a/object-pool/src/test/java/com/iluwatar/AppTest.java b/object-pool/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index abcafd571..000000000 --- a/object-pool/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/object-pool/src/test/java/com/iluwatar/objectpool/AppTest.java b/object-pool/src/test/java/com/iluwatar/objectpool/AppTest.java new file mode 100644 index 000000000..ba569cb96 --- /dev/null +++ b/object-pool/src/test/java/com/iluwatar/objectpool/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.objectpool; + +import org.junit.Test; + +import com.iluwatar.objectpool.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/observer/src/main/java/com/iluwatar/generic/Race.java b/observer/src/main/java/com/iluwatar/generic/Race.java deleted file mode 100644 index 1d819318e..000000000 --- a/observer/src/main/java/com/iluwatar/generic/Race.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.iluwatar.generic; - -import com.iluwatar.WeatherType; - -public interface Race extends Observer { -} diff --git a/observer/src/main/java/com/iluwatar/App.java b/observer/src/main/java/com/iluwatar/observer/App.java similarity index 79% rename from observer/src/main/java/com/iluwatar/App.java rename to observer/src/main/java/com/iluwatar/observer/App.java index 0cf5bb117..9d97084c8 100644 --- a/observer/src/main/java/com/iluwatar/App.java +++ b/observer/src/main/java/com/iluwatar/observer/App.java @@ -1,8 +1,8 @@ -package com.iluwatar; +package com.iluwatar.observer; -import com.iluwatar.generic.GHobbits; -import com.iluwatar.generic.GOrcs; -import com.iluwatar.generic.GWeather; +import com.iluwatar.observer.generic.GHobbits; +import com.iluwatar.observer.generic.GOrcs; +import com.iluwatar.observer.generic.GWeather; /** * diff --git a/observer/src/main/java/com/iluwatar/Hobbits.java b/observer/src/main/java/com/iluwatar/observer/Hobbits.java similarity index 90% rename from observer/src/main/java/com/iluwatar/Hobbits.java rename to observer/src/main/java/com/iluwatar/observer/Hobbits.java index b4b09ab3c..b8a4f5b4f 100644 --- a/observer/src/main/java/com/iluwatar/Hobbits.java +++ b/observer/src/main/java/com/iluwatar/observer/Hobbits.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.observer; public class Hobbits implements WeatherObserver { diff --git a/observer/src/main/java/com/iluwatar/Orcs.java b/observer/src/main/java/com/iluwatar/observer/Orcs.java similarity index 89% rename from observer/src/main/java/com/iluwatar/Orcs.java rename to observer/src/main/java/com/iluwatar/observer/Orcs.java index 05fc0a4c9..0e51ab450 100644 --- a/observer/src/main/java/com/iluwatar/Orcs.java +++ b/observer/src/main/java/com/iluwatar/observer/Orcs.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.observer; public class Orcs implements WeatherObserver { diff --git a/observer/src/main/java/com/iluwatar/Weather.java b/observer/src/main/java/com/iluwatar/observer/Weather.java similarity index 92% rename from observer/src/main/java/com/iluwatar/Weather.java rename to observer/src/main/java/com/iluwatar/observer/Weather.java index 16b1babba..32ff13d03 100644 --- a/observer/src/main/java/com/iluwatar/Weather.java +++ b/observer/src/main/java/com/iluwatar/observer/Weather.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.observer; import java.util.ArrayList; import java.util.List; diff --git a/observer/src/main/java/com/iluwatar/WeatherObserver.java b/observer/src/main/java/com/iluwatar/observer/WeatherObserver.java similarity index 73% rename from observer/src/main/java/com/iluwatar/WeatherObserver.java rename to observer/src/main/java/com/iluwatar/observer/WeatherObserver.java index 062f49ca6..5491da75e 100644 --- a/observer/src/main/java/com/iluwatar/WeatherObserver.java +++ b/observer/src/main/java/com/iluwatar/observer/WeatherObserver.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.observer; /** * diff --git a/observer/src/main/java/com/iluwatar/WeatherType.java b/observer/src/main/java/com/iluwatar/observer/WeatherType.java similarity index 76% rename from observer/src/main/java/com/iluwatar/WeatherType.java rename to observer/src/main/java/com/iluwatar/observer/WeatherType.java index a94750771..b16c3cc04 100644 --- a/observer/src/main/java/com/iluwatar/WeatherType.java +++ b/observer/src/main/java/com/iluwatar/observer/WeatherType.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.observer; public enum WeatherType { diff --git a/observer/src/main/java/com/iluwatar/generic/GHobbits.java b/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java similarity index 90% rename from observer/src/main/java/com/iluwatar/generic/GHobbits.java rename to observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java index ced893ae9..78caefbcf 100644 --- a/observer/src/main/java/com/iluwatar/generic/GHobbits.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java @@ -1,6 +1,6 @@ -package com.iluwatar.generic; +package com.iluwatar.observer.generic; -import com.iluwatar.WeatherType; +import com.iluwatar.observer.WeatherType; public class GHobbits implements Race { @Override diff --git a/observer/src/main/java/com/iluwatar/generic/GOrcs.java b/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java similarity index 89% rename from observer/src/main/java/com/iluwatar/generic/GOrcs.java rename to observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java index 416422c6e..97518ee10 100644 --- a/observer/src/main/java/com/iluwatar/generic/GOrcs.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java @@ -1,6 +1,6 @@ -package com.iluwatar.generic; +package com.iluwatar.observer.generic; -import com.iluwatar.WeatherType; +import com.iluwatar.observer.WeatherType; public class GOrcs implements Race { @Override diff --git a/observer/src/main/java/com/iluwatar/generic/GWeather.java b/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java similarity index 85% rename from observer/src/main/java/com/iluwatar/generic/GWeather.java rename to observer/src/main/java/com/iluwatar/observer/generic/GWeather.java index 54a608e74..c4702542c 100644 --- a/observer/src/main/java/com/iluwatar/generic/GWeather.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java @@ -1,6 +1,6 @@ -package com.iluwatar.generic; +package com.iluwatar.observer.generic; -import com.iluwatar.WeatherType; +import com.iluwatar.observer.WeatherType; public class GWeather extends Observable { diff --git a/observer/src/main/java/com/iluwatar/generic/Observable.java b/observer/src/main/java/com/iluwatar/observer/generic/Observable.java similarity index 94% rename from observer/src/main/java/com/iluwatar/generic/Observable.java rename to observer/src/main/java/com/iluwatar/observer/generic/Observable.java index 57868f97b..eaedc7b6e 100644 --- a/observer/src/main/java/com/iluwatar/generic/Observable.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/Observable.java @@ -1,4 +1,4 @@ -package com.iluwatar.generic; +package com.iluwatar.observer.generic; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/observer/src/main/java/com/iluwatar/generic/Observer.java b/observer/src/main/java/com/iluwatar/observer/generic/Observer.java similarity index 77% rename from observer/src/main/java/com/iluwatar/generic/Observer.java rename to observer/src/main/java/com/iluwatar/observer/generic/Observer.java index 33614b79d..901930de8 100644 --- a/observer/src/main/java/com/iluwatar/generic/Observer.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/Observer.java @@ -1,4 +1,4 @@ -package com.iluwatar.generic; +package com.iluwatar.observer.generic; public interface Observer, O extends Observer, A> { diff --git a/observer/src/main/java/com/iluwatar/observer/generic/Race.java b/observer/src/main/java/com/iluwatar/observer/generic/Race.java new file mode 100644 index 000000000..358b27758 --- /dev/null +++ b/observer/src/main/java/com/iluwatar/observer/generic/Race.java @@ -0,0 +1,6 @@ +package com.iluwatar.observer.generic; + +import com.iluwatar.observer.WeatherType; + +public interface Race extends Observer { +} diff --git a/observer/src/test/java/com/iluwatar/AppTest.java b/observer/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/observer/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/observer/src/test/java/com/iluwatar/observer/AppTest.java b/observer/src/test/java/com/iluwatar/observer/AppTest.java new file mode 100644 index 000000000..9e208ce66 --- /dev/null +++ b/observer/src/test/java/com/iluwatar/observer/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.observer; + +import org.junit.Test; + +import com.iluwatar.observer.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/poison-pill/src/main/java/com/iluwatar/App.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/App.java similarity index 97% rename from poison-pill/src/main/java/com/iluwatar/App.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/App.java index 22de1dd28..85ed7c48e 100644 --- a/poison-pill/src/main/java/com/iluwatar/App.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; /** * One of possible approaches to terminate Producer-Consumer pattern is using PoisonPill idiom. diff --git a/poison-pill/src/main/java/com/iluwatar/Consumer.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/Consumer.java similarity index 91% rename from poison-pill/src/main/java/com/iluwatar/Consumer.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/Consumer.java index 499971b6c..d2892f502 100644 --- a/poison-pill/src/main/java/com/iluwatar/Consumer.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/Consumer.java @@ -1,6 +1,6 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; -import com.iluwatar.Message.Headers; +import com.iluwatar.poisonpill.Message.Headers; /** * Class responsible for receiving and handling submitted to the queue messages diff --git a/poison-pill/src/main/java/com/iluwatar/MQPublishPoint.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/MQPublishPoint.java similarity index 82% rename from poison-pill/src/main/java/com/iluwatar/MQPublishPoint.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/MQPublishPoint.java index 6cc830e71..ca3555f52 100644 --- a/poison-pill/src/main/java/com/iluwatar/MQPublishPoint.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/MQPublishPoint.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; /** * Endpoint to publish {@link Message} to queue diff --git a/poison-pill/src/main/java/com/iluwatar/MQSubscribePoint.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/MQSubscribePoint.java similarity index 82% rename from poison-pill/src/main/java/com/iluwatar/MQSubscribePoint.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/MQSubscribePoint.java index 5e15ba7b9..820d82bf3 100644 --- a/poison-pill/src/main/java/com/iluwatar/MQSubscribePoint.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/MQSubscribePoint.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; /** * Endpoint to retrieve {@link Message} from queue diff --git a/poison-pill/src/main/java/com/iluwatar/Message.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/Message.java similarity index 96% rename from poison-pill/src/main/java/com/iluwatar/Message.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/Message.java index e9a67fe59..1ea6c2904 100644 --- a/poison-pill/src/main/java/com/iluwatar/Message.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/Message.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; import java.util.Map; diff --git a/poison-pill/src/main/java/com/iluwatar/MessageQueue.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/MessageQueue.java similarity index 84% rename from poison-pill/src/main/java/com/iluwatar/MessageQueue.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/MessageQueue.java index 03ced489b..3a360cc5c 100644 --- a/poison-pill/src/main/java/com/iluwatar/MessageQueue.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/MessageQueue.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; /** * Represents abstraction of channel (or pipe) that bounds {@link Producer} and {@link Consumer} diff --git a/poison-pill/src/main/java/com/iluwatar/Producer.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/Producer.java similarity index 92% rename from poison-pill/src/main/java/com/iluwatar/Producer.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/Producer.java index 89fb75277..1e4bd9aa3 100644 --- a/poison-pill/src/main/java/com/iluwatar/Producer.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/Producer.java @@ -1,8 +1,8 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; import java.util.Date; -import com.iluwatar.Message.Headers; +import com.iluwatar.poisonpill.Message.Headers; /** * Class responsible for producing unit of work that can be expressed as message and submitted to queue diff --git a/poison-pill/src/main/java/com/iluwatar/SimpleMessage.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessage.java similarity index 95% rename from poison-pill/src/main/java/com/iluwatar/SimpleMessage.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessage.java index 27b8db08b..40c990712 100644 --- a/poison-pill/src/main/java/com/iluwatar/SimpleMessage.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessage.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; import java.util.Collections; import java.util.HashMap; diff --git a/poison-pill/src/main/java/com/iluwatar/SimpleMessageQueue.java b/poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessageQueue.java similarity index 94% rename from poison-pill/src/main/java/com/iluwatar/SimpleMessageQueue.java rename to poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessageQueue.java index 12d519ce2..cf012d9c4 100644 --- a/poison-pill/src/main/java/com/iluwatar/SimpleMessageQueue.java +++ b/poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessageQueue.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.poisonpill; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; diff --git a/poison-pill/src/test/java/com/iluwatar/AppTest.java b/poison-pill/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 6db5ad214..000000000 --- a/poison-pill/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/poison-pill/src/test/java/com/iluwatar/poisonpill/AppTest.java b/poison-pill/src/test/java/com/iluwatar/poisonpill/AppTest.java new file mode 100644 index 000000000..6d39c06bb --- /dev/null +++ b/poison-pill/src/test/java/com/iluwatar/poisonpill/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.poisonpill; + +import org.junit.Test; + +import com.iluwatar.poisonpill.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/private-class-data/src/main/java/com/iluwatar/App.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/App.java similarity index 94% rename from private-class-data/src/main/java/com/iluwatar/App.java rename to private-class-data/src/main/java/com/iluwatar/privateclassdata/App.java index 101140fc9..8cc5254d6 100644 --- a/private-class-data/src/main/java/com/iluwatar/App.java +++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.privateclassdata; /** * diff --git a/private-class-data/src/main/java/com/iluwatar/ImmutableStew.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/ImmutableStew.java similarity index 90% rename from private-class-data/src/main/java/com/iluwatar/ImmutableStew.java rename to private-class-data/src/main/java/com/iluwatar/privateclassdata/ImmutableStew.java index ccd902f1c..ebaaf28a0 100644 --- a/private-class-data/src/main/java/com/iluwatar/ImmutableStew.java +++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/ImmutableStew.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.privateclassdata; /** * diff --git a/private-class-data/src/main/java/com/iluwatar/Stew.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/Stew.java similarity index 90% rename from private-class-data/src/main/java/com/iluwatar/Stew.java rename to private-class-data/src/main/java/com/iluwatar/privateclassdata/Stew.java index 63be6f009..6ad05044b 100644 --- a/private-class-data/src/main/java/com/iluwatar/Stew.java +++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/Stew.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.privateclassdata; /** * diff --git a/private-class-data/src/main/java/com/iluwatar/StewData.java b/private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.java similarity index 88% rename from private-class-data/src/main/java/com/iluwatar/StewData.java rename to private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.java index 059c6cd66..f90d3bd18 100644 --- a/private-class-data/src/main/java/com/iluwatar/StewData.java +++ b/private-class-data/src/main/java/com/iluwatar/privateclassdata/StewData.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.privateclassdata; /** * diff --git a/private-class-data/src/test/java/com/iluwatar/AppTest.java b/private-class-data/src/test/java/com/iluwatar/privateclassdata/AppTest.java similarity index 56% rename from private-class-data/src/test/java/com/iluwatar/AppTest.java rename to private-class-data/src/test/java/com/iluwatar/privateclassdata/AppTest.java index 48818f5ad..8ba8c4b80 100644 --- a/private-class-data/src/test/java/com/iluwatar/AppTest.java +++ b/private-class-data/src/test/java/com/iluwatar/privateclassdata/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.privateclassdata; import org.junit.Test; +import com.iluwatar.privateclassdata.App; + public class AppTest { @Test diff --git a/property/src/main/java/com/iluwatar/App.java b/property/src/main/java/com/iluwatar/property/App.java similarity index 95% rename from property/src/main/java/com/iluwatar/App.java rename to property/src/main/java/com/iluwatar/property/App.java index 95ff4355f..40972ab59 100644 --- a/property/src/main/java/com/iluwatar/App.java +++ b/property/src/main/java/com/iluwatar/property/App.java @@ -1,6 +1,6 @@ -package com.iluwatar; +package com.iluwatar.property; -import com.iluwatar.Character.Type; +import com.iluwatar.property.Character.Type; /** * Example of Character instantiation using Property pattern (as concept also known like Prototype inheritance). diff --git a/property/src/main/java/com/iluwatar/Character.java b/property/src/main/java/com/iluwatar/property/Character.java similarity index 98% rename from property/src/main/java/com/iluwatar/Character.java rename to property/src/main/java/com/iluwatar/property/Character.java index ac8abaa0e..cb2fdf583 100644 --- a/property/src/main/java/com/iluwatar/Character.java +++ b/property/src/main/java/com/iluwatar/property/Character.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.property; import java.util.HashMap; import java.util.Map; diff --git a/property/src/main/java/com/iluwatar/Prototype.java b/property/src/main/java/com/iluwatar/property/Prototype.java similarity index 87% rename from property/src/main/java/com/iluwatar/Prototype.java rename to property/src/main/java/com/iluwatar/property/Prototype.java index ef9d2d7b6..12b4ce734 100644 --- a/property/src/main/java/com/iluwatar/Prototype.java +++ b/property/src/main/java/com/iluwatar/property/Prototype.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.property; /** * Interface for prototype inheritance diff --git a/property/src/main/java/com/iluwatar/Stats.java b/property/src/main/java/com/iluwatar/property/Stats.java similarity index 83% rename from property/src/main/java/com/iluwatar/Stats.java rename to property/src/main/java/com/iluwatar/property/Stats.java index 3c5648148..b791a9dec 100644 --- a/property/src/main/java/com/iluwatar/Stats.java +++ b/property/src/main/java/com/iluwatar/property/Stats.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.property; /** * All possible attributes that Character can have diff --git a/property/src/test/java/com/iluwatar/AppTest.java b/property/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 6db5ad214..000000000 --- a/property/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/adapter/src/test/java/com/iluwatar/AppTest.java b/property/src/test/java/com/iluwatar/property/AppTest.java similarity index 65% rename from adapter/src/test/java/com/iluwatar/AppTest.java rename to property/src/test/java/com/iluwatar/property/AppTest.java index 89b9e61d8..dc05049f8 100644 --- a/adapter/src/test/java/com/iluwatar/AppTest.java +++ b/property/src/test/java/com/iluwatar/property/AppTest.java @@ -1,12 +1,14 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} +package com.iluwatar.property; + +import org.junit.Test; + +import com.iluwatar.property.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/prototype/src/main/java/com/iluwatar/App.java b/prototype/src/main/java/com/iluwatar/prototype/App.java similarity index 92% rename from prototype/src/main/java/com/iluwatar/App.java rename to prototype/src/main/java/com/iluwatar/prototype/App.java index d10a3bde4..b10de963b 100644 --- a/prototype/src/main/java/com/iluwatar/App.java +++ b/prototype/src/main/java/com/iluwatar/prototype/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; /** * diff --git a/prototype/src/main/java/com/iluwatar/Beast.java b/prototype/src/main/java/com/iluwatar/prototype/Beast.java similarity index 76% rename from prototype/src/main/java/com/iluwatar/Beast.java rename to prototype/src/main/java/com/iluwatar/prototype/Beast.java index 23f3c30e0..96cbfb2c8 100644 --- a/prototype/src/main/java/com/iluwatar/Beast.java +++ b/prototype/src/main/java/com/iluwatar/prototype/Beast.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public abstract class Beast extends Prototype { diff --git a/prototype/src/main/java/com/iluwatar/ElfBeast.java b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java similarity index 83% rename from prototype/src/main/java/com/iluwatar/ElfBeast.java rename to prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java index a2a0748ae..17ac87511 100644 --- a/prototype/src/main/java/com/iluwatar/ElfBeast.java +++ b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public class ElfBeast extends Beast { diff --git a/prototype/src/main/java/com/iluwatar/ElfMage.java b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java similarity index 83% rename from prototype/src/main/java/com/iluwatar/ElfMage.java rename to prototype/src/main/java/com/iluwatar/prototype/ElfMage.java index 209ac4a26..c41ce2dd6 100644 --- a/prototype/src/main/java/com/iluwatar/ElfMage.java +++ b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public class ElfMage extends Mage { diff --git a/prototype/src/main/java/com/iluwatar/ElfWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java similarity index 84% rename from prototype/src/main/java/com/iluwatar/ElfWarlord.java rename to prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java index e7a59ef56..465c1d046 100644 --- a/prototype/src/main/java/com/iluwatar/ElfWarlord.java +++ b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public class ElfWarlord extends Warlord { diff --git a/prototype/src/main/java/com/iluwatar/HeroFactory.java b/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java similarity index 76% rename from prototype/src/main/java/com/iluwatar/HeroFactory.java rename to prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java index 062a64658..468eefcb5 100644 --- a/prototype/src/main/java/com/iluwatar/HeroFactory.java +++ b/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; /** * diff --git a/prototype/src/main/java/com/iluwatar/HeroFactoryImpl.java b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java similarity index 90% rename from prototype/src/main/java/com/iluwatar/HeroFactoryImpl.java rename to prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java index 15d3e89f9..dc440f41e 100644 --- a/prototype/src/main/java/com/iluwatar/HeroFactoryImpl.java +++ b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; /** * diff --git a/prototype/src/main/java/com/iluwatar/Mage.java b/prototype/src/main/java/com/iluwatar/prototype/Mage.java similarity index 76% rename from prototype/src/main/java/com/iluwatar/Mage.java rename to prototype/src/main/java/com/iluwatar/prototype/Mage.java index fe25f2bdf..99cee8893 100644 --- a/prototype/src/main/java/com/iluwatar/Mage.java +++ b/prototype/src/main/java/com/iluwatar/prototype/Mage.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public abstract class Mage extends Prototype { diff --git a/prototype/src/main/java/com/iluwatar/OrcBeast.java b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java similarity index 83% rename from prototype/src/main/java/com/iluwatar/OrcBeast.java rename to prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java index 0162f677f..bae7d360e 100644 --- a/prototype/src/main/java/com/iluwatar/OrcBeast.java +++ b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public class OrcBeast extends Beast { diff --git a/prototype/src/main/java/com/iluwatar/OrcMage.java b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java similarity index 83% rename from prototype/src/main/java/com/iluwatar/OrcMage.java rename to prototype/src/main/java/com/iluwatar/prototype/OrcMage.java index c065caf00..a329ca61b 100644 --- a/prototype/src/main/java/com/iluwatar/OrcMage.java +++ b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public class OrcMage extends Mage { diff --git a/prototype/src/main/java/com/iluwatar/OrcWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java similarity index 84% rename from prototype/src/main/java/com/iluwatar/OrcWarlord.java rename to prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java index 162e0d795..2832c3835 100644 --- a/prototype/src/main/java/com/iluwatar/OrcWarlord.java +++ b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public class OrcWarlord extends Warlord { diff --git a/prototype/src/main/java/com/iluwatar/Prototype.java b/prototype/src/main/java/com/iluwatar/prototype/Prototype.java similarity index 77% rename from prototype/src/main/java/com/iluwatar/Prototype.java rename to prototype/src/main/java/com/iluwatar/prototype/Prototype.java index 33128e0e9..2329f1e6d 100644 --- a/prototype/src/main/java/com/iluwatar/Prototype.java +++ b/prototype/src/main/java/com/iluwatar/prototype/Prototype.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public abstract class Prototype implements Cloneable { diff --git a/prototype/src/main/java/com/iluwatar/Warlord.java b/prototype/src/main/java/com/iluwatar/prototype/Warlord.java similarity index 77% rename from prototype/src/main/java/com/iluwatar/Warlord.java rename to prototype/src/main/java/com/iluwatar/prototype/Warlord.java index 0b65bf784..930320d97 100644 --- a/prototype/src/main/java/com/iluwatar/Warlord.java +++ b/prototype/src/main/java/com/iluwatar/prototype/Warlord.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.prototype; public abstract class Warlord extends Prototype { diff --git a/prototype/src/test/java/com/iluwatar/AppTest.java b/prototype/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/prototype/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/prototype/src/test/java/com/iluwatar/prototype/AppTest.java b/prototype/src/test/java/com/iluwatar/prototype/AppTest.java new file mode 100644 index 000000000..ecb576038 --- /dev/null +++ b/prototype/src/test/java/com/iluwatar/prototype/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.prototype; + +import org.junit.Test; + +import com.iluwatar.prototype.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/proxy/src/main/java/com/iluwatar/App.java b/proxy/src/main/java/com/iluwatar/proxy/App.java similarity index 89% rename from proxy/src/main/java/com/iluwatar/App.java rename to proxy/src/main/java/com/iluwatar/proxy/App.java index ebf41fd1d..86c96466b 100644 --- a/proxy/src/main/java/com/iluwatar/App.java +++ b/proxy/src/main/java/com/iluwatar/proxy/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.proxy; /** * diff --git a/proxy/src/main/java/com/iluwatar/Wizard.java b/proxy/src/main/java/com/iluwatar/proxy/Wizard.java similarity index 78% rename from proxy/src/main/java/com/iluwatar/Wizard.java rename to proxy/src/main/java/com/iluwatar/proxy/Wizard.java index 192d77c51..2060a5803 100644 --- a/proxy/src/main/java/com/iluwatar/Wizard.java +++ b/proxy/src/main/java/com/iluwatar/proxy/Wizard.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.proxy; public class Wizard { diff --git a/proxy/src/main/java/com/iluwatar/WizardTower.java b/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java similarity index 80% rename from proxy/src/main/java/com/iluwatar/WizardTower.java rename to proxy/src/main/java/com/iluwatar/proxy/WizardTower.java index 43d28a10f..d4aa27c81 100644 --- a/proxy/src/main/java/com/iluwatar/WizardTower.java +++ b/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.proxy; /** * diff --git a/proxy/src/main/java/com/iluwatar/WizardTowerProxy.java b/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java similarity index 88% rename from proxy/src/main/java/com/iluwatar/WizardTowerProxy.java rename to proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java index 6d30b51b9..3563aef1d 100644 --- a/proxy/src/main/java/com/iluwatar/WizardTowerProxy.java +++ b/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.proxy; /** * diff --git a/proxy/src/test/java/com/iluwatar/AppTest.java b/proxy/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/proxy/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/proxy/src/test/java/com/iluwatar/proxy/AppTest.java b/proxy/src/test/java/com/iluwatar/proxy/AppTest.java new file mode 100644 index 000000000..0cd9641df --- /dev/null +++ b/proxy/src/test/java/com/iluwatar/proxy/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.proxy; + +import org.junit.Test; + +import com.iluwatar.proxy.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/App.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/App.java similarity index 95% rename from resource-acquisition-is-initialization/src/main/java/com/iluwatar/App.java rename to resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/App.java index 910ca3023..ebf8a1dc7 100644 --- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/App.java +++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.resourceacquisitionisinitialization; /** * diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/SlidingDoor.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/SlidingDoor.java similarity index 82% rename from resource-acquisition-is-initialization/src/main/java/com/iluwatar/SlidingDoor.java rename to resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/SlidingDoor.java index 12467ffd0..c7181c8ba 100644 --- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/SlidingDoor.java +++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/SlidingDoor.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.resourceacquisitionisinitialization; /** * diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/TreasureChest.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/TreasureChest.java similarity index 85% rename from resource-acquisition-is-initialization/src/main/java/com/iluwatar/TreasureChest.java rename to resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/TreasureChest.java index 6b798d43c..c8f6b8ba4 100644 --- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/TreasureChest.java +++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/TreasureChest.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.resourceacquisitionisinitialization; import java.io.Closeable; import java.io.IOException; diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/AppTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resourceacquisitionisinitialization/AppTest.java similarity index 53% rename from resource-acquisition-is-initialization/src/test/java/com/iluwatar/AppTest.java rename to resource-acquisition-is-initialization/src/test/java/com/iluwatar/resourceacquisitionisinitialization/AppTest.java index df46cf50f..5f71bbddf 100644 --- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/AppTest.java +++ b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resourceacquisitionisinitialization/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.resourceacquisitionisinitialization; import org.junit.Test; +import com.iluwatar.resourceacquisitionisinitialization.App; + public class AppTest { @Test diff --git a/servant/src/main/java/com/iluwatar/App.java b/servant/src/main/java/com/iluwatar/servant/App.java similarity index 97% rename from servant/src/main/java/com/iluwatar/App.java rename to servant/src/main/java/com/iluwatar/servant/App.java index 34688ea1a..4951c7270 100644 --- a/servant/src/main/java/com/iluwatar/App.java +++ b/servant/src/main/java/com/iluwatar/servant/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servant; import java.util.ArrayList; diff --git a/servant/src/main/java/com/iluwatar/King.java b/servant/src/main/java/com/iluwatar/servant/King.java similarity index 95% rename from servant/src/main/java/com/iluwatar/King.java rename to servant/src/main/java/com/iluwatar/servant/King.java index 61ccc27cc..24aa1b870 100644 --- a/servant/src/main/java/com/iluwatar/King.java +++ b/servant/src/main/java/com/iluwatar/servant/King.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servant; public class King implements Royalty { private boolean isDrunk; diff --git a/servant/src/main/java/com/iluwatar/Queen.java b/servant/src/main/java/com/iluwatar/servant/Queen.java similarity index 96% rename from servant/src/main/java/com/iluwatar/Queen.java rename to servant/src/main/java/com/iluwatar/servant/Queen.java index 71b3472cd..c581132de 100644 --- a/servant/src/main/java/com/iluwatar/Queen.java +++ b/servant/src/main/java/com/iluwatar/servant/Queen.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servant; public class Queen implements Royalty { private boolean isDrunk = true; diff --git a/servant/src/main/java/com/iluwatar/Royalty.java b/servant/src/main/java/com/iluwatar/servant/Royalty.java similarity index 82% rename from servant/src/main/java/com/iluwatar/Royalty.java rename to servant/src/main/java/com/iluwatar/servant/Royalty.java index bcfc8b748..02ebe3cce 100644 --- a/servant/src/main/java/com/iluwatar/Royalty.java +++ b/servant/src/main/java/com/iluwatar/servant/Royalty.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servant; interface Royalty { diff --git a/servant/src/main/java/com/iluwatar/Servant.java b/servant/src/main/java/com/iluwatar/servant/Servant.java similarity index 94% rename from servant/src/main/java/com/iluwatar/Servant.java rename to servant/src/main/java/com/iluwatar/servant/Servant.java index 599054e7a..b29e7fe20 100644 --- a/servant/src/main/java/com/iluwatar/Servant.java +++ b/servant/src/main/java/com/iluwatar/servant/Servant.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servant; import java.util.ArrayList; diff --git a/servant/src/test/java/com/iluwatar/AppTest.java b/servant/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/servant/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/servant/src/test/java/com/iluwatar/servant/AppTest.java b/servant/src/test/java/com/iluwatar/servant/AppTest.java new file mode 100644 index 000000000..bf6655f2a --- /dev/null +++ b/servant/src/test/java/com/iluwatar/servant/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.servant; + +import org.junit.Test; + +import com.iluwatar.servant.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/service-layer/src/main/java/com/iluwatar/app/App.java b/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java similarity index 90% rename from service-layer/src/main/java/com/iluwatar/app/App.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java index 813c74220..ea0419606 100644 --- a/service-layer/src/main/java/com/iluwatar/app/App.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java @@ -1,18 +1,18 @@ -package com.iluwatar.app; +package com.iluwatar.servicelayer.app; import java.util.List; -import com.iluwatar.magic.MagicService; -import com.iluwatar.magic.MagicServiceImpl; -import com.iluwatar.spell.Spell; -import com.iluwatar.spell.SpellDao; -import com.iluwatar.spell.SpellDaoImpl; -import com.iluwatar.spellbook.Spellbook; -import com.iluwatar.spellbook.SpellbookDao; -import com.iluwatar.spellbook.SpellbookDaoImpl; -import com.iluwatar.wizard.Wizard; -import com.iluwatar.wizard.WizardDao; -import com.iluwatar.wizard.WizardDaoImpl; +import com.iluwatar.servicelayer.magic.MagicService; +import com.iluwatar.servicelayer.magic.MagicServiceImpl; +import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.servicelayer.spell.SpellDao; +import com.iluwatar.servicelayer.servicelayer.spell.SpellDaoImpl; +import com.iluwatar.servicelayer.spellbook.Spellbook; +import com.iluwatar.servicelayer.spellbook.SpellbookDao; +import com.iluwatar.servicelayer.spellbook.SpellbookDaoImpl; +import com.iluwatar.servicelayer.wizard.Wizard; +import com.iluwatar.servicelayer.wizard.WizardDao; +import com.iluwatar.servicelayer.wizard.WizardDaoImpl; /** diff --git a/service-layer/src/main/java/com/iluwatar/common/BaseEntity.java b/service-layer/src/main/java/com/iluwatar/servicelayer/common/BaseEntity.java similarity index 88% rename from service-layer/src/main/java/com/iluwatar/common/BaseEntity.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/common/BaseEntity.java index 072d8277b..ec0f8e197 100644 --- a/service-layer/src/main/java/com/iluwatar/common/BaseEntity.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/common/BaseEntity.java @@ -1,4 +1,4 @@ -package com.iluwatar.common; +package com.iluwatar.servicelayer.common; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; diff --git a/service-layer/src/main/java/com/iluwatar/common/Dao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/common/Dao.java similarity index 85% rename from service-layer/src/main/java/com/iluwatar/common/Dao.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/common/Dao.java index f8e81aafb..e1851b16f 100644 --- a/service-layer/src/main/java/com/iluwatar/common/Dao.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/common/Dao.java @@ -1,4 +1,4 @@ -package com.iluwatar.common; +package com.iluwatar.servicelayer.common; import java.util.List; diff --git a/service-layer/src/main/java/com/iluwatar/common/DaoBaseImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.java similarity index 96% rename from service-layer/src/main/java/com/iluwatar/common/DaoBaseImpl.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.java index a5d2ea6b4..bc0116dac 100644 --- a/service-layer/src/main/java/com/iluwatar/common/DaoBaseImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/common/DaoBaseImpl.java @@ -1,4 +1,4 @@ -package com.iluwatar.common; +package com.iluwatar.servicelayer.common; import java.lang.reflect.ParameterizedType; import java.util.List; @@ -8,7 +8,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import com.iluwatar.hibernate.HibernateUtil; +import com.iluwatar.servicelayer.hibernate.HibernateUtil; /** * diff --git a/service-layer/src/main/java/com/iluwatar/hibernate/HibernateUtil.java b/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java similarity index 83% rename from service-layer/src/main/java/com/iluwatar/hibernate/HibernateUtil.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java index 01699e52f..922fe9f21 100644 --- a/service-layer/src/main/java/com/iluwatar/hibernate/HibernateUtil.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java @@ -1,11 +1,11 @@ -package com.iluwatar.hibernate; +package com.iluwatar.servicelayer.hibernate; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; -import com.iluwatar.spell.Spell; -import com.iluwatar.spellbook.Spellbook; -import com.iluwatar.wizard.Wizard; +import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.spellbook.Spellbook; +import com.iluwatar.servicelayer.wizard.Wizard; /** * diff --git a/service-layer/src/main/java/com/iluwatar/magic/MagicService.java b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java similarity index 60% rename from service-layer/src/main/java/com/iluwatar/magic/MagicService.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java index 75765cd44..a6046742b 100644 --- a/service-layer/src/main/java/com/iluwatar/magic/MagicService.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java @@ -1,10 +1,10 @@ -package com.iluwatar.magic; +package com.iluwatar.servicelayer.magic; import java.util.List; -import com.iluwatar.spell.Spell; -import com.iluwatar.spellbook.Spellbook; -import com.iluwatar.wizard.Wizard; +import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.spellbook.Spellbook; +import com.iluwatar.servicelayer.wizard.Wizard; /** diff --git a/service-layer/src/main/java/com/iluwatar/magic/MagicServiceImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java similarity index 74% rename from service-layer/src/main/java/com/iluwatar/magic/MagicServiceImpl.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java index 1c1f722db..e5599fc4e 100644 --- a/service-layer/src/main/java/com/iluwatar/magic/MagicServiceImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java @@ -1,14 +1,14 @@ -package com.iluwatar.magic; +package com.iluwatar.servicelayer.magic; import java.util.ArrayList; import java.util.List; -import com.iluwatar.spell.Spell; -import com.iluwatar.spell.SpellDao; -import com.iluwatar.spellbook.Spellbook; -import com.iluwatar.spellbook.SpellbookDao; -import com.iluwatar.wizard.Wizard; -import com.iluwatar.wizard.WizardDao; +import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.servicelayer.spell.SpellDao; +import com.iluwatar.servicelayer.spellbook.Spellbook; +import com.iluwatar.servicelayer.spellbook.SpellbookDao; +import com.iluwatar.servicelayer.wizard.Wizard; +import com.iluwatar.servicelayer.wizard.WizardDao; /** * diff --git a/service-layer/src/main/java/com/iluwatar/spell/Spell.java b/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/Spell.java similarity index 86% rename from service-layer/src/main/java/com/iluwatar/spell/Spell.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/Spell.java index 0202efcbc..5dc7a6acc 100644 --- a/service-layer/src/main/java/com/iluwatar/spell/Spell.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/Spell.java @@ -1,4 +1,4 @@ -package com.iluwatar.spell; +package com.iluwatar.servicelayer.servicelayer.spell; import javax.persistence.Column; import javax.persistence.Entity; @@ -8,8 +8,8 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import com.iluwatar.common.BaseEntity; -import com.iluwatar.spellbook.Spellbook; +import com.iluwatar.servicelayer.common.BaseEntity; +import com.iluwatar.servicelayer.spellbook.Spellbook; /** * diff --git a/service-layer/src/main/java/com/iluwatar/spell/SpellDao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDao.java similarity index 55% rename from service-layer/src/main/java/com/iluwatar/spell/SpellDao.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDao.java index 318ec24f0..079ef39a0 100644 --- a/service-layer/src/main/java/com/iluwatar/spell/SpellDao.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDao.java @@ -1,6 +1,6 @@ -package com.iluwatar.spell; +package com.iluwatar.servicelayer.servicelayer.spell; -import com.iluwatar.common.Dao; +import com.iluwatar.servicelayer.common.Dao; /** * diff --git a/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDaoImpl.java similarity index 88% rename from service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDaoImpl.java index f8fb425c3..d8655ac3a 100644 --- a/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/SpellDaoImpl.java @@ -1,11 +1,11 @@ -package com.iluwatar.spell; +package com.iluwatar.servicelayer.servicelayer.spell; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import com.iluwatar.common.DaoBaseImpl; +import com.iluwatar.servicelayer.common.DaoBaseImpl; /** * diff --git a/service-layer/src/main/java/com/iluwatar/spellbook/Spellbook.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java similarity index 88% rename from service-layer/src/main/java/com/iluwatar/spellbook/Spellbook.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java index 1b6446255..5bf42c7ed 100644 --- a/service-layer/src/main/java/com/iluwatar/spellbook/Spellbook.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/Spellbook.java @@ -1,4 +1,4 @@ -package com.iluwatar.spellbook; +package com.iluwatar.servicelayer.spellbook; import java.util.HashSet; import java.util.Set; @@ -12,9 +12,9 @@ import javax.persistence.ManyToMany; import javax.persistence.OneToMany; import javax.persistence.Table; -import com.iluwatar.common.BaseEntity; -import com.iluwatar.spell.Spell; -import com.iluwatar.wizard.Wizard; +import com.iluwatar.servicelayer.common.BaseEntity; +import com.iluwatar.servicelayer.servicelayer.spell.Spell; +import com.iluwatar.servicelayer.wizard.Wizard; /** * diff --git a/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDao.java similarity index 60% rename from service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDao.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDao.java index 7ac54d6a2..9731cdf2e 100644 --- a/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDao.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDao.java @@ -1,6 +1,6 @@ -package com.iluwatar.spellbook; +package com.iluwatar.servicelayer.spellbook; -import com.iluwatar.common.Dao; +import com.iluwatar.servicelayer.common.Dao; /** * diff --git a/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.java similarity index 89% rename from service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.java index a1b0ff36d..5ab604621 100644 --- a/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/spellbook/SpellbookDaoImpl.java @@ -1,11 +1,11 @@ -package com.iluwatar.spellbook; +package com.iluwatar.servicelayer.spellbook; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import com.iluwatar.common.DaoBaseImpl; +import com.iluwatar.servicelayer.common.DaoBaseImpl; /** * diff --git a/service-layer/src/main/java/com/iluwatar/wizard/Wizard.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java similarity index 89% rename from service-layer/src/main/java/com/iluwatar/wizard/Wizard.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java index 63638c748..10f811a3c 100644 --- a/service-layer/src/main/java/com/iluwatar/wizard/Wizard.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/Wizard.java @@ -1,4 +1,4 @@ -package com.iluwatar.wizard; +package com.iluwatar.servicelayer.wizard; import java.util.HashSet; import java.util.Set; @@ -11,8 +11,8 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; -import com.iluwatar.common.BaseEntity; -import com.iluwatar.spellbook.Spellbook; +import com.iluwatar.servicelayer.common.BaseEntity; +import com.iluwatar.servicelayer.spellbook.Spellbook; /** * diff --git a/service-layer/src/main/java/com/iluwatar/wizard/WizardDao.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDao.java similarity index 59% rename from service-layer/src/main/java/com/iluwatar/wizard/WizardDao.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDao.java index d0fd52ad7..f4f415d2f 100644 --- a/service-layer/src/main/java/com/iluwatar/wizard/WizardDao.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDao.java @@ -1,6 +1,6 @@ -package com.iluwatar.wizard; +package com.iluwatar.servicelayer.wizard; -import com.iluwatar.common.Dao; +import com.iluwatar.servicelayer.common.Dao; /** * diff --git a/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.java similarity index 84% rename from service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java rename to service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.java index d6029b0fc..28c3da85b 100644 --- a/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java +++ b/service-layer/src/main/java/com/iluwatar/servicelayer/wizard/WizardDaoImpl.java @@ -1,12 +1,12 @@ -package com.iluwatar.wizard; +package com.iluwatar.servicelayer.wizard; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import com.iluwatar.common.DaoBaseImpl; -import com.iluwatar.spellbook.Spellbook; +import com.iluwatar.servicelayer.common.DaoBaseImpl; +import com.iluwatar.servicelayer.spellbook.Spellbook; /** * diff --git a/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java b/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java new file mode 100644 index 000000000..aabeb1a6c --- /dev/null +++ b/service-layer/src/test/java/com/iluwatar/servicelayer/app/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.servicelayer.app; + +import org.junit.Test; + +import com.iluwatar.servicelayer.app.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/service-locator/src/main/java/com/iluwatar/App.java b/service-locator/src/main/java/com/iluwatar/servicelocator/App.java similarity index 93% rename from service-locator/src/main/java/com/iluwatar/App.java rename to service-locator/src/main/java/com/iluwatar/servicelocator/App.java index 25ac36d6b..57f188731 100644 --- a/service-locator/src/main/java/com/iluwatar/App.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servicelocator; /** * Service locator pattern, used to lookup jndi services diff --git a/service-locator/src/main/java/com/iluwatar/InitContext.java b/service-locator/src/main/java/com/iluwatar/servicelocator/InitContext.java similarity index 96% rename from service-locator/src/main/java/com/iluwatar/InitContext.java rename to service-locator/src/main/java/com/iluwatar/servicelocator/InitContext.java index 3c03b717a..64b65ea1d 100644 --- a/service-locator/src/main/java/com/iluwatar/InitContext.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/InitContext.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servicelocator; /** * For JNDI lookup of services from the web.xml. Will match name of the service name that diff --git a/service-locator/src/main/java/com/iluwatar/Service.java b/service-locator/src/main/java/com/iluwatar/servicelocator/Service.java similarity index 92% rename from service-locator/src/main/java/com/iluwatar/Service.java rename to service-locator/src/main/java/com/iluwatar/servicelocator/Service.java index e9642e3d0..dbb268159 100644 --- a/service-locator/src/main/java/com/iluwatar/Service.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/Service.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servicelocator; /** * This is going to be the parent service interface which we will diff --git a/service-locator/src/main/java/com/iluwatar/ServiceCache.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java similarity index 97% rename from service-locator/src/main/java/com/iluwatar/ServiceCache.java rename to service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java index 4d5a388c3..c48e4c7af 100644 --- a/service-locator/src/main/java/com/iluwatar/ServiceCache.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceCache.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servicelocator; import java.util.HashMap; import java.util.Map; diff --git a/service-locator/src/main/java/com/iluwatar/ServiceImpl.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceImpl.java similarity index 96% rename from service-locator/src/main/java/com/iluwatar/ServiceImpl.java rename to service-locator/src/main/java/com/iluwatar/servicelocator/ServiceImpl.java index d0f865248..ec7ab215b 100644 --- a/service-locator/src/main/java/com/iluwatar/ServiceImpl.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceImpl.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servicelocator; /** * This is a single service implementation of a sample service. This is the actual diff --git a/service-locator/src/main/java/com/iluwatar/ServiceLocator.java b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java similarity index 96% rename from service-locator/src/main/java/com/iluwatar/ServiceLocator.java rename to service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java index 7b6701f5f..95df24926 100644 --- a/service-locator/src/main/java/com/iluwatar/ServiceLocator.java +++ b/service-locator/src/main/java/com/iluwatar/servicelocator/ServiceLocator.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.servicelocator; /** * The service locator module. diff --git a/service-locator/src/test/java/com/iluwatar/AppTest.java b/service-locator/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/service-locator/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java b/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java new file mode 100644 index 000000000..d6af23f2d --- /dev/null +++ b/service-locator/src/test/java/com/iluwatar/servicelocator/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.servicelocator; + +import org.junit.Test; + +import com.iluwatar.servicelocator.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/singleton/src/main/java/com/iluwatar/App.java b/singleton/src/main/java/com/iluwatar/singleton/App.java similarity index 96% rename from singleton/src/main/java/com/iluwatar/App.java rename to singleton/src/main/java/com/iluwatar/singleton/App.java index 557820048..d14088ca2 100644 --- a/singleton/src/main/java/com/iluwatar/App.java +++ b/singleton/src/main/java/com/iluwatar/singleton/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.singleton; /** * diff --git a/singleton/src/main/java/com/iluwatar/EnumIvoryTower.java b/singleton/src/main/java/com/iluwatar/singleton/EnumIvoryTower.java similarity index 89% rename from singleton/src/main/java/com/iluwatar/EnumIvoryTower.java rename to singleton/src/main/java/com/iluwatar/singleton/EnumIvoryTower.java index a9858d99e..8f9895924 100644 --- a/singleton/src/main/java/com/iluwatar/EnumIvoryTower.java +++ b/singleton/src/main/java/com/iluwatar/singleton/EnumIvoryTower.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.singleton; /** * diff --git a/singleton/src/main/java/com/iluwatar/InitializingOnDemandHolderIdiom.java b/singleton/src/main/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiom.java similarity index 96% rename from singleton/src/main/java/com/iluwatar/InitializingOnDemandHolderIdiom.java rename to singleton/src/main/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiom.java index eb83c357b..329cd6a7e 100644 --- a/singleton/src/main/java/com/iluwatar/InitializingOnDemandHolderIdiom.java +++ b/singleton/src/main/java/com/iluwatar/singleton/InitializingOnDemandHolderIdiom.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.singleton; import java.io.Serializable; diff --git a/singleton/src/main/java/com/iluwatar/IvoryTower.java b/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java similarity index 84% rename from singleton/src/main/java/com/iluwatar/IvoryTower.java rename to singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java index 8bf01849e..5d418aa54 100644 --- a/singleton/src/main/java/com/iluwatar/IvoryTower.java +++ b/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.singleton; /** * diff --git a/singleton/src/main/java/com/iluwatar/ThreadSafeDoubleCheckLocking.java b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLocking.java similarity index 96% rename from singleton/src/main/java/com/iluwatar/ThreadSafeDoubleCheckLocking.java rename to singleton/src/main/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLocking.java index 53216f341..352cac2e9 100644 --- a/singleton/src/main/java/com/iluwatar/ThreadSafeDoubleCheckLocking.java +++ b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeDoubleCheckLocking.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.singleton; /** * Double check locking diff --git a/singleton/src/main/java/com/iluwatar/ThreadSafeLazyLoadedIvoryTower.java b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTower.java similarity index 94% rename from singleton/src/main/java/com/iluwatar/ThreadSafeLazyLoadedIvoryTower.java rename to singleton/src/main/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTower.java index 900c2b81f..f7184cfb0 100644 --- a/singleton/src/main/java/com/iluwatar/ThreadSafeLazyLoadedIvoryTower.java +++ b/singleton/src/main/java/com/iluwatar/singleton/ThreadSafeLazyLoadedIvoryTower.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.singleton; /** * diff --git a/singleton/src/test/java/com/iluwatar/AppTest.java b/singleton/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/singleton/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/singleton/src/test/java/com/iluwatar/singleton/AppTest.java b/singleton/src/test/java/com/iluwatar/singleton/AppTest.java new file mode 100644 index 000000000..abe0440fd --- /dev/null +++ b/singleton/src/test/java/com/iluwatar/singleton/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.singleton; + +import org.junit.Test; + +import com.iluwatar.singleton.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/specification/src/main/java/com/iluwatar/creature/Creature.java b/specification/src/main/java/com/iluwatar/creature/Creature.java deleted file mode 100644 index 1844db804..000000000 --- a/specification/src/main/java/com/iluwatar/creature/Creature.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.iluwatar.creature; - -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; - -/** - * - * Creature interface. - * - */ -public interface Creature { - - String getName(); - - Size getSize(); - - Movement getMovement(); - - Color getColor(); -} diff --git a/specification/src/main/java/com/iluwatar/creature/Dragon.java b/specification/src/main/java/com/iluwatar/creature/Dragon.java deleted file mode 100644 index a925c60b9..000000000 --- a/specification/src/main/java/com/iluwatar/creature/Dragon.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iluwatar.creature; - -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; - -/** - * - * Dragon creature. - * - */ -public class Dragon extends AbstractCreature { - - public Dragon() { - super("Dragon", Size.LARGE, Movement.FLYING, Color.RED); - } -} diff --git a/specification/src/main/java/com/iluwatar/creature/Goblin.java b/specification/src/main/java/com/iluwatar/creature/Goblin.java deleted file mode 100644 index 19bdac7f1..000000000 --- a/specification/src/main/java/com/iluwatar/creature/Goblin.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iluwatar.creature; - -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; - -/** - * - * Goblin creature. - * - */ -public class Goblin extends AbstractCreature { - - public Goblin() { - super("Goblin", Size.SMALL, Movement.WALKING, Color.GREEN); - } -} diff --git a/specification/src/main/java/com/iluwatar/creature/KillerBee.java b/specification/src/main/java/com/iluwatar/creature/KillerBee.java deleted file mode 100644 index e2ebf4d1f..000000000 --- a/specification/src/main/java/com/iluwatar/creature/KillerBee.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iluwatar.creature; - -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; - -/** - * - * KillerBee creature. - * - */ -public class KillerBee extends AbstractCreature { - - public KillerBee() { - super("KillerBee", Size.SMALL, Movement.FLYING, Color.LIGHT); - } -} diff --git a/specification/src/main/java/com/iluwatar/creature/Octopus.java b/specification/src/main/java/com/iluwatar/creature/Octopus.java deleted file mode 100644 index f40030475..000000000 --- a/specification/src/main/java/com/iluwatar/creature/Octopus.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iluwatar.creature; - -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; - -/** - * - * Octopus creature. - * - */ -public class Octopus extends AbstractCreature { - - public Octopus() { - super("Octopus", Size.NORMAL, Movement.SWIMMING, Color.DARK); - } -} diff --git a/specification/src/main/java/com/iluwatar/creature/Shark.java b/specification/src/main/java/com/iluwatar/creature/Shark.java deleted file mode 100644 index a751cc605..000000000 --- a/specification/src/main/java/com/iluwatar/creature/Shark.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iluwatar.creature; - -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; - -/** - * - * Shark creature. - * - */ -public class Shark extends AbstractCreature { - - public Shark() { - super("Shark", Size.NORMAL, Movement.SWIMMING, Color.LIGHT); - } -} diff --git a/specification/src/main/java/com/iluwatar/creature/Troll.java b/specification/src/main/java/com/iluwatar/creature/Troll.java deleted file mode 100644 index 3773c6e93..000000000 --- a/specification/src/main/java/com/iluwatar/creature/Troll.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iluwatar.creature; - -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; - -/** - * - * Troll creature. - * - */ -public class Troll extends AbstractCreature { - - public Troll() { - super("Troll", Size.LARGE, Movement.WALKING, Color.DARK); - } -} diff --git a/specification/src/main/java/com/iluwatar/app/App.java b/specification/src/main/java/com/iluwatar/specification/app/App.java similarity index 74% rename from specification/src/main/java/com/iluwatar/app/App.java rename to specification/src/main/java/com/iluwatar/specification/app/App.java index b078907b9..7a5f00a5c 100644 --- a/specification/src/main/java/com/iluwatar/app/App.java +++ b/specification/src/main/java/com/iluwatar/specification/app/App.java @@ -1,20 +1,20 @@ -package com.iluwatar.app; +package com.iluwatar.specification.app; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import com.iluwatar.creature.Creature; -import com.iluwatar.creature.Dragon; -import com.iluwatar.creature.Goblin; -import com.iluwatar.creature.KillerBee; -import com.iluwatar.creature.Octopus; -import com.iluwatar.creature.Shark; -import com.iluwatar.creature.Troll; -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.selector.ColorSelector; -import com.iluwatar.selector.MovementSelector; +import com.iluwatar.specification.creature.Creature; +import com.iluwatar.specification.creature.Dragon; +import com.iluwatar.specification.creature.Goblin; +import com.iluwatar.specification.creature.KillerBee; +import com.iluwatar.specification.creature.Octopus; +import com.iluwatar.specification.creature.Shark; +import com.iluwatar.specification.creature.Troll; +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.selector.ColorSelector; +import com.iluwatar.specification.selector.MovementSelector; /** * diff --git a/specification/src/main/java/com/iluwatar/creature/AbstractCreature.java b/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java similarity index 79% rename from specification/src/main/java/com/iluwatar/creature/AbstractCreature.java rename to specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java index c6294bd4a..12dae6cc9 100644 --- a/specification/src/main/java/com/iluwatar/creature/AbstractCreature.java +++ b/specification/src/main/java/com/iluwatar/specification/creature/AbstractCreature.java @@ -1,8 +1,8 @@ -package com.iluwatar.creature; +package com.iluwatar.specification.creature; -import com.iluwatar.property.Color; -import com.iluwatar.property.Movement; -import com.iluwatar.property.Size; +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; /** * diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Creature.java b/specification/src/main/java/com/iluwatar/specification/creature/Creature.java new file mode 100644 index 000000000..f2d1d38d7 --- /dev/null +++ b/specification/src/main/java/com/iluwatar/specification/creature/Creature.java @@ -0,0 +1,21 @@ +package com.iluwatar.specification.creature; + +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; + +/** + * + * Creature interface. + * + */ +public interface Creature { + + String getName(); + + Size getSize(); + + Movement getMovement(); + + Color getColor(); +} diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Dragon.java b/specification/src/main/java/com/iluwatar/specification/creature/Dragon.java new file mode 100644 index 000000000..0a6fd31ba --- /dev/null +++ b/specification/src/main/java/com/iluwatar/specification/creature/Dragon.java @@ -0,0 +1,17 @@ +package com.iluwatar.specification.creature; + +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; + +/** + * + * Dragon creature. + * + */ +public class Dragon extends AbstractCreature { + + public Dragon() { + super("Dragon", Size.LARGE, Movement.FLYING, Color.RED); + } +} diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Goblin.java b/specification/src/main/java/com/iluwatar/specification/creature/Goblin.java new file mode 100644 index 000000000..f7cc1ef0b --- /dev/null +++ b/specification/src/main/java/com/iluwatar/specification/creature/Goblin.java @@ -0,0 +1,17 @@ +package com.iluwatar.specification.creature; + +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; + +/** + * + * Goblin creature. + * + */ +public class Goblin extends AbstractCreature { + + public Goblin() { + super("Goblin", Size.SMALL, Movement.WALKING, Color.GREEN); + } +} diff --git a/specification/src/main/java/com/iluwatar/specification/creature/KillerBee.java b/specification/src/main/java/com/iluwatar/specification/creature/KillerBee.java new file mode 100644 index 000000000..11a4711c7 --- /dev/null +++ b/specification/src/main/java/com/iluwatar/specification/creature/KillerBee.java @@ -0,0 +1,17 @@ +package com.iluwatar.specification.creature; + +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; + +/** + * + * KillerBee creature. + * + */ +public class KillerBee extends AbstractCreature { + + public KillerBee() { + super("KillerBee", Size.SMALL, Movement.FLYING, Color.LIGHT); + } +} diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Octopus.java b/specification/src/main/java/com/iluwatar/specification/creature/Octopus.java new file mode 100644 index 000000000..7a2ae2c18 --- /dev/null +++ b/specification/src/main/java/com/iluwatar/specification/creature/Octopus.java @@ -0,0 +1,17 @@ +package com.iluwatar.specification.creature; + +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; + +/** + * + * Octopus creature. + * + */ +public class Octopus extends AbstractCreature { + + public Octopus() { + super("Octopus", Size.NORMAL, Movement.SWIMMING, Color.DARK); + } +} diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Shark.java b/specification/src/main/java/com/iluwatar/specification/creature/Shark.java new file mode 100644 index 000000000..42090500d --- /dev/null +++ b/specification/src/main/java/com/iluwatar/specification/creature/Shark.java @@ -0,0 +1,17 @@ +package com.iluwatar.specification.creature; + +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; + +/** + * + * Shark creature. + * + */ +public class Shark extends AbstractCreature { + + public Shark() { + super("Shark", Size.NORMAL, Movement.SWIMMING, Color.LIGHT); + } +} diff --git a/specification/src/main/java/com/iluwatar/specification/creature/Troll.java b/specification/src/main/java/com/iluwatar/specification/creature/Troll.java new file mode 100644 index 000000000..1dd31c17f --- /dev/null +++ b/specification/src/main/java/com/iluwatar/specification/creature/Troll.java @@ -0,0 +1,17 @@ +package com.iluwatar.specification.creature; + +import com.iluwatar.specification.property.Color; +import com.iluwatar.specification.property.Movement; +import com.iluwatar.specification.property.Size; + +/** + * + * Troll creature. + * + */ +public class Troll extends AbstractCreature { + + public Troll() { + super("Troll", Size.LARGE, Movement.WALKING, Color.DARK); + } +} diff --git a/specification/src/main/java/com/iluwatar/property/Color.java b/specification/src/main/java/com/iluwatar/specification/property/Color.java similarity index 86% rename from specification/src/main/java/com/iluwatar/property/Color.java rename to specification/src/main/java/com/iluwatar/specification/property/Color.java index 4ee16063a..e23cb1585 100644 --- a/specification/src/main/java/com/iluwatar/property/Color.java +++ b/specification/src/main/java/com/iluwatar/specification/property/Color.java @@ -1,4 +1,4 @@ -package com.iluwatar.property; +package com.iluwatar.specification.property; /** * diff --git a/specification/src/main/java/com/iluwatar/property/Movement.java b/specification/src/main/java/com/iluwatar/specification/property/Movement.java similarity index 86% rename from specification/src/main/java/com/iluwatar/property/Movement.java rename to specification/src/main/java/com/iluwatar/specification/property/Movement.java index 9fcdc4d23..1b4b0ec9e 100644 --- a/specification/src/main/java/com/iluwatar/property/Movement.java +++ b/specification/src/main/java/com/iluwatar/specification/property/Movement.java @@ -1,4 +1,4 @@ -package com.iluwatar.property; +package com.iluwatar.specification.property; /** * diff --git a/specification/src/main/java/com/iluwatar/property/Size.java b/specification/src/main/java/com/iluwatar/specification/property/Size.java similarity index 85% rename from specification/src/main/java/com/iluwatar/property/Size.java rename to specification/src/main/java/com/iluwatar/specification/property/Size.java index 2fbbdb2dc..7f07fe147 100644 --- a/specification/src/main/java/com/iluwatar/property/Size.java +++ b/specification/src/main/java/com/iluwatar/specification/property/Size.java @@ -1,4 +1,4 @@ -package com.iluwatar.property; +package com.iluwatar.specification.property; /** * diff --git a/specification/src/main/java/com/iluwatar/selector/ColorSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/ColorSelector.java similarity index 66% rename from specification/src/main/java/com/iluwatar/selector/ColorSelector.java rename to specification/src/main/java/com/iluwatar/specification/selector/ColorSelector.java index 532c79e89..d68127599 100644 --- a/specification/src/main/java/com/iluwatar/selector/ColorSelector.java +++ b/specification/src/main/java/com/iluwatar/specification/selector/ColorSelector.java @@ -1,9 +1,9 @@ -package com.iluwatar.selector; +package com.iluwatar.specification.selector; import java.util.function.Predicate; -import com.iluwatar.creature.Creature; -import com.iluwatar.property.Color; +import com.iluwatar.specification.creature.Creature; +import com.iluwatar.specification.property.Color; /** * diff --git a/specification/src/main/java/com/iluwatar/selector/MovementSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/MovementSelector.java similarity index 67% rename from specification/src/main/java/com/iluwatar/selector/MovementSelector.java rename to specification/src/main/java/com/iluwatar/specification/selector/MovementSelector.java index 076e0ea5d..260abd0e3 100644 --- a/specification/src/main/java/com/iluwatar/selector/MovementSelector.java +++ b/specification/src/main/java/com/iluwatar/specification/selector/MovementSelector.java @@ -1,9 +1,9 @@ -package com.iluwatar.selector; +package com.iluwatar.specification.selector; import java.util.function.Predicate; -import com.iluwatar.creature.Creature; -import com.iluwatar.property.Movement; +import com.iluwatar.specification.creature.Creature; +import com.iluwatar.specification.property.Movement; /** * diff --git a/specification/src/main/java/com/iluwatar/selector/SizeSelector.java b/specification/src/main/java/com/iluwatar/specification/selector/SizeSelector.java similarity index 66% rename from specification/src/main/java/com/iluwatar/selector/SizeSelector.java rename to specification/src/main/java/com/iluwatar/specification/selector/SizeSelector.java index 58d705839..a54eaf16c 100644 --- a/specification/src/main/java/com/iluwatar/selector/SizeSelector.java +++ b/specification/src/main/java/com/iluwatar/specification/selector/SizeSelector.java @@ -1,9 +1,9 @@ -package com.iluwatar.selector; +package com.iluwatar.specification.selector; import java.util.function.Predicate; -import com.iluwatar.creature.Creature; -import com.iluwatar.property.Size; +import com.iluwatar.specification.creature.Creature; +import com.iluwatar.specification.property.Size; /** * diff --git a/specification/src/test/java/com/iluwatar/specification/app/AppTest.java b/specification/src/test/java/com/iluwatar/specification/app/AppTest.java new file mode 100644 index 000000000..8e27167dc --- /dev/null +++ b/specification/src/test/java/com/iluwatar/specification/app/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.specification.app; + +import org.junit.Test; + +import com.iluwatar.specification.app.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/state/src/main/java/com/iluwatar/AngryState.java b/state/src/main/java/com/iluwatar/state/AngryState.java similarity index 87% rename from state/src/main/java/com/iluwatar/AngryState.java rename to state/src/main/java/com/iluwatar/state/AngryState.java index 14cc8848a..f09fbb518 100644 --- a/state/src/main/java/com/iluwatar/AngryState.java +++ b/state/src/main/java/com/iluwatar/state/AngryState.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.state; /** * diff --git a/state/src/main/java/com/iluwatar/App.java b/state/src/main/java/com/iluwatar/state/App.java similarity index 90% rename from state/src/main/java/com/iluwatar/App.java rename to state/src/main/java/com/iluwatar/state/App.java index e7077cecf..eefa8f766 100644 --- a/state/src/main/java/com/iluwatar/App.java +++ b/state/src/main/java/com/iluwatar/state/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.state; /** * diff --git a/state/src/main/java/com/iluwatar/Mammoth.java b/state/src/main/java/com/iluwatar/state/Mammoth.java similarity index 90% rename from state/src/main/java/com/iluwatar/Mammoth.java rename to state/src/main/java/com/iluwatar/state/Mammoth.java index 6f2ceb2e5..f98da3b5e 100644 --- a/state/src/main/java/com/iluwatar/Mammoth.java +++ b/state/src/main/java/com/iluwatar/state/Mammoth.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.state; /** * diff --git a/state/src/main/java/com/iluwatar/PeacefulState.java b/state/src/main/java/com/iluwatar/state/PeacefulState.java similarity index 88% rename from state/src/main/java/com/iluwatar/PeacefulState.java rename to state/src/main/java/com/iluwatar/state/PeacefulState.java index efea33d2a..237fe7c2c 100644 --- a/state/src/main/java/com/iluwatar/PeacefulState.java +++ b/state/src/main/java/com/iluwatar/state/PeacefulState.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.state; /** * diff --git a/state/src/main/java/com/iluwatar/State.java b/state/src/main/java/com/iluwatar/state/State.java similarity index 71% rename from state/src/main/java/com/iluwatar/State.java rename to state/src/main/java/com/iluwatar/state/State.java index e1828d35d..3f65e3532 100644 --- a/state/src/main/java/com/iluwatar/State.java +++ b/state/src/main/java/com/iluwatar/state/State.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.state; /** * diff --git a/state/src/test/java/com/iluwatar/AppTest.java b/state/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/state/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/state/src/test/java/com/iluwatar/state/AppTest.java b/state/src/test/java/com/iluwatar/state/AppTest.java new file mode 100644 index 000000000..fae8412fc --- /dev/null +++ b/state/src/test/java/com/iluwatar/state/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.state; + +import org.junit.Test; + +import com.iluwatar.state.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/strategy/src/main/java/com/iluwatar/App.java b/strategy/src/main/java/com/iluwatar/strategy/App.java similarity index 92% rename from strategy/src/main/java/com/iluwatar/App.java rename to strategy/src/main/java/com/iluwatar/strategy/App.java index cc516e41d..fc9a31327 100644 --- a/strategy/src/main/java/com/iluwatar/App.java +++ b/strategy/src/main/java/com/iluwatar/strategy/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.strategy; /** * diff --git a/strategy/src/main/java/com/iluwatar/DragonSlayer.java b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java similarity index 87% rename from strategy/src/main/java/com/iluwatar/DragonSlayer.java rename to strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java index bbd9c0ed3..fc255dee0 100644 --- a/strategy/src/main/java/com/iluwatar/DragonSlayer.java +++ b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.strategy; /** * diff --git a/strategy/src/main/java/com/iluwatar/DragonSlayingStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java similarity index 70% rename from strategy/src/main/java/com/iluwatar/DragonSlayingStrategy.java rename to strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java index 08626b117..28cea2aca 100644 --- a/strategy/src/main/java/com/iluwatar/DragonSlayingStrategy.java +++ b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.strategy; /** * diff --git a/strategy/src/main/java/com/iluwatar/MeleeStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java similarity index 82% rename from strategy/src/main/java/com/iluwatar/MeleeStrategy.java rename to strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java index 63078f8e8..6c2aa550e 100644 --- a/strategy/src/main/java/com/iluwatar/MeleeStrategy.java +++ b/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.strategy; /** * diff --git a/strategy/src/main/java/com/iluwatar/ProjectileStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java similarity index 84% rename from strategy/src/main/java/com/iluwatar/ProjectileStrategy.java rename to strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java index e6f3e9e73..eab93b16e 100644 --- a/strategy/src/main/java/com/iluwatar/ProjectileStrategy.java +++ b/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.strategy; /** * diff --git a/strategy/src/main/java/com/iluwatar/SpellStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java similarity index 84% rename from strategy/src/main/java/com/iluwatar/SpellStrategy.java rename to strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java index 0f1357ac8..4a74b9b0d 100644 --- a/strategy/src/main/java/com/iluwatar/SpellStrategy.java +++ b/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.strategy; /** * diff --git a/strategy/src/test/java/com/iluwatar/AppTest.java b/strategy/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/strategy/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/strategy/src/test/java/com/iluwatar/strategy/AppTest.java b/strategy/src/test/java/com/iluwatar/strategy/AppTest.java new file mode 100644 index 000000000..e46708c0a --- /dev/null +++ b/strategy/src/test/java/com/iluwatar/strategy/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.strategy; + +import org.junit.Test; + +import com.iluwatar.strategy.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/template-method/src/main/java/com/iluwatar/App.java b/template-method/src/main/java/com/iluwatar/templatemethod/App.java similarity index 89% rename from template-method/src/main/java/com/iluwatar/App.java rename to template-method/src/main/java/com/iluwatar/templatemethod/App.java index 7fc10e327..9797474cf 100644 --- a/template-method/src/main/java/com/iluwatar/App.java +++ b/template-method/src/main/java/com/iluwatar/templatemethod/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.templatemethod; /** * diff --git a/template-method/src/main/java/com/iluwatar/HalflingThief.java b/template-method/src/main/java/com/iluwatar/templatemethod/HalflingThief.java similarity index 84% rename from template-method/src/main/java/com/iluwatar/HalflingThief.java rename to template-method/src/main/java/com/iluwatar/templatemethod/HalflingThief.java index 57cf4f3c7..3cdb2f1b1 100644 --- a/template-method/src/main/java/com/iluwatar/HalflingThief.java +++ b/template-method/src/main/java/com/iluwatar/templatemethod/HalflingThief.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.templatemethod; /** * diff --git a/template-method/src/main/java/com/iluwatar/HitAndRunMethod.java b/template-method/src/main/java/com/iluwatar/templatemethod/HitAndRunMethod.java similarity index 87% rename from template-method/src/main/java/com/iluwatar/HitAndRunMethod.java rename to template-method/src/main/java/com/iluwatar/templatemethod/HitAndRunMethod.java index bee01644b..78ee2031b 100644 --- a/template-method/src/main/java/com/iluwatar/HitAndRunMethod.java +++ b/template-method/src/main/java/com/iluwatar/templatemethod/HitAndRunMethod.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.templatemethod; /** * diff --git a/template-method/src/main/java/com/iluwatar/StealingMethod.java b/template-method/src/main/java/com/iluwatar/templatemethod/StealingMethod.java similarity index 88% rename from template-method/src/main/java/com/iluwatar/StealingMethod.java rename to template-method/src/main/java/com/iluwatar/templatemethod/StealingMethod.java index 759155b47..20e077750 100644 --- a/template-method/src/main/java/com/iluwatar/StealingMethod.java +++ b/template-method/src/main/java/com/iluwatar/templatemethod/StealingMethod.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.templatemethod; /** * diff --git a/template-method/src/main/java/com/iluwatar/SubtleMethod.java b/template-method/src/main/java/com/iluwatar/templatemethod/SubtleMethod.java similarity index 88% rename from template-method/src/main/java/com/iluwatar/SubtleMethod.java rename to template-method/src/main/java/com/iluwatar/templatemethod/SubtleMethod.java index a37616cb4..c5bd1cfaf 100644 --- a/template-method/src/main/java/com/iluwatar/SubtleMethod.java +++ b/template-method/src/main/java/com/iluwatar/templatemethod/SubtleMethod.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.templatemethod; /** * diff --git a/template-method/src/test/java/com/iluwatar/AppTest.java b/template-method/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/template-method/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java b/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java new file mode 100644 index 000000000..fce07bef1 --- /dev/null +++ b/template-method/src/test/java/com/iluwatar/templatemethod/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.templatemethod; + +import org.junit.Test; + +import com.iluwatar.templatemethod.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/thread-pool/src/main/java/com/iluwatar/App.java b/thread-pool/src/main/java/com/iluwatar/threadpool/App.java similarity index 98% rename from thread-pool/src/main/java/com/iluwatar/App.java rename to thread-pool/src/main/java/com/iluwatar/threadpool/App.java index 9bd539425..0a7bed3a0 100644 --- a/thread-pool/src/main/java/com/iluwatar/App.java +++ b/thread-pool/src/main/java/com/iluwatar/threadpool/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.threadpool; import java.util.ArrayList; import java.util.List; diff --git a/thread-pool/src/main/java/com/iluwatar/CoffeeMakingTask.java b/thread-pool/src/main/java/com/iluwatar/threadpool/CoffeeMakingTask.java similarity index 91% rename from thread-pool/src/main/java/com/iluwatar/CoffeeMakingTask.java rename to thread-pool/src/main/java/com/iluwatar/threadpool/CoffeeMakingTask.java index f299b28a3..9bbabfd0d 100644 --- a/thread-pool/src/main/java/com/iluwatar/CoffeeMakingTask.java +++ b/thread-pool/src/main/java/com/iluwatar/threadpool/CoffeeMakingTask.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.threadpool; /** * diff --git a/thread-pool/src/main/java/com/iluwatar/PotatoPeelingTask.java b/thread-pool/src/main/java/com/iluwatar/threadpool/PotatoPeelingTask.java similarity index 91% rename from thread-pool/src/main/java/com/iluwatar/PotatoPeelingTask.java rename to thread-pool/src/main/java/com/iluwatar/threadpool/PotatoPeelingTask.java index 7195aed37..6b2169961 100644 --- a/thread-pool/src/main/java/com/iluwatar/PotatoPeelingTask.java +++ b/thread-pool/src/main/java/com/iluwatar/threadpool/PotatoPeelingTask.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.threadpool; /** * diff --git a/thread-pool/src/main/java/com/iluwatar/Task.java b/thread-pool/src/main/java/com/iluwatar/threadpool/Task.java similarity index 92% rename from thread-pool/src/main/java/com/iluwatar/Task.java rename to thread-pool/src/main/java/com/iluwatar/threadpool/Task.java index ad75fde3b..4766b6eee 100644 --- a/thread-pool/src/main/java/com/iluwatar/Task.java +++ b/thread-pool/src/main/java/com/iluwatar/threadpool/Task.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.threadpool; /** * diff --git a/thread-pool/src/main/java/com/iluwatar/Worker.java b/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java similarity index 93% rename from thread-pool/src/main/java/com/iluwatar/Worker.java rename to thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java index 8694043e8..b6ee5e665 100644 --- a/thread-pool/src/main/java/com/iluwatar/Worker.java +++ b/thread-pool/src/main/java/com/iluwatar/threadpool/Worker.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.threadpool; /** * diff --git a/thread-pool/src/test/java/com/iluwatar/AppTest.java b/thread-pool/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index b81f7499d..000000000 --- a/thread-pool/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/model-view-controller/src/test/java/com/iluwatar/AppTest.java b/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java similarity index 63% rename from model-view-controller/src/test/java/com/iluwatar/AppTest.java rename to thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java index b81f7499d..ec5c031ff 100644 --- a/model-view-controller/src/test/java/com/iluwatar/AppTest.java +++ b/thread-pool/src/test/java/com/iluwatar/threadpool/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.threadpool; import org.junit.Test; +import com.iluwatar.threadpool.App; + public class AppTest { @Test diff --git a/tolerant-reader/src/main/java/com/iluwatar/App.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/App.java similarity index 98% rename from tolerant-reader/src/main/java/com/iluwatar/App.java rename to tolerant-reader/src/main/java/com/iluwatar/tolerantreader/App.java index 6b6f1e8e6..ab4a8bfad 100644 --- a/tolerant-reader/src/main/java/com/iluwatar/App.java +++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.tolerantreader; import java.io.IOException; diff --git a/tolerant-reader/src/main/java/com/iluwatar/RainbowFish.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java similarity index 94% rename from tolerant-reader/src/main/java/com/iluwatar/RainbowFish.java rename to tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java index 8ab2b378c..5e1fb1832 100644 --- a/tolerant-reader/src/main/java/com/iluwatar/RainbowFish.java +++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.tolerantreader; import java.io.Serializable; diff --git a/tolerant-reader/src/main/java/com/iluwatar/RainbowFishSerializer.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java similarity index 98% rename from tolerant-reader/src/main/java/com/iluwatar/RainbowFishSerializer.java rename to tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java index 59d4581af..ec482a34a 100644 --- a/tolerant-reader/src/main/java/com/iluwatar/RainbowFishSerializer.java +++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.tolerantreader; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/tolerant-reader/src/main/java/com/iluwatar/RainbowFishV2.java b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.java similarity index 95% rename from tolerant-reader/src/main/java/com/iluwatar/RainbowFishV2.java rename to tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.java index 89564fea0..dfa08ed01 100644 --- a/tolerant-reader/src/main/java/com/iluwatar/RainbowFishV2.java +++ b/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.tolerantreader; /** * diff --git a/tolerant-reader/src/test/java/com/iluwatar/AppTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java similarity index 84% rename from tolerant-reader/src/test/java/com/iluwatar/AppTest.java rename to tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java index d188c92a6..cba24ada9 100644 --- a/tolerant-reader/src/test/java/com/iluwatar/AppTest.java +++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/AppTest.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.tolerantreader; import java.io.File; import java.io.IOException; @@ -7,6 +7,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.iluwatar.tolerantreader.App; + public class AppTest { diff --git a/visitor/src/main/java/com/iluwatar/App.java b/visitor/src/main/java/com/iluwatar/visitor/App.java similarity index 92% rename from visitor/src/main/java/com/iluwatar/App.java rename to visitor/src/main/java/com/iluwatar/visitor/App.java index a3836ffef..d9338777c 100644 --- a/visitor/src/main/java/com/iluwatar/App.java +++ b/visitor/src/main/java/com/iluwatar/visitor/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/Commander.java b/visitor/src/main/java/com/iluwatar/visitor/Commander.java similarity index 85% rename from visitor/src/main/java/com/iluwatar/Commander.java rename to visitor/src/main/java/com/iluwatar/visitor/Commander.java index f61df8793..18f418b01 100644 --- a/visitor/src/main/java/com/iluwatar/Commander.java +++ b/visitor/src/main/java/com/iluwatar/visitor/Commander.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/CommanderVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java similarity index 86% rename from visitor/src/main/java/com/iluwatar/CommanderVisitor.java rename to visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java index edc61c429..71e127d14 100644 --- a/visitor/src/main/java/com/iluwatar/CommanderVisitor.java +++ b/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/Sergeant.java b/visitor/src/main/java/com/iluwatar/visitor/Sergeant.java similarity index 84% rename from visitor/src/main/java/com/iluwatar/Sergeant.java rename to visitor/src/main/java/com/iluwatar/visitor/Sergeant.java index 9a0d492d2..17a19780a 100644 --- a/visitor/src/main/java/com/iluwatar/Sergeant.java +++ b/visitor/src/main/java/com/iluwatar/visitor/Sergeant.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/SergeantVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java similarity index 85% rename from visitor/src/main/java/com/iluwatar/SergeantVisitor.java rename to visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java index bb2d1be4b..a1b9165eb 100644 --- a/visitor/src/main/java/com/iluwatar/SergeantVisitor.java +++ b/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/Soldier.java b/visitor/src/main/java/com/iluwatar/visitor/Soldier.java similarity index 84% rename from visitor/src/main/java/com/iluwatar/Soldier.java rename to visitor/src/main/java/com/iluwatar/visitor/Soldier.java index 09e0a7e9a..f71fe5bc0 100644 --- a/visitor/src/main/java/com/iluwatar/Soldier.java +++ b/visitor/src/main/java/com/iluwatar/visitor/Soldier.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/SoldierVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java similarity index 85% rename from visitor/src/main/java/com/iluwatar/SoldierVisitor.java rename to visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java index ff5c91e19..828212dee 100644 --- a/visitor/src/main/java/com/iluwatar/SoldierVisitor.java +++ b/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/Unit.java b/visitor/src/main/java/com/iluwatar/visitor/Unit.java similarity index 85% rename from visitor/src/main/java/com/iluwatar/Unit.java rename to visitor/src/main/java/com/iluwatar/visitor/Unit.java index 692567757..fbf1faae1 100644 --- a/visitor/src/main/java/com/iluwatar/Unit.java +++ b/visitor/src/main/java/com/iluwatar/visitor/Unit.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/main/java/com/iluwatar/UnitVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java similarity index 80% rename from visitor/src/main/java/com/iluwatar/UnitVisitor.java rename to visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java index da5023496..b0148bc7e 100644 --- a/visitor/src/main/java/com/iluwatar/UnitVisitor.java +++ b/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.visitor; /** * diff --git a/visitor/src/test/java/com/iluwatar/AppTest.java b/visitor/src/test/java/com/iluwatar/AppTest.java deleted file mode 100644 index 89b9e61d8..000000000 --- a/visitor/src/test/java/com/iluwatar/AppTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iluwatar; - -import org.junit.Test; - -public class AppTest { - - @Test - public void test() { - String[] args = {}; - App.main(args); - } -} diff --git a/visitor/src/test/java/com/iluwatar/visitor/AppTest.java b/visitor/src/test/java/com/iluwatar/visitor/AppTest.java new file mode 100644 index 000000000..5ba48c6c9 --- /dev/null +++ b/visitor/src/test/java/com/iluwatar/visitor/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.visitor; + +import org.junit.Test; + +import com.iluwatar.visitor.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +}