From 3d488ec15a81d16be35843bb96505da1306db88b Mon Sep 17 00:00:00 2001 From: Ilkka Seppala Date: Fri, 24 Jul 2015 11:32:22 +0300 Subject: [PATCH] #108 Consistent package naming throughout the examples --- business-delegate/etc/business-delegate.ucls | 83 +++++--- .../iluwatar/{ => business/delegate}/App.java | 2 +- .../delegate}/BusinessDelegate.java | 2 +- .../delegate}/BusinessLookup.java | 2 +- .../delegate}/BusinessService.java | 2 +- .../{ => business/delegate}/Client.java | 2 +- .../{ => business/delegate}/EjbService.java | 2 +- .../{ => business/delegate}/JmsService.java | 2 +- .../{ => business/delegate}/ServiceType.java | 2 +- .../iluwatar/business/delegate}/AppTest.java | 28 +-- .../injection}/AdvancedWizard.java | 2 +- .../injection}/App.java | 2 +- .../injection}/GuiceWizard.java | 2 +- .../injection}/OldTobyTobacco.java | 2 +- .../injection}/RivendellTobacco.java | 2 +- .../injection}/SecondBreakfastTobacco.java | 2 +- .../injection}/SimpleWizard.java | 2 +- .../injection}/Tobacco.java | 2 +- .../injection}/TobaccoModule.java | 2 +- .../injection}/Wizard.java | 2 +- .../injection}/AppTest.java | 4 +- .../etc/double-checked-locking.ucls | 16 +- .../locking}/App.java | 2 +- .../locking}/Inventory.java | 2 +- .../locking}/Item.java | 2 +- .../doublechecked/locking}/AppTest.java | 28 +-- .../doublecheckedlocking/AppTest.java | 14 -- .../aggregator}/App.java | 70 +++---- .../aggregator}/Event.java | 42 ++-- .../aggregator}/EventEmitter.java | 70 +++---- .../aggregator}/EventObserver.java | 24 +-- .../aggregator}/KingJoffrey.java | 28 +-- .../aggregator}/KingsHand.java | 56 +++--- .../aggregator}/LordBaelish.java | 48 ++--- .../aggregator}/LordVarys.java | 48 ++--- .../aggregator}/Scout.java | 48 ++--- .../aggregator}/Weekday.java | 32 ++-- .../iluwatar/event/aggregator/AppTest.java | 13 ++ .../com/iluwatar/eventaggregator/AppTest.java | 13 -- .../around}/App.java | 2 +- .../around}/FileWriterAction.java | 2 +- .../around}/SimpleFileWriter.java | 2 +- .../around}/AppTest.java | 4 +- factory-method/etc/factory-method.ucls | 82 ++++---- .../method}/App.java | 56 +++--- .../method}/Blacksmith.java | 24 +-- .../method}/ElfBlacksmith.java | 28 +-- .../method}/ElfWeapon.java | 32 ++-- .../method}/OrcBlacksmith.java | 28 +-- .../method}/OrcWeapon.java | 32 ++-- .../com/iluwatar/factory/method/Weapon.java | 5 + .../method}/WeaponType.java | 34 ++-- .../com/iluwatar/factorymethod/Weapon.java | 5 - .../com/iluwatar/factory/method}/AppTest.java | 4 +- front-controller/etc/front-controller.ucls | 84 ++++---- .../iluwatar/{ => front/controller}/App.java | 2 +- .../controller}/ApplicationException.java | 2 +- .../{ => front/controller}/ArcherCommand.java | 2 +- .../{ => front/controller}/ArcherView.java | 2 +- .../controller}/CatapultCommand.java | 2 +- .../{ => front/controller}/CatapultView.java | 2 +- .../{ => front/controller}/Command.java | 2 +- .../{ => front/controller}/ErrorView.java | 2 +- .../controller}/FrontController.java | 2 +- .../controller}/UnknownCommand.java | 2 +- .../iluwatar/{ => front/controller}/View.java | 2 +- .../{ => front/controller}/AppTest.java | 4 +- .../etc/intercepting-filter.ucls | 180 ++++++++++-------- .../filter}/AbstractFilter.java | 2 +- .../filter}/AddressFilter.java | 2 +- .../filter}/App.java | 2 +- .../filter}/Client.java | 2 +- .../filter}/ContactFilter.java | 2 +- .../filter}/DepositFilter.java | 2 +- .../filter}/Filter.java | 2 +- .../filter}/FilterChain.java | 2 +- .../filter}/FilterManager.java | 2 +- .../filter}/NameFilter.java | 2 +- .../filter}/Order.java | 2 +- .../filter}/OrderFilter.java | 2 +- .../filter}/Target.java | 2 +- .../iluwatar/intercepting/filter/AppTest.java | 14 ++ .../{lazyloading => lazy/loading}/App.java | 2 +- .../{lazyloading => lazy/loading}/Heavy.java | 2 +- .../loading}/HolderNaive.java | 2 +- .../loading}/HolderThreadSafe.java | 2 +- .../loading}/Java8Holder.java | 2 +- .../com/iluwatar/lazy/loading}/AppTest.java | 4 +- .../view/controller}/App.java | 2 +- .../view/controller}/Fatigue.java | 2 +- .../view/controller}/GiantController.java | 2 +- .../view/controller}/GiantModel.java | 2 +- .../view/controller}/GiantView.java | 2 +- .../view/controller}/Health.java | 2 +- .../view/controller}/Nourishment.java | 2 +- .../view/controller}/AppTest.java | 4 +- .../etc/model-view-presenter.ucls | 95 +++++---- .../view/presenter}/FileLoader.java | 2 +- .../view/presenter}/FileSelectorJFrame.java | 2 +- .../presenter}/FileSelectorPresenter.java | 2 +- .../view/presenter}/FileSelectorStub.java | 2 +- .../view/presenter}/FileSelectorView.java | 2 +- .../view/presenter}/MainApp.java | 2 +- .../presenter}/FileSelectorPresenterTest.java | 8 +- .../{objectpool => object/pool}/App.java | 90 ++++----- .../pool}/ObjectPool.java | 74 +++---- .../pool}/Oliphaunt.java | 62 +++--- .../pool}/OliphauntPool.java | 28 +-- .../com/iluwatar/object/pool}/AppTest.java | 4 +- .../{poisonpill => poison/pill}/App.java | 2 +- .../{poisonpill => poison/pill}/Consumer.java | 4 +- .../pill}/MQPublishPoint.java | 2 +- .../pill}/MQSubscribePoint.java | 2 +- .../{poisonpill => poison/pill}/Message.java | 2 +- .../pill}/MessageQueue.java | 2 +- .../{poisonpill => poison/pill}/Producer.java | 4 +- .../pill}/SimpleMessage.java | 2 +- .../pill}/SimpleMessageQueue.java | 2 +- .../com/iluwatar/poison/pill}/AppTest.java | 4 +- repository/etc/repository.ucls | 8 +- .../com/iluwatar/{ => repository}/App.java | 2 +- .../com/iluwatar/{ => repository}/Person.java | 2 +- .../iluwatar/{ => repository}/PersonDao.java | 2 +- .../com/iluwatar/repository}/AppTest.java | 4 +- .../acquisition/is/initialization}/App.java | 2 +- .../is/initialization}/SlidingDoor.java | 2 +- .../is/initialization}/TreasureChest.java | 2 +- .../is/initialization}/AppTest.java | 4 +- 128 files changed, 963 insertions(+), 873 deletions(-) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/App.java (96%) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/BusinessDelegate.java (92%) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/BusinessLookup.java (87%) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/BusinessService.java (74%) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/Client.java (88%) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/EjbService.java (83%) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/JmsService.java (83%) rename business-delegate/src/main/java/com/iluwatar/{ => business/delegate}/ServiceType.java (69%) rename {object-pool/src/test/java/com/iluwatar/objectpool => business-delegate/src/test/java/com/iluwatar/business/delegate}/AppTest.java (60%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/AdvancedWizard.java (89%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/App.java (97%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/GuiceWizard.java (90%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/OldTobyTobacco.java (72%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/RivendellTobacco.java (73%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/SecondBreakfastTobacco.java (75%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/SimpleWizard.java (87%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/Tobacco.java (84%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/TobaccoModule.java (86%) rename dependency-injection/src/main/java/com/iluwatar/{dependencyinjection => dependency/injection}/Wizard.java (65%) rename dependency-injection/src/test/java/com/iluwatar/{dependencyinjection => dependency/injection}/AppTest.java (58%) rename double-checked-locking/src/main/java/com/iluwatar/{doublecheckedlocking => doublechecked/locking}/App.java (94%) rename double-checked-locking/src/main/java/com/iluwatar/{doublecheckedlocking => doublechecked/locking}/Inventory.java (94%) rename double-checked-locking/src/main/java/com/iluwatar/{doublecheckedlocking => doublechecked/locking}/Item.java (52%) rename {factory-method/src/test/java/com/iluwatar/factorymethod => double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking}/AppTest.java (57%) delete mode 100644 double-checked-locking/src/test/java/com/iluwatar/doublecheckedlocking/AppTest.java rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/App.java (92%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/Event.java (85%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/EventEmitter.java (89%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/EventObserver.java (71%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/KingJoffrey.java (82%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/KingsHand.java (85%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/LordBaelish.java (84%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/LordVarys.java (84%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/Scout.java (83%) rename event-aggregator/src/main/java/com/iluwatar/{eventaggregator => event/aggregator}/Weekday.java (85%) create mode 100644 event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java delete mode 100644 event-aggregator/src/test/java/com/iluwatar/eventaggregator/AppTest.java rename execute-around/src/main/java/com/iluwatar/{executearound => execute/around}/App.java (95%) rename execute-around/src/main/java/com/iluwatar/{executearound => execute/around}/FileWriterAction.java (86%) rename execute-around/src/main/java/com/iluwatar/{executearound => execute/around}/SimpleFileWriter.java (93%) rename execute-around/src/test/java/com/iluwatar/{executearound => execute/around}/AppTest.java (83%) rename factory-method/src/main/java/com/iluwatar/{factorymethod => factory/method}/App.java (92%) rename factory-method/src/main/java/com/iluwatar/{factorymethod => factory/method}/Blacksmith.java (76%) rename factory-method/src/main/java/com/iluwatar/{factorymethod => factory/method}/ElfBlacksmith.java (81%) rename factory-method/src/main/java/com/iluwatar/{factorymethod => factory/method}/ElfWeapon.java (81%) rename factory-method/src/main/java/com/iluwatar/{factorymethod => factory/method}/OrcBlacksmith.java (81%) rename factory-method/src/main/java/com/iluwatar/{factorymethod => factory/method}/OrcWeapon.java (81%) create mode 100644 factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java rename factory-method/src/main/java/com/iluwatar/{factorymethod => factory/method}/WeaponType.java (82%) delete mode 100644 factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java rename {intercepting-filter/src/test/java/com/iluwatar/interceptingfilter => factory-method/src/test/java/com/iluwatar/factory/method}/AppTest.java (61%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/App.java (96%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/ApplicationException.java (78%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/ArcherCommand.java (80%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/ArcherView.java (80%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/CatapultCommand.java (80%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/CatapultView.java (81%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/Command.java (76%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/ErrorView.java (79%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/FrontController.java (94%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/UnknownCommand.java (83%) rename front-controller/src/main/java/com/iluwatar/{ => front/controller}/View.java (74%) rename front-controller/src/test/java/com/iluwatar/{ => front/controller}/AppTest.java (60%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/AbstractFilter.java (94%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/AddressFilter.java (91%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/App.java (93%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/Client.java (98%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/ContactFilter.java (94%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/DepositFilter.java (90%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/Filter.java (94%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/FilterChain.java (92%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/FilterManager.java (90%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/NameFilter.java (91%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/Order.java (96%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/OrderFilter.java (90%) rename intercepting-filter/src/main/java/com/iluwatar/{interceptingfilter => intercepting/filter}/Target.java (97%) create mode 100644 intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java rename lazy-loading/src/main/java/com/iluwatar/{lazyloading => lazy/loading}/App.java (96%) rename lazy-loading/src/main/java/com/iluwatar/{lazyloading => lazy/loading}/Heavy.java (89%) rename lazy-loading/src/main/java/com/iluwatar/{lazyloading => lazy/loading}/HolderNaive.java (90%) rename lazy-loading/src/main/java/com/iluwatar/{lazyloading => lazy/loading}/HolderThreadSafe.java (92%) rename lazy-loading/src/main/java/com/iluwatar/{lazyloading => lazy/loading}/Java8Holder.java (95%) rename {repository/src/test/java/com/iluwatar => lazy-loading/src/test/java/com/iluwatar/lazy/loading}/AppTest.java (62%) rename model-view-controller/src/main/java/com/iluwatar/{modelviewcontroller => model/view/controller}/App.java (97%) rename model-view-controller/src/main/java/com/iluwatar/{modelviewcontroller => model/view/controller}/Fatigue.java (85%) rename model-view-controller/src/main/java/com/iluwatar/{modelviewcontroller => model/view/controller}/GiantController.java (94%) rename model-view-controller/src/main/java/com/iluwatar/{modelviewcontroller => model/view/controller}/GiantModel.java (95%) rename model-view-controller/src/main/java/com/iluwatar/{modelviewcontroller => model/view/controller}/GiantView.java (77%) rename model-view-controller/src/main/java/com/iluwatar/{modelviewcontroller => model/view/controller}/Health.java (85%) rename model-view-controller/src/main/java/com/iluwatar/{modelviewcontroller => model/view/controller}/Nourishment.java (86%) rename model-view-controller/src/test/java/com/iluwatar/{modelviewcontroller => model/view/controller}/AppTest.java (57%) rename model-view-presenter/src/main/java/com/iluwatar/{modelviewpresenter => model/view/presenter}/FileLoader.java (97%) rename model-view-presenter/src/main/java/com/iluwatar/{modelviewpresenter => model/view/presenter}/FileSelectorJFrame.java (98%) rename model-view-presenter/src/main/java/com/iluwatar/{modelviewpresenter => model/view/presenter}/FileSelectorPresenter.java (97%) rename model-view-presenter/src/main/java/com/iluwatar/{modelviewpresenter => model/view/presenter}/FileSelectorStub.java (97%) rename model-view-presenter/src/main/java/com/iluwatar/{modelviewpresenter => model/view/presenter}/FileSelectorView.java (96%) rename model-view-presenter/src/main/java/com/iluwatar/{modelviewpresenter => model/view/presenter}/MainApp.java (95%) rename model-view-presenter/src/test/java/com/iluwatar/{modelviewpresenter => model/view/presenter}/FileSelectorPresenterTest.java (91%) rename object-pool/src/main/java/com/iluwatar/{objectpool => object/pool}/App.java (96%) rename object-pool/src/main/java/com/iluwatar/{objectpool => object/pool}/ObjectPool.java (90%) rename object-pool/src/main/java/com/iluwatar/{objectpool => object/pool}/Oliphaunt.java (86%) rename object-pool/src/main/java/com/iluwatar/{objectpool => object/pool}/OliphauntPool.java (78%) rename {business-delegate/src/test/java/com/iluwatar => object-pool/src/test/java/com/iluwatar/object/pool}/AppTest.java (63%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/App.java (97%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/Consumer.java (90%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/MQPublishPoint.java (81%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/MQSubscribePoint.java (81%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/Message.java (96%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/MessageQueue.java (84%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/Producer.java (92%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/SimpleMessage.java (95%) rename poison-pill/src/main/java/com/iluwatar/{poisonpill => poison/pill}/SimpleMessageQueue.java (93%) rename {lazy-loading/src/test/java/com/iluwatar/lazyloading => poison-pill/src/test/java/com/iluwatar/poison/pill}/AppTest.java (63%) rename repository/src/main/java/com/iluwatar/{ => repository}/App.java (98%) rename repository/src/main/java/com/iluwatar/{ => repository}/Person.java (96%) rename repository/src/main/java/com/iluwatar/{ => repository}/PersonDao.java (90%) rename {poison-pill/src/test/java/com/iluwatar/poisonpill => repository/src/test/java/com/iluwatar/repository}/AppTest.java (64%) rename resource-acquisition-is-initialization/src/main/java/com/iluwatar/{resourceacquisitionisinitialization => resource/acquisition/is/initialization}/App.java (95%) rename resource-acquisition-is-initialization/src/main/java/com/iluwatar/{resourceacquisitionisinitialization => resource/acquisition/is/initialization}/SlidingDoor.java (81%) rename resource-acquisition-is-initialization/src/main/java/com/iluwatar/{resourceacquisitionisinitialization => resource/acquisition/is/initialization}/TreasureChest.java (84%) rename resource-acquisition-is-initialization/src/test/java/com/iluwatar/{resourceacquisitionisinitialization => resource/acquisition/is/initialization}/AppTest.java (53%) diff --git a/business-delegate/etc/business-delegate.ucls b/business-delegate/etc/business-delegate.ucls index f57d01cd5..668a6579e 100644 --- a/business-delegate/etc/business-delegate.ucls +++ b/business-delegate/etc/business-delegate.ucls @@ -1,8 +1,9 @@ - + @@ -10,8 +11,9 @@ - + @@ -19,8 +21,9 @@ - + @@ -28,8 +31,9 @@ - + @@ -37,8 +41,9 @@ - + @@ -46,8 +51,9 @@ - + @@ -55,8 +61,9 @@ - + @@ -68,40 +75,56 @@ - - - - - + - - + + + + + + - + - - + + + + + + - + + + + + - - + + + + + + - - + + + + + + - + - - - - + + + + + + diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/App.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java similarity index 94% rename from double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/App.java rename to double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java index 863f20882..10d22a5b2 100644 --- a/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/App.java +++ b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.doublecheckedlocking; +package com.iluwatar.doublechecked.locking; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java similarity index 94% rename from double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java rename to double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java index 368be2f9a..e69d30b10 100644 --- a/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java +++ b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java @@ -1,4 +1,4 @@ -package com.iluwatar.doublecheckedlocking; +package com.iluwatar.doublechecked.locking; import java.util.ArrayList; import java.util.List; diff --git a/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java similarity index 52% rename from double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java rename to double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java index bca41c51e..81db22115 100644 --- a/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java +++ b/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java @@ -1,4 +1,4 @@ -package com.iluwatar.doublecheckedlocking; +package com.iluwatar.doublechecked.locking; public class Item { String name; diff --git a/factory-method/src/test/java/com/iluwatar/factorymethod/AppTest.java b/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java similarity index 57% rename from factory-method/src/test/java/com/iluwatar/factorymethod/AppTest.java rename to double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java index 0abf55c2d..51db32c4f 100644 --- a/factory-method/src/test/java/com/iluwatar/factorymethod/AppTest.java +++ b/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/AppTest.java @@ -1,14 +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); - } -} +package com.iluwatar.doublechecked.locking; + +import org.junit.Test; + +import com.iluwatar.doublechecked.locking.App; + +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 deleted file mode 100644 index ca3d82871..000000000 --- a/double-checked-locking/src/test/java/com/iluwatar/doublecheckedlocking/AppTest.java +++ /dev/null @@ -1,14 +0,0 @@ -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/event-aggregator/src/main/java/com/iluwatar/eventaggregator/App.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java similarity index 92% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/App.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java index 1b13dfdaa..44c678f81 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/App.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/App.java @@ -1,35 +1,35 @@ -package com.iluwatar.eventaggregator; - -import java.util.ArrayList; -import java.util.List; - -/** - * - * The Event Aggregator pattern channels events from multiple objects - * into a single object to simplify registration for clients. - * - * In the example LordBaelish, LordVarys and Scout deliver events to - * KingsHand. KingsHand, the event aggregator, then delivers the events - * to KingJoffrey. - * - */ -public class App { - - public static void main(String[] args) { - - KingJoffrey kingJoffrey = new KingJoffrey(); - KingsHand kingsHand = new KingsHand(kingJoffrey); - - List emitters = new ArrayList<>(); - emitters.add(kingsHand); - emitters.add(new LordBaelish(kingsHand)); - emitters.add(new LordVarys(kingsHand)); - emitters.add(new Scout(kingsHand)); - - for (Weekday day: Weekday.values()) { - for (EventEmitter emitter: emitters) { - emitter.timePasses(day); - } - } - } -} +package com.iluwatar.event.aggregator; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * The Event Aggregator pattern channels events from multiple objects + * into a single object to simplify registration for clients. + * + * In the example LordBaelish, LordVarys and Scout deliver events to + * KingsHand. KingsHand, the event aggregator, then delivers the events + * to KingJoffrey. + * + */ +public class App { + + public static void main(String[] args) { + + KingJoffrey kingJoffrey = new KingJoffrey(); + KingsHand kingsHand = new KingsHand(kingJoffrey); + + List emitters = new ArrayList<>(); + emitters.add(kingsHand); + emitters.add(new LordBaelish(kingsHand)); + emitters.add(new LordVarys(kingsHand)); + emitters.add(new Scout(kingsHand)); + + for (Weekday day: Weekday.values()) { + for (EventEmitter emitter: emitters) { + emitter.timePasses(day); + } + } + } +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Event.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java similarity index 85% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/Event.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java index fbceeb01d..79d496b80 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Event.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Event.java @@ -1,21 +1,21 @@ -package com.iluwatar.eventaggregator; - -/** - * - * Event enumeration. - * - */ -public enum Event { - - STARK_SIGHTED("Stark sighted"), WARSHIPS_APPROACHING("Warships approaching"), TRAITOR_DETECTED("Traitor detected"); - - private String description; - - Event(String description) { - this.description = description; - } - - public String toString() { - return description; - } -} +package com.iluwatar.event.aggregator; + +/** + * + * Event enumeration. + * + */ +public enum Event { + + STARK_SIGHTED("Stark sighted"), WARSHIPS_APPROACHING("Warships approaching"), TRAITOR_DETECTED("Traitor detected"); + + private String description; + + Event(String description) { + this.description = description; + } + + public String toString() { + return description; + } +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventEmitter.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java similarity index 89% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventEmitter.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java index 88c23178f..1832afeaa 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventEmitter.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java @@ -1,35 +1,35 @@ -package com.iluwatar.eventaggregator; - -import java.util.LinkedList; -import java.util.List; - -/** - * - * EventEmitter is the base class for event producers that can be observed. - * - */ -public abstract class EventEmitter { - - private List observers; - - public EventEmitter() { - observers = new LinkedList<>(); - } - - public EventEmitter(EventObserver obs) { - this(); - registerObserver(obs); - } - - public void registerObserver(EventObserver obs) { - observers.add(obs); - } - - protected void notifyObservers(Event e) { - for (EventObserver obs: observers) { - obs.onEvent(e); - } - } - - public abstract void timePasses(Weekday day); -} +package com.iluwatar.event.aggregator; + +import java.util.LinkedList; +import java.util.List; + +/** + * + * EventEmitter is the base class for event producers that can be observed. + * + */ +public abstract class EventEmitter { + + private List observers; + + public EventEmitter() { + observers = new LinkedList<>(); + } + + public EventEmitter(EventObserver obs) { + this(); + registerObserver(obs); + } + + public void registerObserver(EventObserver obs) { + observers.add(obs); + } + + protected void notifyObservers(Event e) { + for (EventObserver obs: observers) { + obs.onEvent(e); + } + } + + public abstract void timePasses(Weekday day); +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventObserver.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventObserver.java similarity index 71% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventObserver.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventObserver.java index c3dc54a47..a9785627f 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/EventObserver.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventObserver.java @@ -1,12 +1,12 @@ -package com.iluwatar.eventaggregator; - -/** - * - * Observers of events implement this interface. - * - */ -public interface EventObserver { - - void onEvent(Event e); - -} +package com.iluwatar.event.aggregator; + +/** + * + * Observers of events implement this interface. + * + */ +public interface EventObserver { + + void onEvent(Event e); + +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingJoffrey.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.java similarity index 82% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingJoffrey.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.java index 642dfc787..c94d821be 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingJoffrey.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingJoffrey.java @@ -1,14 +1,14 @@ -package com.iluwatar.eventaggregator; - -/** - * - * KingJoffrey observes events from KingsHand. - * - */ -public class KingJoffrey implements EventObserver { - - @Override - public void onEvent(Event e) { - System.out.println("Received event from the King's Hand: " + e.toString()); - } -} +package com.iluwatar.event.aggregator; + +/** + * + * KingJoffrey observes events from KingsHand. + * + */ +public class KingJoffrey implements EventObserver { + + @Override + public void onEvent(Event e) { + System.out.println("Received event from the King's Hand: " + e.toString()); + } +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingsHand.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java similarity index 85% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingsHand.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java index 2b8e1e769..a3e01334b 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/KingsHand.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/KingsHand.java @@ -1,28 +1,28 @@ -package com.iluwatar.eventaggregator; - -/** - * - * KingsHand observes events from multiple sources and delivers them - * to listeners. - * - */ -public class KingsHand extends EventEmitter implements EventObserver { - - public KingsHand() { - super(); - } - - public KingsHand(EventObserver obs) { - super(obs); - } - - @Override - public void onEvent(Event e) { - notifyObservers(e); - } - - @Override - public void timePasses(Weekday day) { - // NOP - } -} +package com.iluwatar.event.aggregator; + +/** + * + * KingsHand observes events from multiple sources and delivers them + * to listeners. + * + */ +public class KingsHand extends EventEmitter implements EventObserver { + + public KingsHand() { + super(); + } + + public KingsHand(EventObserver obs) { + super(obs); + } + + @Override + public void onEvent(Event e) { + notifyObservers(e); + } + + @Override + public void timePasses(Weekday day) { + // NOP + } +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordBaelish.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java similarity index 84% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordBaelish.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java index e3f0223a1..b13ec88fc 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordBaelish.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordBaelish.java @@ -1,24 +1,24 @@ -package com.iluwatar.eventaggregator; - -/** - * - * LordBaelish produces events. - * - */ -public class LordBaelish extends EventEmitter { - - public LordBaelish() { - super(); - } - - public LordBaelish(EventObserver obs) { - super(obs); - } - - @Override - public void timePasses(Weekday day) { - if (day.equals(Weekday.FRIDAY)) { - notifyObservers(Event.STARK_SIGHTED); - } - } -} +package com.iluwatar.event.aggregator; + +/** + * + * LordBaelish produces events. + * + */ +public class LordBaelish extends EventEmitter { + + public LordBaelish() { + super(); + } + + public LordBaelish(EventObserver obs) { + super(obs); + } + + @Override + public void timePasses(Weekday day) { + if (day.equals(Weekday.FRIDAY)) { + notifyObservers(Event.STARK_SIGHTED); + } + } +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordVarys.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java similarity index 84% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordVarys.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java index 0afaaf150..d1fec048a 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/LordVarys.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/LordVarys.java @@ -1,24 +1,24 @@ -package com.iluwatar.eventaggregator; - -/** - * - * LordVarys produces events. - * - */ -public class LordVarys extends EventEmitter { - - public LordVarys() { - super(); - } - - public LordVarys(EventObserver obs) { - super(obs); - } - - @Override - public void timePasses(Weekday day) { - if (day.equals(Weekday.SATURDAY)) { - notifyObservers(Event.TRAITOR_DETECTED); - } - } -} +package com.iluwatar.event.aggregator; + +/** + * + * LordVarys produces events. + * + */ +public class LordVarys extends EventEmitter { + + public LordVarys() { + super(); + } + + public LordVarys(EventObserver obs) { + super(obs); + } + + @Override + public void timePasses(Weekday day) { + if (day.equals(Weekday.SATURDAY)) { + notifyObservers(Event.TRAITOR_DETECTED); + } + } +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Scout.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java similarity index 83% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/Scout.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java index 6376182b7..8ff4e04ab 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Scout.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Scout.java @@ -1,24 +1,24 @@ -package com.iluwatar.eventaggregator; - -/** - * - * Scout produces events. - * - */ -public class Scout extends EventEmitter { - - public Scout() { - super(); - } - - public Scout(EventObserver obs) { - super(obs); - } - - @Override - public void timePasses(Weekday day) { - if (day.equals(Weekday.TUESDAY)) { - notifyObservers(Event.WARSHIPS_APPROACHING); - } - } -} +package com.iluwatar.event.aggregator; + +/** + * + * Scout produces events. + * + */ +public class Scout extends EventEmitter { + + public Scout() { + super(); + } + + public Scout(EventObserver obs) { + super(obs); + } + + @Override + public void timePasses(Weekday day) { + if (day.equals(Weekday.TUESDAY)) { + notifyObservers(Event.WARSHIPS_APPROACHING); + } + } +} diff --git a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Weekday.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.java similarity index 85% rename from event-aggregator/src/main/java/com/iluwatar/eventaggregator/Weekday.java rename to event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.java index b62cbb106..651a4e71c 100644 --- a/event-aggregator/src/main/java/com/iluwatar/eventaggregator/Weekday.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/Weekday.java @@ -1,16 +1,16 @@ -package com.iluwatar.eventaggregator; - -public enum Weekday { - - MONDAY("Monday"), TUESDAY("Tuesday"), WEDNESDAY("Wednesday"), THURSDAY("Thursday"), FRIDAY("Friday"), SATURDAY("Saturday"), SUNDAY("Sunday"); - - private String description; - - Weekday(String description) { - this.description = description; - } - - public String toString() { - return description; - } -} +package com.iluwatar.event.aggregator; + +public enum Weekday { + + MONDAY("Monday"), TUESDAY("Tuesday"), WEDNESDAY("Wednesday"), THURSDAY("Thursday"), FRIDAY("Friday"), SATURDAY("Saturday"), SUNDAY("Sunday"); + + private String description; + + Weekday(String description) { + this.description = description; + } + + public String toString() { + return description; + } +} diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java new file mode 100644 index 000000000..1d2562e2c --- /dev/null +++ b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/AppTest.java @@ -0,0 +1,13 @@ +package com.iluwatar.event.aggregator; +import org.junit.Test; + +import com.iluwatar.event.aggregator.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 deleted file mode 100644 index 42710f378..000000000 --- a/event-aggregator/src/test/java/com/iluwatar/eventaggregator/AppTest.java +++ /dev/null @@ -1,13 +0,0 @@ -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/executearound/App.java b/execute-around/src/main/java/com/iluwatar/execute/around/App.java similarity index 95% rename from execute-around/src/main/java/com/iluwatar/executearound/App.java rename to execute-around/src/main/java/com/iluwatar/execute/around/App.java index 783693fac..8603a12bc 100644 --- a/execute-around/src/main/java/com/iluwatar/executearound/App.java +++ b/execute-around/src/main/java/com/iluwatar/execute/around/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.executearound; +package com.iluwatar.execute.around; import java.io.FileWriter; import java.io.IOException; diff --git a/execute-around/src/main/java/com/iluwatar/executearound/FileWriterAction.java b/execute-around/src/main/java/com/iluwatar/execute/around/FileWriterAction.java similarity index 86% rename from execute-around/src/main/java/com/iluwatar/executearound/FileWriterAction.java rename to execute-around/src/main/java/com/iluwatar/execute/around/FileWriterAction.java index 12eea7f66..904600ec6 100644 --- a/execute-around/src/main/java/com/iluwatar/executearound/FileWriterAction.java +++ b/execute-around/src/main/java/com/iluwatar/execute/around/FileWriterAction.java @@ -1,4 +1,4 @@ -package com.iluwatar.executearound; +package com.iluwatar.execute.around; import java.io.FileWriter; import java.io.IOException; diff --git a/execute-around/src/main/java/com/iluwatar/executearound/SimpleFileWriter.java b/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java similarity index 93% rename from execute-around/src/main/java/com/iluwatar/executearound/SimpleFileWriter.java rename to execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java index ee7f23360..2de1e5d67 100644 --- a/execute-around/src/main/java/com/iluwatar/executearound/SimpleFileWriter.java +++ b/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java @@ -1,4 +1,4 @@ -package com.iluwatar.executearound; +package com.iluwatar.execute.around; import java.io.FileWriter; import java.io.IOException; diff --git a/execute-around/src/test/java/com/iluwatar/executearound/AppTest.java b/execute-around/src/test/java/com/iluwatar/execute/around/AppTest.java similarity index 83% rename from execute-around/src/test/java/com/iluwatar/executearound/AppTest.java rename to execute-around/src/test/java/com/iluwatar/execute/around/AppTest.java index 263595cd8..1e8a45947 100644 --- a/execute-around/src/test/java/com/iluwatar/executearound/AppTest.java +++ b/execute-around/src/test/java/com/iluwatar/execute/around/AppTest.java @@ -1,4 +1,4 @@ -package com.iluwatar.executearound; +package com.iluwatar.execute.around; import java.io.File; import java.io.IOException; @@ -7,7 +7,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.iluwatar.executearound.App; +import com.iluwatar.execute.around.App; /** * diff --git a/factory-method/etc/factory-method.ucls b/factory-method/etc/factory-method.ucls index 6f270fd18..562437995 100644 --- a/factory-method/etc/factory-method.ucls +++ b/factory-method/etc/factory-method.ucls @@ -1,8 +1,8 @@ - - + @@ -20,8 +21,9 @@ - + @@ -29,8 +31,8 @@ - + @@ -38,8 +40,8 @@ - + @@ -47,8 +49,8 @@ - + @@ -56,8 +58,8 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/App.java b/factory-method/src/main/java/com/iluwatar/factory/method/App.java similarity index 92% rename from factory-method/src/main/java/com/iluwatar/factorymethod/App.java rename to factory-method/src/main/java/com/iluwatar/factory/method/App.java index 90d14dfb0..41b234791 100644 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/App.java +++ b/factory-method/src/main/java/com/iluwatar/factory/method/App.java @@ -1,28 +1,28 @@ -package com.iluwatar.factorymethod; - -/** - * - * In Factory Method we have an interface (Blacksmith) with a method for - * creating objects (manufactureWeapon). The concrete subclasses (OrcBlacksmith, - * ElfBlacksmith) then override the method to produce objects of their liking. - * - */ -public class App { - - public static void main(String[] args) { - Blacksmith blacksmith; - Weapon weapon; - - blacksmith = new OrcBlacksmith(); - weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR); - System.out.println(weapon); - weapon = blacksmith.manufactureWeapon(WeaponType.AXE); - System.out.println(weapon); - - blacksmith = new ElfBlacksmith(); - weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD); - System.out.println(weapon); - weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR); - System.out.println(weapon); - } -} +package com.iluwatar.factory.method; + +/** + * + * In Factory Method we have an interface (Blacksmith) with a method for + * creating objects (manufactureWeapon). The concrete subclasses (OrcBlacksmith, + * ElfBlacksmith) then override the method to produce objects of their liking. + * + */ +public class App { + + public static void main(String[] args) { + Blacksmith blacksmith; + Weapon weapon; + + blacksmith = new OrcBlacksmith(); + weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR); + System.out.println(weapon); + weapon = blacksmith.manufactureWeapon(WeaponType.AXE); + System.out.println(weapon); + + blacksmith = new ElfBlacksmith(); + weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD); + System.out.println(weapon); + weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR); + System.out.println(weapon); + } +} diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/Blacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java similarity index 76% rename from factory-method/src/main/java/com/iluwatar/factorymethod/Blacksmith.java rename to factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java index b18a5c6df..516c993a9 100644 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/Blacksmith.java +++ b/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java @@ -1,12 +1,12 @@ -package com.iluwatar.factorymethod; - -/** - * - * The interface containing method for producing objects. - * - */ -public interface Blacksmith { - - Weapon manufactureWeapon(WeaponType weaponType); - -} +package com.iluwatar.factory.method; + +/** + * + * The interface containing method for producing objects. + * + */ +public interface Blacksmith { + + Weapon manufactureWeapon(WeaponType weaponType); + +} diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/ElfBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/factorymethod/ElfBlacksmith.java rename to factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java index 21c6aacdf..9a5e62890 100644 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/ElfBlacksmith.java +++ b/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java @@ -1,14 +1,14 @@ -package com.iluwatar.factorymethod; - -/** - * - * Concrete subclass for creating new objects. - * - */ -public class ElfBlacksmith implements Blacksmith { - - public Weapon manufactureWeapon(WeaponType weaponType) { - return new ElfWeapon(weaponType); - } - -} +package com.iluwatar.factory.method; + +/** + * + * Concrete subclass for creating new objects. + * + */ +public class ElfBlacksmith implements Blacksmith { + + public Weapon manufactureWeapon(WeaponType weaponType) { + return new ElfWeapon(weaponType); + } + +} diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/ElfWeapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/factorymethod/ElfWeapon.java rename to factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java index 7e90f3b38..a425d3ce7 100644 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/ElfWeapon.java +++ b/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java @@ -1,16 +1,16 @@ -package com.iluwatar.factorymethod; - -public class ElfWeapon implements Weapon { - - private WeaponType weaponType; - - public ElfWeapon(WeaponType weaponType) { - this.weaponType = weaponType; - } - - @Override - public String toString() { - return "Elven " + weaponType; - } - -} +package com.iluwatar.factory.method; + +public class ElfWeapon implements Weapon { + + private WeaponType weaponType; + + public ElfWeapon(WeaponType weaponType) { + this.weaponType = weaponType; + } + + @Override + public String toString() { + return "Elven " + weaponType; + } + +} diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/OrcBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/factorymethod/OrcBlacksmith.java rename to factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java index 297dd6b98..382507ec9 100644 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/OrcBlacksmith.java +++ b/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java @@ -1,14 +1,14 @@ -package com.iluwatar.factorymethod; - -/** - * - * Concrete subclass for creating new objects. - * - */ -public class OrcBlacksmith implements Blacksmith { - - public Weapon manufactureWeapon(WeaponType weaponType) { - return new OrcWeapon(weaponType); - } - -} +package com.iluwatar.factory.method; + +/** + * + * Concrete subclass for creating new objects. + * + */ +public class OrcBlacksmith implements Blacksmith { + + public Weapon manufactureWeapon(WeaponType weaponType) { + return new OrcWeapon(weaponType); + } + +} diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/OrcWeapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java similarity index 81% rename from factory-method/src/main/java/com/iluwatar/factorymethod/OrcWeapon.java rename to factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java index 2d7b19adb..ab9b83991 100644 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/OrcWeapon.java +++ b/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java @@ -1,16 +1,16 @@ -package com.iluwatar.factorymethod; - -public class OrcWeapon implements Weapon { - - private WeaponType weaponType; - - public OrcWeapon(WeaponType weaponType) { - this.weaponType = weaponType; - } - - @Override - public String toString() { - return "Orcish " + weaponType; - } - -} +package com.iluwatar.factory.method; + +public class OrcWeapon implements Weapon { + + private WeaponType weaponType; + + public OrcWeapon(WeaponType weaponType) { + this.weaponType = weaponType; + } + + @Override + public String toString() { + return "Orcish " + weaponType; + } + +} diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java new file mode 100644 index 000000000..80e7c911f --- /dev/null +++ b/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java @@ -0,0 +1,5 @@ +package com.iluwatar.factory.method; + +public interface Weapon { + +} diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/WeaponType.java b/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java similarity index 82% rename from factory-method/src/main/java/com/iluwatar/factorymethod/WeaponType.java rename to factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java index 45e1f82de..9ef82fff6 100644 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/WeaponType.java +++ b/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java @@ -1,17 +1,17 @@ -package com.iluwatar.factorymethod; - -public enum WeaponType { - - SHORT_SWORD("short sword"), SPEAR("spear"), AXE("axe"), UNDEFINED(""); - - private String title; - - WeaponType(String title) { - this.title = title; - } - - @Override - public String toString() { - return title; - } -} +package com.iluwatar.factory.method; + +public enum WeaponType { + + SHORT_SWORD("short sword"), SPEAR("spear"), AXE("axe"), UNDEFINED(""); + + private String title; + + WeaponType(String title) { + this.title = title; + } + + @Override + public String toString() { + return title; + } +} diff --git a/factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java b/factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java deleted file mode 100644 index 3a9346d03..000000000 --- a/factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.iluwatar.factorymethod; - -public interface Weapon { - -} diff --git a/intercepting-filter/src/test/java/com/iluwatar/interceptingfilter/AppTest.java b/factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java similarity index 61% rename from intercepting-filter/src/test/java/com/iluwatar/interceptingfilter/AppTest.java rename to factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java index eef4bf4e7..9fa0cc5eb 100644 --- a/intercepting-filter/src/test/java/com/iluwatar/interceptingfilter/AppTest.java +++ b/factory-method/src/test/java/com/iluwatar/factory/method/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.factory.method; import org.junit.Test; +import com.iluwatar.factory.method.App; + public class AppTest { @Test diff --git a/front-controller/etc/front-controller.ucls b/front-controller/etc/front-controller.ucls index bf12d4a82..11cdf66ec 100644 --- a/front-controller/etc/front-controller.ucls +++ b/front-controller/etc/front-controller.ucls @@ -1,8 +1,9 @@ - + @@ -10,8 +11,9 @@ - + @@ -19,8 +21,9 @@ - + @@ -28,8 +31,9 @@ - + @@ -37,8 +41,9 @@ - + @@ -46,8 +51,9 @@ - + @@ -55,8 +61,9 @@ - + @@ -64,8 +71,8 @@ - + @@ -73,8 +80,9 @@ - + @@ -83,48 +91,48 @@ - - + + - - + + - + + + + + - + - - - + + + - - - - - - - - - + + + + + - - + + diff --git a/front-controller/src/main/java/com/iluwatar/App.java b/front-controller/src/main/java/com/iluwatar/front/controller/App.java similarity index 96% rename from front-controller/src/main/java/com/iluwatar/App.java rename to front-controller/src/main/java/com/iluwatar/front/controller/App.java index 9db0c4c7f..d17987823 100644 --- a/front-controller/src/main/java/com/iluwatar/App.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/ApplicationException.java b/front-controller/src/main/java/com/iluwatar/front/controller/ApplicationException.java similarity index 78% rename from front-controller/src/main/java/com/iluwatar/ApplicationException.java rename to front-controller/src/main/java/com/iluwatar/front/controller/ApplicationException.java index c30c63047..3a0191831 100644 --- a/front-controller/src/main/java/com/iluwatar/ApplicationException.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/ApplicationException.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; public class ApplicationException extends RuntimeException { diff --git a/front-controller/src/main/java/com/iluwatar/ArcherCommand.java b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.java similarity index 80% rename from front-controller/src/main/java/com/iluwatar/ArcherCommand.java rename to front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.java index 0b85247c5..117aa0c8c 100644 --- a/front-controller/src/main/java/com/iluwatar/ArcherCommand.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/ArcherView.java b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.java similarity index 80% rename from front-controller/src/main/java/com/iluwatar/ArcherView.java rename to front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.java index a670dd10d..d8cae33c1 100644 --- a/front-controller/src/main/java/com/iluwatar/ArcherView.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/CatapultCommand.java b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.java similarity index 80% rename from front-controller/src/main/java/com/iluwatar/CatapultCommand.java rename to front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.java index db0a38b40..fae5d1753 100644 --- a/front-controller/src/main/java/com/iluwatar/CatapultCommand.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/CatapultView.java b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.java similarity index 81% rename from front-controller/src/main/java/com/iluwatar/CatapultView.java rename to front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.java index 6459b3b48..9ad94d522 100644 --- a/front-controller/src/main/java/com/iluwatar/CatapultView.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/Command.java b/front-controller/src/main/java/com/iluwatar/front/controller/Command.java similarity index 76% rename from front-controller/src/main/java/com/iluwatar/Command.java rename to front-controller/src/main/java/com/iluwatar/front/controller/Command.java index 657ef58d5..95bd00129 100644 --- a/front-controller/src/main/java/com/iluwatar/Command.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/Command.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/ErrorView.java b/front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.java similarity index 79% rename from front-controller/src/main/java/com/iluwatar/ErrorView.java rename to front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.java index 1a91a0d52..04c31dd34 100644 --- a/front-controller/src/main/java/com/iluwatar/ErrorView.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/FrontController.java b/front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java similarity index 94% rename from front-controller/src/main/java/com/iluwatar/FrontController.java rename to front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java index 09e90f7ed..5a6dc2a78 100644 --- a/front-controller/src/main/java/com/iluwatar/FrontController.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/UnknownCommand.java b/front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.java similarity index 83% rename from front-controller/src/main/java/com/iluwatar/UnknownCommand.java rename to front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.java index b3186a514..f8f93e7e0 100644 --- a/front-controller/src/main/java/com/iluwatar/UnknownCommand.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/main/java/com/iluwatar/View.java b/front-controller/src/main/java/com/iluwatar/front/controller/View.java similarity index 74% rename from front-controller/src/main/java/com/iluwatar/View.java rename to front-controller/src/main/java/com/iluwatar/front/controller/View.java index 6061ed0e5..29c5f0fcb 100644 --- a/front-controller/src/main/java/com/iluwatar/View.java +++ b/front-controller/src/main/java/com/iluwatar/front/controller/View.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.front.controller; /** * diff --git a/front-controller/src/test/java/com/iluwatar/AppTest.java b/front-controller/src/test/java/com/iluwatar/front/controller/AppTest.java similarity index 60% rename from front-controller/src/test/java/com/iluwatar/AppTest.java rename to front-controller/src/test/java/com/iluwatar/front/controller/AppTest.java index b81f7499d..2c05cf9c4 100644 --- a/front-controller/src/test/java/com/iluwatar/AppTest.java +++ b/front-controller/src/test/java/com/iluwatar/front/controller/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.front.controller; import org.junit.Test; +import com.iluwatar.front.controller.App; + public class AppTest { @Test diff --git a/intercepting-filter/etc/intercepting-filter.ucls b/intercepting-filter/etc/intercepting-filter.ucls index c778f536e..9cf8d3c00 100644 --- a/intercepting-filter/etc/intercepting-filter.ucls +++ b/intercepting-filter/etc/intercepting-filter.ucls @@ -1,8 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AbstractFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.java similarity index 94% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AbstractFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.java index 680738d6d..2c32772fa 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AbstractFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Base class for order processing filters. diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AddressFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.java similarity index 91% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AddressFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.java index 836cc3928..0bd66c047 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AddressFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Concrete implementation of filter diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/App.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/App.java similarity index 93% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/App.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/App.java index 51e363663..b597396f5 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/App.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Client.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java similarity index 98% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Client.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java index fde2b012d..6c94af5c5 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Client.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; import java.awt.BorderLayout; import java.awt.GridLayout; diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/ContactFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.java similarity index 94% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/ContactFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.java index 449d00be1..214376263 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/ContactFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Concrete implementation of filter diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/DepositFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.java similarity index 90% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/DepositFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.java index aa46c149c..129c07cd7 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/DepositFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Concrete implementation of filter diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Filter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.java similarity index 94% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Filter.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.java index dc7e3445a..0782fddab 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Filter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Filter interface Filters perform certain tasks prior or after execution of diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterChain.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java similarity index 92% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterChain.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java index 56446833d..e11a58ea0 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterChain.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java @@ -1,4 +1,4 @@ - package com.iluwatar.interceptingfilter; + package com.iluwatar.intercepting.filter; /** diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterManager.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.java similarity index 90% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterManager.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.java index f729ee734..65c822c8a 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterManager.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Filter Manager manages the filters and Filter Chain. diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/NameFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.java similarity index 91% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/NameFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.java index ff4c9fd8d..c9da2600a 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/NameFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Concrete implementation of filter This filter checks if the input in the Name diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Order.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java similarity index 96% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Order.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java index 96a30fd0a..60bf21f8e 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Order.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Order class carries the order data. diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/OrderFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java similarity index 90% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/OrderFilter.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java index b85fa3079..bc86289b4 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/OrderFilter.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; /** * Concrete implementation of filter This checks for the order field diff --git a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java similarity index 97% rename from intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java rename to intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java index 2e68c2380..6ca456512 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java @@ -1,4 +1,4 @@ -package com.iluwatar.interceptingfilter; +package com.iluwatar.intercepting.filter; import java.awt.BorderLayout; import java.awt.Dimension; diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java new file mode 100644 index 000000000..b12bc8db9 --- /dev/null +++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/AppTest.java @@ -0,0 +1,14 @@ +package com.iluwatar.intercepting.filter; + +import org.junit.Test; + +import com.iluwatar.intercepting.filter.App; + +public class AppTest { + + @Test + public void test() { + String[] args = {}; + App.main(args); + } +} diff --git a/lazy-loading/src/main/java/com/iluwatar/lazyloading/App.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/App.java similarity index 96% rename from lazy-loading/src/main/java/com/iluwatar/lazyloading/App.java rename to lazy-loading/src/main/java/com/iluwatar/lazy/loading/App.java index 608c39b5f..f12d4e20c 100644 --- a/lazy-loading/src/main/java/com/iluwatar/lazyloading/App.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.lazyloading; +package com.iluwatar.lazy.loading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/lazyloading/Heavy.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Heavy.java similarity index 89% rename from lazy-loading/src/main/java/com/iluwatar/lazyloading/Heavy.java rename to lazy-loading/src/main/java/com/iluwatar/lazy/loading/Heavy.java index d87d4b5f7..c2715434f 100644 --- a/lazy-loading/src/main/java/com/iluwatar/lazyloading/Heavy.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Heavy.java @@ -1,4 +1,4 @@ -package com.iluwatar.lazyloading; +package com.iluwatar.lazy.loading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderNaive.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderNaive.java similarity index 90% rename from lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderNaive.java rename to lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderNaive.java index 1abc6463a..1421d4b23 100644 --- a/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderNaive.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderNaive.java @@ -1,4 +1,4 @@ -package com.iluwatar.lazyloading; +package com.iluwatar.lazy.loading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderThreadSafe.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderThreadSafe.java similarity index 92% rename from lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderThreadSafe.java rename to lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderThreadSafe.java index eff35c14a..cc039d9f0 100644 --- a/lazy-loading/src/main/java/com/iluwatar/lazyloading/HolderThreadSafe.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/HolderThreadSafe.java @@ -1,4 +1,4 @@ -package com.iluwatar.lazyloading; +package com.iluwatar.lazy.loading; /** * diff --git a/lazy-loading/src/main/java/com/iluwatar/lazyloading/Java8Holder.java b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Java8Holder.java similarity index 95% rename from lazy-loading/src/main/java/com/iluwatar/lazyloading/Java8Holder.java rename to lazy-loading/src/main/java/com/iluwatar/lazy/loading/Java8Holder.java index 6be5e374e..6bd2382c1 100644 --- a/lazy-loading/src/main/java/com/iluwatar/lazyloading/Java8Holder.java +++ b/lazy-loading/src/main/java/com/iluwatar/lazy/loading/Java8Holder.java @@ -1,4 +1,4 @@ -package com.iluwatar.lazyloading; +package com.iluwatar.lazy.loading; import java.util.function.Supplier; diff --git a/repository/src/test/java/com/iluwatar/AppTest.java b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AppTest.java similarity index 62% rename from repository/src/test/java/com/iluwatar/AppTest.java rename to lazy-loading/src/test/java/com/iluwatar/lazy/loading/AppTest.java index 6db5ad214..96e88e75f 100644 --- a/repository/src/test/java/com/iluwatar/AppTest.java +++ b/lazy-loading/src/test/java/com/iluwatar/lazy/loading/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.lazy.loading; import org.junit.Test; +import com.iluwatar.lazy.loading.App; + public class AppTest { @Test diff --git a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/App.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/App.java similarity index 97% rename from model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/App.java rename to model-view-controller/src/main/java/com/iluwatar/model/view/controller/App.java index eb9fbdc8f..e3d61302e 100644 --- a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/App.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Fatigue.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java similarity index 85% rename from model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Fatigue.java rename to model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java index 7faa5f71b..d19df6a8c 100644 --- a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Fatigue.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantController.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantController.java similarity index 94% rename from model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantController.java rename to model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantController.java index ab5f6d127..acda727d9 100644 --- a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantController.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantController.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantModel.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java similarity index 95% rename from model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantModel.java rename to model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java index f623cd0a1..97c298768 100644 --- a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantModel.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantView.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantView.java similarity index 77% rename from model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantView.java rename to model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantView.java index df23119c6..1cf5e20a6 100644 --- a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/GiantView.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantView.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Health.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java similarity index 85% rename from model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Health.java rename to model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java index 263182c20..feaec81d7 100644 --- a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Health.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; /** * diff --git a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Nourishment.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java similarity index 86% rename from model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Nourishment.java rename to model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java index 799983e2a..7bab931b6 100644 --- a/model-view-controller/src/main/java/com/iluwatar/modelviewcontroller/Nourishment.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; /** * diff --git a/model-view-controller/src/test/java/com/iluwatar/modelviewcontroller/AppTest.java b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/AppTest.java similarity index 57% rename from model-view-controller/src/test/java/com/iluwatar/modelviewcontroller/AppTest.java rename to model-view-controller/src/test/java/com/iluwatar/model/view/controller/AppTest.java index f9c8eca8e..b6e2f1bff 100644 --- a/model-view-controller/src/test/java/com/iluwatar/modelviewcontroller/AppTest.java +++ b/model-view-controller/src/test/java/com/iluwatar/model/view/controller/AppTest.java @@ -1,8 +1,8 @@ -package com.iluwatar.modelviewcontroller; +package com.iluwatar.model.view.controller; import org.junit.Test; -import com.iluwatar.modelviewcontroller.App; +import com.iluwatar.model.view.controller.App; public class AppTest { diff --git a/model-view-presenter/etc/model-view-presenter.ucls b/model-view-presenter/etc/model-view-presenter.ucls index aa8dd13ae..70e905d3f 100644 --- a/model-view-presenter/etc/model-view-presenter.ucls +++ b/model-view-presenter/etc/model-view-presenter.ucls @@ -1,8 +1,9 @@ - - - + file="/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java" + binary="false" corner="BOTTOM_RIGHT"> @@ -32,9 +33,9 @@ - - - - - - - - + - - + + + + + + - - - - - - - - - - - - - - - - - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileLoader.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.java similarity index 97% rename from model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileLoader.java rename to model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.java index a0b0abdc9..aef5bade9 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileLoader.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewpresenter; +package com.iluwatar.model.view.presenter; import java.io.BufferedReader; import java.io.File; diff --git a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorJFrame.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java similarity index 98% rename from model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorJFrame.java rename to model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java index 025d17dab..be3c253ed 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorJFrame.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewpresenter; +package com.iluwatar.model.view.presenter; import java.awt.Color; import java.awt.event.ActionEvent; diff --git a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorPresenter.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java similarity index 97% rename from model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorPresenter.java rename to model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java index 80aac42ff..a7842e932 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorPresenter.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewpresenter; +package com.iluwatar.model.view.presenter; /** * Every instance of this class represents the Presenter component in the diff --git a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorStub.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.java similarity index 97% rename from model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorStub.java rename to model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.java index 8b7ff7dd6..7aa88e922 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorStub.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewpresenter; +package com.iluwatar.model.view.presenter; /** * Every instance of this class represents the Stub component in the diff --git a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorView.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.java similarity index 96% rename from model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorView.java rename to model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.java index 424a0eed3..e4a7efaee 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorView.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewpresenter; +package com.iluwatar.model.view.presenter; /** * This interface represents the View component in the Model-View-Presenter diff --git a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/MainApp.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/MainApp.java similarity index 95% rename from model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/MainApp.java rename to model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/MainApp.java index 96e2fdab2..73da4f733 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/MainApp.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/MainApp.java @@ -1,4 +1,4 @@ -package com.iluwatar.modelviewpresenter; +package com.iluwatar.model.view.presenter; /** * diff --git a/model-view-presenter/src/test/java/com/iluwatar/modelviewpresenter/FileSelectorPresenterTest.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java similarity index 91% rename from model-view-presenter/src/test/java/com/iluwatar/modelviewpresenter/FileSelectorPresenterTest.java rename to model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java index 9895b99d5..119448e9c 100644 --- a/model-view-presenter/src/test/java/com/iluwatar/modelviewpresenter/FileSelectorPresenterTest.java +++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java @@ -1,13 +1,13 @@ -package com.iluwatar.modelviewpresenter; +package com.iluwatar.model.view.presenter; 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; +import com.iluwatar.model.view.presenter.FileLoader; +import com.iluwatar.model.view.presenter.FileSelectorPresenter; +import com.iluwatar.model.view.presenter.FileSelectorStub; /** * This test case is responsible for testing our application by taking advantage diff --git a/object-pool/src/main/java/com/iluwatar/objectpool/App.java b/object-pool/src/main/java/com/iluwatar/object/pool/App.java similarity index 96% rename from object-pool/src/main/java/com/iluwatar/objectpool/App.java rename to object-pool/src/main/java/com/iluwatar/object/pool/App.java index 2c6c855e5..d47bc51be 100644 --- a/object-pool/src/main/java/com/iluwatar/objectpool/App.java +++ b/object-pool/src/main/java/com/iluwatar/object/pool/App.java @@ -1,45 +1,45 @@ -package com.iluwatar.objectpool; - -/** - * - * When it is necessary to work with a large number of objects that are particularly expensive to instantiate - * and each object is only needed for a short period of time, the performance of an entire application may be - * adversely affected. An object pool design pattern may be deemed desirable in cases such as these. - * - * The object pool design pattern creates a set of objects that may be reused. When a new object is needed, it - * is requested from the pool. If a previously prepared object is available it is returned immediately, avoiding - * the instantiation cost. If no objects are present in the pool, a new item is created and returned. When the - * object has been used and is no longer needed, it is returned to the pool, allowing it to be used again in the - * future without repeating the computationally expensive instantiation process. It is important to note that - * once an object has been used and returned, existing references will become invalid. - * - * In this example we have created OliphauntPool inheriting from generic ObjectPool. Oliphaunts can be checked - * out from the pool and later returned to it. The pool tracks created instances and their status (available, - * inUse). - * - */ -public class App { - - public static void main( String[] args ) { - OliphauntPool pool = new OliphauntPool(); - System.out.println(pool); - Oliphaunt oliphaunt1 = pool.checkOut(); - System.out.println("Checked out " + oliphaunt1); - System.out.println(pool); - Oliphaunt oliphaunt2 = pool.checkOut(); - System.out.println("Checked out " + oliphaunt2); - Oliphaunt oliphaunt3 = pool.checkOut(); - System.out.println("Checked out " + oliphaunt3); - System.out.println(pool); - System.out.println("Checking in " + oliphaunt1); - pool.checkIn(oliphaunt1); - System.out.println("Checking in " + oliphaunt2); - pool.checkIn(oliphaunt2); - System.out.println(pool); - Oliphaunt oliphaunt4 = pool.checkOut(); - System.out.println("Checked out " + oliphaunt4); - Oliphaunt oliphaunt5 = pool.checkOut(); - System.out.println("Checked out " + oliphaunt5); - System.out.println(pool); - } -} +package com.iluwatar.object.pool; + +/** + * + * When it is necessary to work with a large number of objects that are particularly expensive to instantiate + * and each object is only needed for a short period of time, the performance of an entire application may be + * adversely affected. An object pool design pattern may be deemed desirable in cases such as these. + * + * The object pool design pattern creates a set of objects that may be reused. When a new object is needed, it + * is requested from the pool. If a previously prepared object is available it is returned immediately, avoiding + * the instantiation cost. If no objects are present in the pool, a new item is created and returned. When the + * object has been used and is no longer needed, it is returned to the pool, allowing it to be used again in the + * future without repeating the computationally expensive instantiation process. It is important to note that + * once an object has been used and returned, existing references will become invalid. + * + * In this example we have created OliphauntPool inheriting from generic ObjectPool. Oliphaunts can be checked + * out from the pool and later returned to it. The pool tracks created instances and their status (available, + * inUse). + * + */ +public class App { + + public static void main( String[] args ) { + OliphauntPool pool = new OliphauntPool(); + System.out.println(pool); + Oliphaunt oliphaunt1 = pool.checkOut(); + System.out.println("Checked out " + oliphaunt1); + System.out.println(pool); + Oliphaunt oliphaunt2 = pool.checkOut(); + System.out.println("Checked out " + oliphaunt2); + Oliphaunt oliphaunt3 = pool.checkOut(); + System.out.println("Checked out " + oliphaunt3); + System.out.println(pool); + System.out.println("Checking in " + oliphaunt1); + pool.checkIn(oliphaunt1); + System.out.println("Checking in " + oliphaunt2); + pool.checkIn(oliphaunt2); + System.out.println(pool); + Oliphaunt oliphaunt4 = pool.checkOut(); + System.out.println("Checked out " + oliphaunt4); + Oliphaunt oliphaunt5 = pool.checkOut(); + System.out.println("Checked out " + oliphaunt5); + System.out.println(pool); + } +} diff --git a/object-pool/src/main/java/com/iluwatar/objectpool/ObjectPool.java b/object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.java similarity index 90% rename from object-pool/src/main/java/com/iluwatar/objectpool/ObjectPool.java rename to object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.java index 343f29aef..8b582630b 100644 --- a/object-pool/src/main/java/com/iluwatar/objectpool/ObjectPool.java +++ b/object-pool/src/main/java/com/iluwatar/object/pool/ObjectPool.java @@ -1,37 +1,37 @@ -package com.iluwatar.objectpool; - -import java.util.HashSet; - -/** - * - * Generic object pool - * - * @param - */ -public abstract class ObjectPool { - - private HashSet available = new HashSet<>(); - private HashSet inUse = new HashSet<>(); - - protected abstract T create(); - - public synchronized T checkOut() { - if (available.size() <= 0) { - available.add(create()); - } - T instance = available.iterator().next(); - available.remove(instance); - inUse.add(instance); - return instance; - } - - public synchronized void checkIn(T instance) { - inUse.remove(instance); - available.add(instance); - } - - @Override - public String toString() { - return String.format("Pool available=%d inUse=%d", available.size(), inUse.size()); - } -} +package com.iluwatar.object.pool; + +import java.util.HashSet; + +/** + * + * Generic object pool + * + * @param + */ +public abstract class ObjectPool { + + private HashSet available = new HashSet<>(); + private HashSet inUse = new HashSet<>(); + + protected abstract T create(); + + public synchronized T checkOut() { + if (available.size() <= 0) { + available.add(create()); + } + T instance = available.iterator().next(); + available.remove(instance); + inUse.add(instance); + return instance; + } + + public synchronized void checkIn(T instance) { + inUse.remove(instance); + available.add(instance); + } + + @Override + public String toString() { + return String.format("Pool available=%d inUse=%d", available.size(), inUse.size()); + } +} diff --git a/object-pool/src/main/java/com/iluwatar/objectpool/Oliphaunt.java b/object-pool/src/main/java/com/iluwatar/object/pool/Oliphaunt.java similarity index 86% rename from object-pool/src/main/java/com/iluwatar/objectpool/Oliphaunt.java rename to object-pool/src/main/java/com/iluwatar/object/pool/Oliphaunt.java index 29d02d2e8..4b32e0ba1 100644 --- a/object-pool/src/main/java/com/iluwatar/objectpool/Oliphaunt.java +++ b/object-pool/src/main/java/com/iluwatar/object/pool/Oliphaunt.java @@ -1,31 +1,31 @@ -package com.iluwatar.objectpool; - -/** - * - * Oliphaunts are expensive to create - * - */ -public class Oliphaunt { - - private static int counter = 1; - - private final int id; - - public Oliphaunt() { - id = counter++; - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - - public int getId() { - return id; - } - - @Override - public String toString() { - return String.format("Oliphaunt id=%d", id); - } -} +package com.iluwatar.object.pool; + +/** + * + * Oliphaunts are expensive to create + * + */ +public class Oliphaunt { + + private static int counter = 1; + + private final int id; + + public Oliphaunt() { + id = counter++; + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + public int getId() { + return id; + } + + @Override + public String toString() { + return String.format("Oliphaunt id=%d", id); + } +} diff --git a/object-pool/src/main/java/com/iluwatar/objectpool/OliphauntPool.java b/object-pool/src/main/java/com/iluwatar/object/pool/OliphauntPool.java similarity index 78% rename from object-pool/src/main/java/com/iluwatar/objectpool/OliphauntPool.java rename to object-pool/src/main/java/com/iluwatar/object/pool/OliphauntPool.java index 25f591f00..a0cfc0d54 100644 --- a/object-pool/src/main/java/com/iluwatar/objectpool/OliphauntPool.java +++ b/object-pool/src/main/java/com/iluwatar/object/pool/OliphauntPool.java @@ -1,14 +1,14 @@ -package com.iluwatar.objectpool; - -/** - * - * Oliphaunt object pool - * - */ -public class OliphauntPool extends ObjectPool { - - @Override - protected Oliphaunt create() { - return new Oliphaunt(); - } -} +package com.iluwatar.object.pool; + +/** + * + * Oliphaunt object pool + * + */ +public class OliphauntPool extends ObjectPool { + + @Override + protected Oliphaunt create() { + return new Oliphaunt(); + } +} diff --git a/business-delegate/src/test/java/com/iluwatar/AppTest.java b/object-pool/src/test/java/com/iluwatar/object/pool/AppTest.java similarity index 63% rename from business-delegate/src/test/java/com/iluwatar/AppTest.java rename to object-pool/src/test/java/com/iluwatar/object/pool/AppTest.java index b81f7499d..c856141db 100644 --- a/business-delegate/src/test/java/com/iluwatar/AppTest.java +++ b/object-pool/src/test/java/com/iluwatar/object/pool/AppTest.java @@ -1,7 +1,9 @@ -package com.iluwatar; +package com.iluwatar.object.pool; import org.junit.Test; +import com.iluwatar.object.pool.App; + public class AppTest { @Test diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/App.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/App.java similarity index 97% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/App.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/App.java index 85ed7c48e..8f665b1e3 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/App.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; /** * One of possible approaches to terminate Producer-Consumer pattern is using PoisonPill idiom. diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/Consumer.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java similarity index 90% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/Consumer.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java index d2892f502..3bb9dcc56 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/Consumer.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java @@ -1,6 +1,6 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; -import com.iluwatar.poisonpill.Message.Headers; +import com.iluwatar.poison.pill.Message.Headers; /** * Class responsible for receiving and handling submitted to the queue messages diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/MQPublishPoint.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/MQPublishPoint.java similarity index 81% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/MQPublishPoint.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/MQPublishPoint.java index ca3555f52..9c72242be 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/MQPublishPoint.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/MQPublishPoint.java @@ -1,4 +1,4 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; /** * Endpoint to publish {@link Message} to queue diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/MQSubscribePoint.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/MQSubscribePoint.java similarity index 81% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/MQSubscribePoint.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/MQSubscribePoint.java index 820d82bf3..f689835b6 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/MQSubscribePoint.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/MQSubscribePoint.java @@ -1,4 +1,4 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; /** * Endpoint to retrieve {@link Message} from queue diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/Message.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/Message.java similarity index 96% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/Message.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/Message.java index 1ea6c2904..f306e0385 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/Message.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/Message.java @@ -1,4 +1,4 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; import java.util.Map; diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/MessageQueue.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/MessageQueue.java similarity index 84% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/MessageQueue.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/MessageQueue.java index 3a360cc5c..99231ab51 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/MessageQueue.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/MessageQueue.java @@ -1,4 +1,4 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; /** * Represents abstraction of channel (or pipe) that bounds {@link Producer} and {@link Consumer} diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/Producer.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.java similarity index 92% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/Producer.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.java index 1e4bd9aa3..56d086204 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/Producer.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/Producer.java @@ -1,8 +1,8 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; import java.util.Date; -import com.iluwatar.poisonpill.Message.Headers; +import com.iluwatar.poison.pill.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/poisonpill/SimpleMessage.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessage.java similarity index 95% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessage.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessage.java index 40c990712..61a8664f5 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessage.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessage.java @@ -1,4 +1,4 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; import java.util.Collections; import java.util.HashMap; diff --git a/poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessageQueue.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java similarity index 93% rename from poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessageQueue.java rename to poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java index cf012d9c4..316ed33e5 100644 --- a/poison-pill/src/main/java/com/iluwatar/poisonpill/SimpleMessageQueue.java +++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/SimpleMessageQueue.java @@ -1,4 +1,4 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.poison.pill; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; diff --git a/lazy-loading/src/test/java/com/iluwatar/lazyloading/AppTest.java b/poison-pill/src/test/java/com/iluwatar/poison/pill/AppTest.java similarity index 63% rename from lazy-loading/src/test/java/com/iluwatar/lazyloading/AppTest.java rename to poison-pill/src/test/java/com/iluwatar/poison/pill/AppTest.java index 142da8f2e..625d849a2 100644 --- a/lazy-loading/src/test/java/com/iluwatar/lazyloading/AppTest.java +++ b/poison-pill/src/test/java/com/iluwatar/poison/pill/AppTest.java @@ -1,8 +1,8 @@ -package com.iluwatar.lazyloading; +package com.iluwatar.poison.pill; import org.junit.Test; -import com.iluwatar.lazyloading.App; +import com.iluwatar.poison.pill.App; public class AppTest { diff --git a/repository/etc/repository.ucls b/repository/etc/repository.ucls index 6a10449d8..6fcdb4e31 100644 --- a/repository/etc/repository.ucls +++ b/repository/etc/repository.ucls @@ -1,8 +1,8 @@ - + @@ -10,8 +10,8 @@ - + diff --git a/repository/src/main/java/com/iluwatar/App.java b/repository/src/main/java/com/iluwatar/repository/App.java similarity index 98% rename from repository/src/main/java/com/iluwatar/App.java rename to repository/src/main/java/com/iluwatar/repository/App.java index ed7cadc4d..8dd568d51 100644 --- a/repository/src/main/java/com/iluwatar/App.java +++ b/repository/src/main/java/com/iluwatar/repository/App.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.repository; import java.util.List; diff --git a/repository/src/main/java/com/iluwatar/Person.java b/repository/src/main/java/com/iluwatar/repository/Person.java similarity index 96% rename from repository/src/main/java/com/iluwatar/Person.java rename to repository/src/main/java/com/iluwatar/repository/Person.java index d3fadeb89..85d647b1a 100644 --- a/repository/src/main/java/com/iluwatar/Person.java +++ b/repository/src/main/java/com/iluwatar/repository/Person.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.repository; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/repository/src/main/java/com/iluwatar/PersonDao.java b/repository/src/main/java/com/iluwatar/repository/PersonDao.java similarity index 90% rename from repository/src/main/java/com/iluwatar/PersonDao.java rename to repository/src/main/java/com/iluwatar/repository/PersonDao.java index f59bfa292..bb8ba854b 100644 --- a/repository/src/main/java/com/iluwatar/PersonDao.java +++ b/repository/src/main/java/com/iluwatar/repository/PersonDao.java @@ -1,4 +1,4 @@ -package com.iluwatar; +package com.iluwatar.repository; import java.util.List; diff --git a/poison-pill/src/test/java/com/iluwatar/poisonpill/AppTest.java b/repository/src/test/java/com/iluwatar/repository/AppTest.java similarity index 64% rename from poison-pill/src/test/java/com/iluwatar/poisonpill/AppTest.java rename to repository/src/test/java/com/iluwatar/repository/AppTest.java index 6d39c06bb..2e638ba6b 100644 --- a/poison-pill/src/test/java/com/iluwatar/poisonpill/AppTest.java +++ b/repository/src/test/java/com/iluwatar/repository/AppTest.java @@ -1,8 +1,8 @@ -package com.iluwatar.poisonpill; +package com.iluwatar.repository; import org.junit.Test; -import com.iluwatar.poisonpill.App; +import com.iluwatar.repository.App; public class AppTest { diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/App.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/App.java similarity index 95% rename from resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/App.java rename to resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/App.java index ebf8a1dc7..b947d31d0 100644 --- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/App.java +++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/App.java @@ -1,4 +1,4 @@ -package com.iluwatar.resourceacquisitionisinitialization; +package com.iluwatar.resource.acquisition.is.initialization; /** * diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/SlidingDoor.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/SlidingDoor.java similarity index 81% rename from resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/SlidingDoor.java rename to resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/SlidingDoor.java index c7181c8ba..2033707e6 100644 --- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/SlidingDoor.java +++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/SlidingDoor.java @@ -1,4 +1,4 @@ -package com.iluwatar.resourceacquisitionisinitialization; +package com.iluwatar.resource.acquisition.is.initialization; /** * diff --git a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/TreasureChest.java b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/TreasureChest.java similarity index 84% rename from resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/TreasureChest.java rename to resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/TreasureChest.java index c8f6b8ba4..4d6b1a863 100644 --- a/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resourceacquisitionisinitialization/TreasureChest.java +++ b/resource-acquisition-is-initialization/src/main/java/com/iluwatar/resource/acquisition/is/initialization/TreasureChest.java @@ -1,4 +1,4 @@ -package com.iluwatar.resourceacquisitionisinitialization; +package com.iluwatar.resource.acquisition.is.initialization; import java.io.Closeable; import java.io.IOException; diff --git a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resourceacquisitionisinitialization/AppTest.java b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java similarity index 53% rename from resource-acquisition-is-initialization/src/test/java/com/iluwatar/resourceacquisitionisinitialization/AppTest.java rename to resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java index 5f71bbddf..097ea4711 100644 --- a/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resourceacquisitionisinitialization/AppTest.java +++ b/resource-acquisition-is-initialization/src/test/java/com/iluwatar/resource/acquisition/is/initialization/AppTest.java @@ -1,8 +1,8 @@ -package com.iluwatar.resourceacquisitionisinitialization; +package com.iluwatar.resource.acquisition.is.initialization; import org.junit.Test; -import com.iluwatar.resourceacquisitionisinitialization.App; +import com.iluwatar.resource.acquisition.is.initialization.App; public class AppTest {