From f620123ceea1bc2847d1b2709c3d4fcf03a624bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20Sepp=C3=A4l=C3=A4?= Date: Sat, 26 Mar 2016 21:22:49 +0200 Subject: [PATCH] Organize packages --- .../LotteryAdministration.java | 6 +- .../LotteryAdministrationImpl.java | 8 ++- .../{domain => banking}/WireTransfers.java | 2 +- .../LotteryTicketRepository.java | 5 +- .../LotteryTicketRepositoryMock.java | 3 +- .../LotteryNotifications.java | 4 +- .../{domain => service}/LotteryService.java | 7 ++- .../LotteryServiceImpl.java | 9 ++- .../LotteryTicketRepositoryTest.java | 8 ++- .../domain/LotteryAdministrationTest.java | 61 ------------------- .../{domain => lottery}/LotteryTest.java | 14 ++++- .../{domain => test}/LotteryTestUtils.java | 6 +- 12 files changed, 56 insertions(+), 77 deletions(-) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{domain => administration}/LotteryAdministration.java (87%) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{domain => administration}/LotteryAdministrationImpl.java (83%) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{domain => banking}/WireTransfers.java (97%) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{domain => database}/LotteryTicketRepository.java (90%) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{adapter => database}/LotteryTicketRepositoryMock.java (95%) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{domain => notifications}/LotteryNotifications.java (93%) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{domain => service}/LotteryService.java (84%) rename hexagonal/src/main/java/com/iluwatar/hexagonal/{domain => service}/LotteryServiceImpl.java (84%) rename hexagonal/src/test/java/com/iluwatar/hexagonal/{domain => database}/LotteryTicketRepositoryTest.java (86%) delete mode 100644 hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryAdministrationTest.java rename hexagonal/src/test/java/com/iluwatar/hexagonal/{domain => lottery}/LotteryTest.java (85%) rename hexagonal/src/test/java/com/iluwatar/hexagonal/{domain => test}/LotteryTestUtils.java (90%) diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/LotteryAdministration.java similarity index 87% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/administration/LotteryAdministration.java index af3608d00..70b625aa2 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/LotteryAdministration.java @@ -20,10 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.administration; import java.util.Map; +import com.iluwatar.hexagonal.domain.LotteryNumbers; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketId; + /** * * Administrator interface for lottery service. diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministrationImpl.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/LotteryAdministrationImpl.java similarity index 83% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministrationImpl.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/administration/LotteryAdministrationImpl.java index 30d4e7b8b..3d0327fe1 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministrationImpl.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/LotteryAdministrationImpl.java @@ -20,11 +20,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.administration; import java.util.Map; -import com.iluwatar.hexagonal.adapter.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.database.LotteryTicketRepository; +import com.iluwatar.hexagonal.database.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.domain.LotteryNumbers; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketId; /** * diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/WireTransfers.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/WireTransfers.java similarity index 97% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/domain/WireTransfers.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/banking/WireTransfers.java index d9463f19d..0a3580db5 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/WireTransfers.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/WireTransfers.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.banking; /** * diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketRepository.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepository.java similarity index 90% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketRepository.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepository.java index b39f2e80d..a531440b4 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketRepository.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepository.java @@ -20,11 +20,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.database; import java.util.Map; import java.util.Optional; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketId; + /** * * Interface for accessing lottery tickets in database. diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/adapter/LotteryTicketRepositoryMock.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryMock.java similarity index 95% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/adapter/LotteryTicketRepositoryMock.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryMock.java index ba1cc69b9..0629fb6db 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/adapter/LotteryTicketRepositoryMock.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryMock.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.adapter; +package com.iluwatar.hexagonal.database; import java.util.HashMap; import java.util.Map; @@ -28,7 +28,6 @@ import java.util.Optional; import com.iluwatar.hexagonal.domain.LotteryTicket; import com.iluwatar.hexagonal.domain.LotteryTicketId; -import com.iluwatar.hexagonal.domain.LotteryTicketRepository; /** * diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNotifications.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/notifications/LotteryNotifications.java similarity index 93% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNotifications.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/notifications/LotteryNotifications.java index 626525ebc..11cece62e 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryNotifications.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/notifications/LotteryNotifications.java @@ -20,7 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.notifications; + +import com.iluwatar.hexagonal.domain.PlayerDetails; /** * diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/service/LotteryService.java similarity index 84% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/service/LotteryService.java index 369f64966..65270410a 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/service/LotteryService.java @@ -20,10 +20,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.service; import java.util.Optional; +import com.iluwatar.hexagonal.domain.LotteryNumbers; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult; +import com.iluwatar.hexagonal.domain.LotteryTicketId; + /** * * Interface for submitting and checking lottery tickets. diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryServiceImpl.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/service/LotteryServiceImpl.java similarity index 84% rename from hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryServiceImpl.java rename to hexagonal/src/main/java/com/iluwatar/hexagonal/service/LotteryServiceImpl.java index 4774ea3be..af5b28f7a 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryServiceImpl.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/service/LotteryServiceImpl.java @@ -20,11 +20,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.service; import java.util.Optional; -import com.iluwatar.hexagonal.adapter.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.database.LotteryTicketRepository; +import com.iluwatar.hexagonal.database.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.domain.LotteryNumbers; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult; +import com.iluwatar.hexagonal.domain.LotteryTicketId; import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult.CheckResult; /** diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketRepositoryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryTest.java similarity index 86% rename from hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketRepositoryTest.java rename to hexagonal/src/test/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryTest.java index 7bbff9e3f..a80e4817a 100644 --- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketRepositoryTest.java +++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryTest.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.database; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -30,7 +30,11 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; -import com.iluwatar.hexagonal.adapter.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.database.LotteryTicketRepository; +import com.iluwatar.hexagonal.database.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketId; +import com.iluwatar.hexagonal.test.LotteryTestUtils; /** * diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryAdministrationTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryAdministrationTest.java deleted file mode 100644 index 0bcb34048..000000000 --- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryAdministrationTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * The MIT License - * Copyright (c) 2014 Ilkka Seppälä - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.iluwatar.hexagonal.domain; - -import static org.junit.Assert.assertEquals; - -import org.junit.Before; -import org.junit.Test; - -import com.iluwatar.hexagonal.adapter.LotteryTicketRepositoryMock; - -/** - * - * Tests for lottery administration - * - */ -public class LotteryAdministrationTest { - - private LotteryTicketRepository repository = new LotteryTicketRepositoryMock(); - private LotteryAdministration admin = new LotteryAdministrationImpl(); - - @Before - public void submitTickets() { - repository.deleteAll(); - repository.save(LotteryTestUtils.createLotteryTicket()); - repository.save(LotteryTestUtils.createLotteryTicket()); - repository.save(LotteryTestUtils.createLotteryTicket()); - repository.save(LotteryTestUtils.createLotteryTicket()); - repository.save(LotteryTestUtils.createLotteryTicket()); - } - - @Test - public void testGetAllTickets() { - assertEquals(admin.getAllSubmittedTickets().size(), 5); - } - - @Test - public void testPerformLottery() { - assertEquals(admin.performLottery().getNumbers().size(), 4); - } -} diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/lottery/LotteryTest.java similarity index 85% rename from hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java rename to hexagonal/src/test/java/com/iluwatar/hexagonal/lottery/LotteryTest.java index 6135994ea..1da92023d 100644 --- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java +++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/lottery/LotteryTest.java @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.lottery; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -33,8 +33,18 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; -import com.iluwatar.hexagonal.adapter.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.administration.LotteryAdministration; +import com.iluwatar.hexagonal.administration.LotteryAdministrationImpl; +import com.iluwatar.hexagonal.database.LotteryTicketRepository; +import com.iluwatar.hexagonal.database.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.domain.LotteryNumbers; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult; +import com.iluwatar.hexagonal.domain.LotteryTicketId; import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult.CheckResult; +import com.iluwatar.hexagonal.service.LotteryService; +import com.iluwatar.hexagonal.service.LotteryServiceImpl; +import com.iluwatar.hexagonal.test.LotteryTestUtils; /** * diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTestUtils.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.java similarity index 90% rename from hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTestUtils.java rename to hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.java index 4a38ff3a2..883c8127f 100644 --- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTestUtils.java +++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/test/LotteryTestUtils.java @@ -20,12 +20,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.hexagonal.domain; +package com.iluwatar.hexagonal.test; import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import com.iluwatar.hexagonal.domain.LotteryNumbers; +import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.PlayerDetails; + /** * * Utilities for lottery tests