Hexagonal pattern: More descriptive class names

iseppala · iseppala · commit 0f2807b9cfd2 · 2016-09-09T21:36:17.000+03:00
diff --git a/hexagonal/etc/hexagonal.png b/hexagonal/etc/hexagonal.png
diff --git a/hexagonal/etc/hexagonal.ucls b/hexagonal/etc/hexagonal.ucls
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/App.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/App.java
@@ -29,7 +29,7 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.iluwatar.hexagonal.administration.LotteryAdministration;
-import com.iluwatar.hexagonal.banking.WireTransfersImpl;
+import com.iluwatar.hexagonal.banking.InMemoryBank;
 import com.iluwatar.hexagonal.domain.LotteryConstants;
 import com.iluwatar.hexagonal.domain.LotteryNumbers;
 import com.iluwatar.hexagonal.domain.LotteryTicket;
@@ -112,7 +112,7 @@ public class App {
     PLAYERS.add(PlayerDetails.create("ron@google.com", "637-738", "+09842354"));
     PLAYERS.add(PlayerDetails.create("xavier@google.com", "143-947", "+375245"));
     PLAYERS.add(PlayerDetails.create("harriet@google.com", "842-404", "+131243252"));
-    WireTransfersImpl wireTransfers = new WireTransfersImpl();
+    InMemoryBank wireTransfers = new InMemoryBank();
     Random random = new Random();
     for (int i = 0; i < PLAYERS.size(); i++) {
       wireTransfers.setFunds(PLAYERS.get(i).getBankAccount(), 
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/LotteryModule.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/LotteryModule.java
@@ -24,29 +24,29 @@
 
 import com.google.inject.AbstractModule;
 import com.iluwatar.hexagonal.administration.LotteryAdministration;
-import com.iluwatar.hexagonal.administration.LotteryAdministrationImpl;
+import com.iluwatar.hexagonal.administration.ConsoleAdministration;
+import com.iluwatar.hexagonal.banking.InMemoryBank;
 import com.iluwatar.hexagonal.banking.WireTransfers;
-import com.iluwatar.hexagonal.banking.WireTransfersImpl;
-import com.iluwatar.hexagonal.database.LotteryTicketInMemoryRepository;
+import com.iluwatar.hexagonal.database.InMemoryTicketRepository;
 import com.iluwatar.hexagonal.database.LotteryTicketRepository;
 import com.iluwatar.hexagonal.domain.LotterySystem;
 import com.iluwatar.hexagonal.domain.LotterySystemImpl;
 import com.iluwatar.hexagonal.notifications.LotteryNotifications;
-import com.iluwatar.hexagonal.notifications.LotteryNotificationsImpl;
+import com.iluwatar.hexagonal.notifications.StdOutNotifications;
+import com.iluwatar.hexagonal.service.ConsoleService;
 import com.iluwatar.hexagonal.service.LotteryService;
-import com.iluwatar.hexagonal.service.LotteryServiceImpl;
 
 /**
  * Guice module for binding production dependencies
  */
 public class LotteryModule extends AbstractModule {
   @Override
   protected void configure() {
-    bind(LotteryTicketRepository.class).to(LotteryTicketInMemoryRepository.class);
+    bind(LotteryTicketRepository.class).to(InMemoryTicketRepository.class);
     bind(LotterySystem.class).to(LotterySystemImpl.class);
-    bind(LotteryNotifications.class).to(LotteryNotificationsImpl.class);
-    bind(WireTransfers.class).to(WireTransfersImpl.class);
-    bind(LotteryAdministration.class).to(LotteryAdministrationImpl.class);
-    bind(LotteryService.class).to(LotteryServiceImpl.class);
+    bind(LotteryNotifications.class).to(StdOutNotifications.class);
+    bind(WireTransfers.class).to(InMemoryBank.class);
+    bind(LotteryAdministration.class).to(ConsoleAdministration.class);
+    bind(LotteryService.class).to(ConsoleService.class);
   }
 }
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/ConsoleAdministration.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/administration/ConsoleAdministration.java
@@ -35,12 +35,12 @@
  * Lottery administration implementation
  *
  */
-public class LotteryAdministrationImpl implements LotteryAdministration {
+public class ConsoleAdministration implements LotteryAdministration {
 
   private final LotterySystem lotterySystem;
 
   @Inject
-  public LotteryAdministrationImpl(LotterySystem lotterySystem) {
+  public ConsoleAdministration(LotterySystem lotterySystem) {
     this.lotterySystem = lotterySystem;
   }
   
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/banking/InMemoryBank.java
@@ -32,7 +32,7 @@
  * Banking implementation
  *
  */
-public class WireTransfersImpl implements WireTransfers {
+public class InMemoryBank implements WireTransfers {
 
   private static Map<String, Integer> accounts = new HashMap<>();
   
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/InMemoryTicketRepository.java
@@ -34,7 +34,7 @@
  * Mock database for lottery tickets.
  *
  */
-public class LotteryTicketInMemoryRepository implements LotteryTicketRepository {
+public class InMemoryTicketRepository implements LotteryTicketRepository {
   
   private static Map<LotteryTicketId, LotteryTicket> tickets = new HashMap<>();
 
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/notifications/StdOutNotifications.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/notifications/StdOutNotifications.java
@@ -24,7 +24,7 @@
 
 import com.iluwatar.hexagonal.domain.PlayerDetails;
 
-public class LotteryNotificationsImpl implements LotteryNotifications {
+public class StdOutNotifications implements LotteryNotifications {
 
   @Override
   public void notifyTicketSubmitted(PlayerDetails details) {
diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/service/ConsoleService.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/service/ConsoleService.java
@@ -36,15 +36,15 @@
  * Implementation for lottery service
  *
  */
-public class LotteryServiceImpl implements LotteryService {
+public class ConsoleService implements LotteryService {
 
   private final LotterySystem lotterySystem;
 
   /**
    * Constructor
    */
   @Inject
-  public LotteryServiceImpl(LotterySystem lotterySystem) {
+  public ConsoleService(LotterySystem lotterySystem) {
     this.lotterySystem = lotterySystem;
   }
   
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/LotteryTestingModule.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/LotteryTestingModule.java
@@ -23,30 +23,30 @@
 package com.iluwatar.hexagonal;
 
 import com.google.inject.AbstractModule;
+import com.iluwatar.hexagonal.administration.ConsoleAdministration;
 import com.iluwatar.hexagonal.administration.LotteryAdministration;
-import com.iluwatar.hexagonal.administration.LotteryAdministrationImpl;
+import com.iluwatar.hexagonal.banking.InMemoryBank;
 import com.iluwatar.hexagonal.banking.WireTransfers;
-import com.iluwatar.hexagonal.banking.WireTransfersImpl;
-import com.iluwatar.hexagonal.database.LotteryTicketInMemoryRepository;
+import com.iluwatar.hexagonal.database.InMemoryTicketRepository;
 import com.iluwatar.hexagonal.database.LotteryTicketRepository;
 import com.iluwatar.hexagonal.domain.LotterySystem;
 import com.iluwatar.hexagonal.domain.LotterySystemImpl;
 import com.iluwatar.hexagonal.notifications.LotteryNotifications;
-import com.iluwatar.hexagonal.notifications.LotteryNotificationsImpl;
+import com.iluwatar.hexagonal.notifications.StdOutNotifications;
+import com.iluwatar.hexagonal.service.ConsoleService;
 import com.iluwatar.hexagonal.service.LotteryService;
-import com.iluwatar.hexagonal.service.LotteryServiceImpl;
 
 /**
  * Guice module for testing dependencies
  */
 public class LotteryTestingModule extends AbstractModule {
   @Override
   protected void configure() {
-    bind(LotteryTicketRepository.class).to(LotteryTicketInMemoryRepository.class);
+    bind(LotteryTicketRepository.class).to(InMemoryTicketRepository.class);
     bind(LotterySystem.class).to(LotterySystemImpl.class);
-    bind(LotteryNotifications.class).to(LotteryNotificationsImpl.class);
-    bind(WireTransfers.class).to(WireTransfersImpl.class);
-    bind(LotteryAdministration.class).to(LotteryAdministrationImpl.class);
-    bind(LotteryService.class).to(LotteryServiceImpl.class);
+    bind(LotteryNotifications.class).to(StdOutNotifications.class);
+    bind(WireTransfers.class).to(InMemoryBank.class);
+    bind(LotteryAdministration.class).to(ConsoleAdministration.class);
+    bind(LotteryService.class).to(ConsoleService.class);
   }
 }
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/WireTransfersTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/banking/WireTransfersTest.java
@@ -34,7 +34,7 @@
  */
 public class WireTransfersTest {
 
-  private final WireTransfers bank = new WireTransfersImpl();
+  private final WireTransfers bank = new InMemoryBank();
   
   @Test
   public void testInit() {
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryTest.java
@@ -30,8 +30,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.iluwatar.hexagonal.database.LotteryTicketRepository;
-import com.iluwatar.hexagonal.database.LotteryTicketInMemoryRepository;
 import com.iluwatar.hexagonal.domain.LotteryTicket;
 import com.iluwatar.hexagonal.domain.LotteryTicketId;
 import com.iluwatar.hexagonal.test.LotteryTestUtils;
@@ -43,7 +41,7 @@
  */
 public class LotteryTicketRepositoryTest {
 
-  private final LotteryTicketRepository repository = new LotteryTicketInMemoryRepository();
+  private final LotteryTicketRepository repository = new InMemoryTicketRepository();
   
   @Before
   public void clear() {
@@ -52,7 +50,7 @@ public void clear() {
   
   @Test
   public void testCrudOperations() {
-    LotteryTicketRepository repository = new LotteryTicketInMemoryRepository();
+    LotteryTicketRepository repository = new InMemoryTicketRepository();
     assertEquals(repository.findAll().size(), 0);
     LotteryTicket ticket = LotteryTestUtils.createLotteryTicket();
     Optional<LotteryTicketId> id = repository.save(ticket);
diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTest.java
@@ -33,16 +33,11 @@
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
-import com.iluwatar.hexagonal.LotteryModule;
 import com.iluwatar.hexagonal.LotteryTestingModule;
-import com.iluwatar.hexagonal.domain.*;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.iluwatar.hexagonal.banking.WireTransfers;
-import com.iluwatar.hexagonal.banking.WireTransfersImpl;
-import com.iluwatar.hexagonal.database.LotteryTicketRepository;
-import com.iluwatar.hexagonal.database.LotteryTicketInMemoryRepository;
 import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult.CheckResult;
 import com.iluwatar.hexagonal.test.LotteryTestUtils;
 

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@`
`35`	`35`	`* Lottery administration implementation`
`36`	`36`	`*`
`37`	`37`	`*/`
`38`		`-public class LotteryAdministrationImpl implements LotteryAdministration {`
	`38`	`+public class ConsoleAdministration implements LotteryAdministration {`
`39`	`39`
`40`	`40`	`private final LotterySystem lotterySystem;`
`41`	`41`
`42`	`42`	`@Inject`
`43`		`- public LotteryAdministrationImpl(LotterySystem lotterySystem) {`
	`43`	`+ public ConsoleAdministration(LotterySystem lotterySystem) {`
`44`	`44`	`this.lotterySystem = lotterySystem;`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`* Banking implementation`
`33`	`33`	`*`
`34`	`34`	`*/`
`35`		`-public class WireTransfersImpl implements WireTransfers {`
	`35`	`+public class InMemoryBank implements WireTransfers {`
`36`	`36`
`37`	`37`	`private static Map<String, Integer> accounts = new HashMap<>();`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`* Mock database for lottery tickets.`
`35`	`35`	`*`
`36`	`36`	`*/`
`37`		`-public class LotteryTicketInMemoryRepository implements LotteryTicketRepository {`
	`37`	`+public class InMemoryTicketRepository implements LotteryTicketRepository {`
`38`	`38`
`39`	`39`	`private static Map<LotteryTicketId, LotteryTicket> tickets = new HashMap<>();`
`40`	`40`