Hexagonal pattern: Simplified lottery ticket ids
This commit is contained in:
		@@ -22,29 +22,49 @@
 | 
			
		||||
 */
 | 
			
		||||
package com.iluwatar.hexagonal.domain;
 | 
			
		||||
 | 
			
		||||
import java.util.UUID;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Lottery ticked id
 | 
			
		||||
 */
 | 
			
		||||
public class LotteryTicketId {
 | 
			
		||||
  
 | 
			
		||||
  private final UUID id;
 | 
			
		||||
 | 
			
		||||
  private static volatile int numAllocated;
 | 
			
		||||
  private final int id;
 | 
			
		||||
  
 | 
			
		||||
  public LotteryTicketId() {
 | 
			
		||||
    id = UUID.randomUUID();
 | 
			
		||||
    this.id = numAllocated + 1;
 | 
			
		||||
    numAllocated++;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  public LotteryTicketId(String str) {
 | 
			
		||||
    id = UUID.fromString(str);
 | 
			
		||||
  public LotteryTicketId(int id) {
 | 
			
		||||
    this.id = id;
 | 
			
		||||
  }
 | 
			
		||||
  
 | 
			
		||||
  public UUID getId() {
 | 
			
		||||
  public int getId() {
 | 
			
		||||
    return id;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  @Override
 | 
			
		||||
  public String toString() {
 | 
			
		||||
    return id.toString();
 | 
			
		||||
    return String.format("%d", id);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  @Override
 | 
			
		||||
  public boolean equals(Object o) {
 | 
			
		||||
    if (this == o) {
 | 
			
		||||
      return true;
 | 
			
		||||
    }
 | 
			
		||||
    if (o == null || getClass() != o.getClass()) {
 | 
			
		||||
      return false;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    LotteryTicketId that = (LotteryTicketId) o;
 | 
			
		||||
 | 
			
		||||
    return id == that.id;
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  @Override
 | 
			
		||||
  public int hashCode() {
 | 
			
		||||
    return id;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -32,7 +32,6 @@ import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult;
 | 
			
		||||
import com.iluwatar.hexagonal.domain.LotteryTicketId;
 | 
			
		||||
import com.iluwatar.hexagonal.domain.PlayerDetails;
 | 
			
		||||
import com.iluwatar.hexagonal.module.LotteryModule;
 | 
			
		||||
import com.iluwatar.hexagonal.sampledata.SampleData;
 | 
			
		||||
 | 
			
		||||
import java.util.HashSet;
 | 
			
		||||
import java.util.Optional;
 | 
			
		||||
@@ -52,7 +51,6 @@ public class ConsoleLottery {
 | 
			
		||||
    Injector injector = Guice.createInjector(new LotteryModule());
 | 
			
		||||
    LotteryService service = injector.getInstance(LotteryService.class);
 | 
			
		||||
    WireTransfers bank = injector.getInstance(WireTransfers.class);
 | 
			
		||||
    SampleData.submitTickets(service, 20);
 | 
			
		||||
    Scanner scanner = new Scanner(System.in);
 | 
			
		||||
    boolean exit = false;
 | 
			
		||||
    while (!exit) {
 | 
			
		||||
@@ -103,7 +101,7 @@ public class ConsoleLottery {
 | 
			
		||||
          winningNumbers.add(Integer.parseInt(parts[i]));
 | 
			
		||||
        }
 | 
			
		||||
        LotteryTicketCheckResult result = service.checkTicketForPrize(
 | 
			
		||||
            new LotteryTicketId(id), LotteryNumbers.create(winningNumbers));
 | 
			
		||||
            new LotteryTicketId(Integer.parseInt(id)), LotteryNumbers.create(winningNumbers));
 | 
			
		||||
        if (result.getResult().equals(LotteryTicketCheckResult.CheckResult.WIN_PRIZE)) {
 | 
			
		||||
          System.out.println("Congratulations! The lottery ticket has won!");
 | 
			
		||||
        } else if (result.getResult().equals(LotteryTicketCheckResult.CheckResult.NO_PRIZE)) {
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,45 @@
 | 
			
		||||
/**
 | 
			
		||||
 * 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 org.junit.Test;
 | 
			
		||||
 | 
			
		||||
import static org.junit.Assert.assertFalse;
 | 
			
		||||
import static org.junit.Assert.assertTrue;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Tests for lottery ticket id
 | 
			
		||||
 */
 | 
			
		||||
public class LotteryTicketIdTest {
 | 
			
		||||
 | 
			
		||||
  @Test
 | 
			
		||||
  public void testEquals() {
 | 
			
		||||
    LotteryTicketId ticketId1 = new LotteryTicketId();
 | 
			
		||||
    LotteryTicketId ticketId2 = new LotteryTicketId();
 | 
			
		||||
    LotteryTicketId ticketId3 = new LotteryTicketId();
 | 
			
		||||
    assertFalse(ticketId1.equals(ticketId2));
 | 
			
		||||
    assertFalse(ticketId2.equals(ticketId3));
 | 
			
		||||
    LotteryTicketId ticketId4 = new LotteryTicketId(ticketId1.getId());
 | 
			
		||||
    assertTrue(ticketId1.equals(ticketId4));
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user