From 936c2da6655316287921d0e5391e1a164357bfed Mon Sep 17 00:00:00 2001 From: Alberto Lagna Date: Tue, 15 Mar 2016 12:31:28 +0100 Subject: [PATCH] added "ticket" package level --- .classpath | 2 +- .gitignore | 1 + .project | 4 +- doc/domain.ucls | 127 ++++++++++-------- .../it/whitebox/event/TicketApplication.java | 9 -- .../event/business/TicketService.java | 23 ---- .../event/business/result/BusinessError.java | 5 - .../event/business/result/ServiceResult.java | 5 - .../config/MainApplicationContext.java | 2 +- .../{ => common}/config/StartupListener.java | 2 +- .../config/WebApplicationContext.java | 2 +- .../event/ticket/business/TicketService.java | 23 ++++ .../business/TicketServiceImpl.java | 38 +++--- .../business/domain/BusinessEntity.java | 2 +- .../business/domain/Discount.java | 2 +- .../business/domain/Purchase.java | 2 +- .../{ => ticket}/business/domain/Service.java | 2 +- .../business/domain/Subscriber.java | 2 +- .../business/domain/Subscription.java | 2 +- .../{ => ticket}/business/domain/Ticket.java | 2 +- .../ticket/business/result/BusinessError.java | 5 + .../result/CreatePurchaseResponse.java | 4 +- .../result/CreateSubscriptionResponse.java | 4 +- .../result/GetSubscriptionResponse.java | 6 +- .../business/result/GetTicketsResponse.java | 4 +- .../business/result/ListPurchaseResponse.java | 4 +- .../result/ListSubscriptionResponse.java | 4 +- .../business/result/ResultFailure.java | 2 +- .../business/result/ResultSuccess.java | 2 +- .../ticket/business/result/ServiceResult.java | 5 + .../frontend/GlobalExceptionHandler.java | 2 +- .../frontend/TicketCSVServiceImpl.java | 8 +- .../frontend/TicketRestServiceImpl.java | 20 +-- .../integration/db/PurchaseDao.java | 4 +- .../integration/db/PurchaseDaoCustom.java | 4 +- .../integration/db/PurchaseDaoCustomImpl.java | 4 +- .../integration/db/ServiceDao.java | 4 +- .../integration/db/SubscriberDao.java | 4 +- .../integration/db/SubscriptionDao.java | 4 +- .../integration/db/SubscriptionDaoCustom.java | 4 +- .../db/SubscriptionDaoCustomImpl.java | 4 +- .../integration/db/TcktNamingStrategy.java | 2 +- .../integration/db/TicketDao.java | 4 +- src/main/resources/applicationContext.xml | 2 +- src/main/resources/ticket.properties | 4 +- .../it/whitebox/event/BaseJunit4TestCase.java | 2 +- .../{ => ticket}/frontend/JsonMarshaller.java | 14 +- .../integration/db/DatabaseCreatorBatch.java | 4 +- 48 files changed, 202 insertions(+), 189 deletions(-) delete mode 100644 src/main/java/it/whitebox/event/TicketApplication.java delete mode 100644 src/main/java/it/whitebox/event/business/TicketService.java delete mode 100644 src/main/java/it/whitebox/event/business/result/BusinessError.java delete mode 100644 src/main/java/it/whitebox/event/business/result/ServiceResult.java rename src/main/java/it/whitebox/event/{ => common}/config/MainApplicationContext.java (99%) rename src/main/java/it/whitebox/event/{ => common}/config/StartupListener.java (94%) rename src/main/java/it/whitebox/event/{ => common}/config/WebApplicationContext.java (96%) create mode 100644 src/main/java/it/whitebox/event/ticket/business/TicketService.java rename src/main/java/it/whitebox/event/{ => ticket}/business/TicketServiceImpl.java (86%) rename src/main/java/it/whitebox/event/{ => ticket}/business/domain/BusinessEntity.java (90%) rename src/main/java/it/whitebox/event/{ => ticket}/business/domain/Discount.java (93%) rename src/main/java/it/whitebox/event/{ => ticket}/business/domain/Purchase.java (95%) rename src/main/java/it/whitebox/event/{ => ticket}/business/domain/Service.java (92%) rename src/main/java/it/whitebox/event/{ => ticket}/business/domain/Subscriber.java (94%) rename src/main/java/it/whitebox/event/{ => ticket}/business/domain/Subscription.java (94%) rename src/main/java/it/whitebox/event/{ => ticket}/business/domain/Ticket.java (95%) create mode 100644 src/main/java/it/whitebox/event/ticket/business/result/BusinessError.java rename src/main/java/it/whitebox/event/{ => ticket}/business/result/CreatePurchaseResponse.java (73%) rename src/main/java/it/whitebox/event/{ => ticket}/business/result/CreateSubscriptionResponse.java (73%) rename src/main/java/it/whitebox/event/{ => ticket}/business/result/GetSubscriptionResponse.java (69%) rename src/main/java/it/whitebox/event/{ => ticket}/business/result/GetTicketsResponse.java (76%) rename src/main/java/it/whitebox/event/{ => ticket}/business/result/ListPurchaseResponse.java (77%) rename src/main/java/it/whitebox/event/{ => ticket}/business/result/ListSubscriptionResponse.java (77%) rename src/main/java/it/whitebox/event/{ => ticket}/business/result/ResultFailure.java (83%) rename src/main/java/it/whitebox/event/{ => ticket}/business/result/ResultSuccess.java (52%) create mode 100644 src/main/java/it/whitebox/event/ticket/business/result/ServiceResult.java rename src/main/java/it/whitebox/event/{ => ticket}/frontend/GlobalExceptionHandler.java (94%) rename src/main/java/it/whitebox/event/{ => ticket}/frontend/TicketCSVServiceImpl.java (94%) rename src/main/java/it/whitebox/event/{ => ticket}/frontend/TicketRestServiceImpl.java (79%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/PurchaseDao.java (74%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/PurchaseDaoCustom.java (58%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/PurchaseDaoCustomImpl.java (94%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/ServiceDao.java (76%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/SubscriberDao.java (79%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/SubscriptionDao.java (79%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/SubscriptionDaoCustom.java (71%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/SubscriptionDaoCustomImpl.java (93%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/TcktNamingStrategy.java (90%) rename src/main/java/it/whitebox/event/{ => ticket}/integration/db/TicketDao.java (80%) rename src/test/java/it/whitebox/event/{ => ticket}/frontend/JsonMarshaller.java (76%) rename src/test/java/it/whitebox/event/{ => ticket}/integration/db/DatabaseCreatorBatch.java (90%) diff --git a/.classpath b/.classpath index df4757b..f085369 100644 --- a/.classpath +++ b/.classpath @@ -26,7 +26,7 @@ - + diff --git a/.gitignore b/.gitignore index 61fb267..480936b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ mvnw bin/database *.jar *.bak +target diff --git a/.project b/.project index bbbdc97..b059acf 100644 --- a/.project +++ b/.project @@ -21,12 +21,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.wst.validation.validationbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/doc/domain.ucls b/doc/domain.ucls index 7c6c1b1..5b9b384 100644 --- a/doc/domain.ucls +++ b/doc/domain.ucls @@ -1,8 +1,8 @@ - - + @@ -20,8 +21,9 @@ - + @@ -29,8 +31,8 @@ - - + @@ -48,8 +51,9 @@ - + @@ -57,8 +61,9 @@ - + @@ -66,81 +71,97 @@ - - - - - + - + - + - - - - - - - - - - - - - - - - - + - - + + + + + + - + - - - - - + - - + + + + + + - - + + - + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/it/whitebox/event/TicketApplication.java b/src/main/java/it/whitebox/event/TicketApplication.java deleted file mode 100644 index 553245a..0000000 --- a/src/main/java/it/whitebox/event/TicketApplication.java +++ /dev/null @@ -1,9 +0,0 @@ -package it.whitebox.event; - -//@SpringBootApplication -public class TicketApplication { - - public static void main(String[] args) { -// SpringApplication.run(TicketApplication.class, args); - } -} diff --git a/src/main/java/it/whitebox/event/business/TicketService.java b/src/main/java/it/whitebox/event/business/TicketService.java deleted file mode 100644 index 086c611..0000000 --- a/src/main/java/it/whitebox/event/business/TicketService.java +++ /dev/null @@ -1,23 +0,0 @@ -package it.whitebox.event.business; - -import java.util.Date; - -import it.whitebox.event.business.domain.Purchase; -import it.whitebox.event.business.domain.Subscription; -import it.whitebox.event.business.result.CreatePurchaseResponse; -import it.whitebox.event.business.result.CreateSubscriptionResponse; -import it.whitebox.event.business.result.GetSubscriptionResponse; -import it.whitebox.event.business.result.GetTicketsResponse; -import it.whitebox.event.business.result.ListPurchaseResponse; -import it.whitebox.event.business.result.ListSubscriptionResponse; - -public interface TicketService { - - public CreatePurchaseResponse createPurchase(Purchase purchase); - public ListPurchaseResponse listPurchases(Date startDate, Date endDate); - - public CreateSubscriptionResponse createSubscription(Subscription subscription); - public ListSubscriptionResponse listSubscriptions(); - public GetSubscriptionResponse getSubscription(String subscriberFirstLastName); - public GetTicketsResponse getTickets(String buyerName); -} diff --git a/src/main/java/it/whitebox/event/business/result/BusinessError.java b/src/main/java/it/whitebox/event/business/result/BusinessError.java deleted file mode 100644 index bf7aac8..0000000 --- a/src/main/java/it/whitebox/event/business/result/BusinessError.java +++ /dev/null @@ -1,5 +0,0 @@ -package it.whitebox.event.business.result; - -public class BusinessError { - -} diff --git a/src/main/java/it/whitebox/event/business/result/ServiceResult.java b/src/main/java/it/whitebox/event/business/result/ServiceResult.java deleted file mode 100644 index 679c27a..0000000 --- a/src/main/java/it/whitebox/event/business/result/ServiceResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package it.whitebox.event.business.result; - -public abstract class ServiceResult { - -} diff --git a/src/main/java/it/whitebox/event/config/MainApplicationContext.java b/src/main/java/it/whitebox/event/common/config/MainApplicationContext.java similarity index 99% rename from src/main/java/it/whitebox/event/config/MainApplicationContext.java rename to src/main/java/it/whitebox/event/common/config/MainApplicationContext.java index b693520..5de8d8c 100644 --- a/src/main/java/it/whitebox/event/config/MainApplicationContext.java +++ b/src/main/java/it/whitebox/event/common/config/MainApplicationContext.java @@ -1,4 +1,4 @@ -package it.whitebox.event.config; +package it.whitebox.event.common.config; import java.util.Properties; diff --git a/src/main/java/it/whitebox/event/config/StartupListener.java b/src/main/java/it/whitebox/event/common/config/StartupListener.java similarity index 94% rename from src/main/java/it/whitebox/event/config/StartupListener.java rename to src/main/java/it/whitebox/event/common/config/StartupListener.java index cd731aa..1810ef4 100644 --- a/src/main/java/it/whitebox/event/config/StartupListener.java +++ b/src/main/java/it/whitebox/event/common/config/StartupListener.java @@ -1,4 +1,4 @@ -package it.whitebox.event.config; +package it.whitebox.event.common.config; import org.apache.log4j.Logger; import org.springframework.context.ApplicationListener; diff --git a/src/main/java/it/whitebox/event/config/WebApplicationContext.java b/src/main/java/it/whitebox/event/common/config/WebApplicationContext.java similarity index 96% rename from src/main/java/it/whitebox/event/config/WebApplicationContext.java rename to src/main/java/it/whitebox/event/common/config/WebApplicationContext.java index a8d9e6e..5ed849b 100644 --- a/src/main/java/it/whitebox/event/config/WebApplicationContext.java +++ b/src/main/java/it/whitebox/event/common/config/WebApplicationContext.java @@ -1,4 +1,4 @@ -package it.whitebox.event.config; +package it.whitebox.event.common.config; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/src/main/java/it/whitebox/event/ticket/business/TicketService.java b/src/main/java/it/whitebox/event/ticket/business/TicketService.java new file mode 100644 index 0000000..96650f2 --- /dev/null +++ b/src/main/java/it/whitebox/event/ticket/business/TicketService.java @@ -0,0 +1,23 @@ +package it.whitebox.event.ticket.business; + +import java.util.Date; + +import it.whitebox.event.ticket.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Subscription; +import it.whitebox.event.ticket.business.result.CreatePurchaseResponse; +import it.whitebox.event.ticket.business.result.CreateSubscriptionResponse; +import it.whitebox.event.ticket.business.result.GetSubscriptionResponse; +import it.whitebox.event.ticket.business.result.GetTicketsResponse; +import it.whitebox.event.ticket.business.result.ListPurchaseResponse; +import it.whitebox.event.ticket.business.result.ListSubscriptionResponse; + +public interface TicketService { + + public CreatePurchaseResponse createPurchase(Purchase purchase); + public ListPurchaseResponse listPurchases(Date startDate, Date endDate); + + public CreateSubscriptionResponse createSubscription(Subscription subscription); + public ListSubscriptionResponse listSubscriptions(); + public GetSubscriptionResponse getSubscription(String subscriberFirstLastName); + public GetTicketsResponse getTickets(String buyerName); +} diff --git a/src/main/java/it/whitebox/event/business/TicketServiceImpl.java b/src/main/java/it/whitebox/event/ticket/business/TicketServiceImpl.java similarity index 86% rename from src/main/java/it/whitebox/event/business/TicketServiceImpl.java rename to src/main/java/it/whitebox/event/ticket/business/TicketServiceImpl.java index 354450e..0f2656c 100644 --- a/src/main/java/it/whitebox/event/business/TicketServiceImpl.java +++ b/src/main/java/it/whitebox/event/ticket/business/TicketServiceImpl.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business; +package it.whitebox.event.ticket.business; import java.text.SimpleDateFormat; import java.util.Date; @@ -13,23 +13,23 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import it.whitebox.event.business.domain.Purchase; -import it.whitebox.event.business.domain.Subscriber; -import it.whitebox.event.business.domain.Subscription; -import it.whitebox.event.business.domain.Ticket; -import it.whitebox.event.business.result.CreatePurchaseResponse; -import it.whitebox.event.business.result.CreateSubscriptionResponse; -import it.whitebox.event.business.result.GetSubscriptionResponse; -import it.whitebox.event.business.result.GetTicketsResponse; -import it.whitebox.event.business.result.ListPurchaseResponse; -import it.whitebox.event.business.result.ListSubscriptionResponse; -import it.whitebox.event.integration.db.PurchaseDao; -import it.whitebox.event.integration.db.PurchaseDaoCustom; -import it.whitebox.event.integration.db.ServiceDao; -import it.whitebox.event.integration.db.SubscriberDao; -import it.whitebox.event.integration.db.SubscriptionDao; -import it.whitebox.event.integration.db.SubscriptionDaoCustom; -import it.whitebox.event.integration.db.TicketDao; +import it.whitebox.event.ticket.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Subscriber; +import it.whitebox.event.ticket.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Ticket; +import it.whitebox.event.ticket.business.result.CreatePurchaseResponse; +import it.whitebox.event.ticket.business.result.CreateSubscriptionResponse; +import it.whitebox.event.ticket.business.result.GetSubscriptionResponse; +import it.whitebox.event.ticket.business.result.GetTicketsResponse; +import it.whitebox.event.ticket.business.result.ListPurchaseResponse; +import it.whitebox.event.ticket.business.result.ListSubscriptionResponse; +import it.whitebox.event.ticket.integration.db.PurchaseDao; +import it.whitebox.event.ticket.integration.db.PurchaseDaoCustom; +import it.whitebox.event.ticket.integration.db.ServiceDao; +import it.whitebox.event.ticket.integration.db.SubscriberDao; +import it.whitebox.event.ticket.integration.db.SubscriptionDao; +import it.whitebox.event.ticket.integration.db.SubscriptionDaoCustom; +import it.whitebox.event.ticket.integration.db.TicketDao; import lombok.Setter; /** @@ -98,7 +98,7 @@ public CreatePurchaseResponse createPurchase(Purchase purchase) { for (Iterator i=purchase.getTicketList().iterator(); i.hasNext();) { // manage ticket Ticket ticket = i.next(); - it.whitebox.event.business.domain.Service service = + it.whitebox.event.ticket.business.domain.Service service = serviceDao.findOne(ticket.getService().getId()); ticket = setProgressiveNumber(ticket, currTicket); currTicket+=1; diff --git a/src/main/java/it/whitebox/event/business/domain/BusinessEntity.java b/src/main/java/it/whitebox/event/ticket/business/domain/BusinessEntity.java similarity index 90% rename from src/main/java/it/whitebox/event/business/domain/BusinessEntity.java rename to src/main/java/it/whitebox/event/ticket/business/domain/BusinessEntity.java index 06464ec..7caabc5 100644 --- a/src/main/java/it/whitebox/event/business/domain/BusinessEntity.java +++ b/src/main/java/it/whitebox/event/ticket/business/domain/BusinessEntity.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.domain; +package it.whitebox.event.ticket.business.domain; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/src/main/java/it/whitebox/event/business/domain/Discount.java b/src/main/java/it/whitebox/event/ticket/business/domain/Discount.java similarity index 93% rename from src/main/java/it/whitebox/event/business/domain/Discount.java rename to src/main/java/it/whitebox/event/ticket/business/domain/Discount.java index 3aed0fc..67e92cb 100644 --- a/src/main/java/it/whitebox/event/business/domain/Discount.java +++ b/src/main/java/it/whitebox/event/ticket/business/domain/Discount.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.domain; +package it.whitebox.event.ticket.business.domain; import javax.persistence.Entity; import javax.persistence.Inheritance; diff --git a/src/main/java/it/whitebox/event/business/domain/Purchase.java b/src/main/java/it/whitebox/event/ticket/business/domain/Purchase.java similarity index 95% rename from src/main/java/it/whitebox/event/business/domain/Purchase.java rename to src/main/java/it/whitebox/event/ticket/business/domain/Purchase.java index e8419ea..077950a 100644 --- a/src/main/java/it/whitebox/event/business/domain/Purchase.java +++ b/src/main/java/it/whitebox/event/ticket/business/domain/Purchase.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.domain; +package it.whitebox.event.ticket.business.domain; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/it/whitebox/event/business/domain/Service.java b/src/main/java/it/whitebox/event/ticket/business/domain/Service.java similarity index 92% rename from src/main/java/it/whitebox/event/business/domain/Service.java rename to src/main/java/it/whitebox/event/ticket/business/domain/Service.java index debee52..01701e9 100644 --- a/src/main/java/it/whitebox/event/business/domain/Service.java +++ b/src/main/java/it/whitebox/event/ticket/business/domain/Service.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.domain; +package it.whitebox.event.ticket.business.domain; import javax.persistence.Entity; import javax.persistence.Inheritance; diff --git a/src/main/java/it/whitebox/event/business/domain/Subscriber.java b/src/main/java/it/whitebox/event/ticket/business/domain/Subscriber.java similarity index 94% rename from src/main/java/it/whitebox/event/business/domain/Subscriber.java rename to src/main/java/it/whitebox/event/ticket/business/domain/Subscriber.java index 55c8f58..7b33669 100644 --- a/src/main/java/it/whitebox/event/business/domain/Subscriber.java +++ b/src/main/java/it/whitebox/event/ticket/business/domain/Subscriber.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.domain; +package it.whitebox.event.ticket.business.domain; import java.util.Date; diff --git a/src/main/java/it/whitebox/event/business/domain/Subscription.java b/src/main/java/it/whitebox/event/ticket/business/domain/Subscription.java similarity index 94% rename from src/main/java/it/whitebox/event/business/domain/Subscription.java rename to src/main/java/it/whitebox/event/ticket/business/domain/Subscription.java index ffb5522..c5417c5 100644 --- a/src/main/java/it/whitebox/event/business/domain/Subscription.java +++ b/src/main/java/it/whitebox/event/ticket/business/domain/Subscription.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.domain; +package it.whitebox.event.ticket.business.domain; import java.util.Date; diff --git a/src/main/java/it/whitebox/event/business/domain/Ticket.java b/src/main/java/it/whitebox/event/ticket/business/domain/Ticket.java similarity index 95% rename from src/main/java/it/whitebox/event/business/domain/Ticket.java rename to src/main/java/it/whitebox/event/ticket/business/domain/Ticket.java index 9919ead..bc7b0aa 100644 --- a/src/main/java/it/whitebox/event/business/domain/Ticket.java +++ b/src/main/java/it/whitebox/event/ticket/business/domain/Ticket.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.domain; +package it.whitebox.event.ticket.business.domain; import java.util.Date; diff --git a/src/main/java/it/whitebox/event/ticket/business/result/BusinessError.java b/src/main/java/it/whitebox/event/ticket/business/result/BusinessError.java new file mode 100644 index 0000000..3d05afd --- /dev/null +++ b/src/main/java/it/whitebox/event/ticket/business/result/BusinessError.java @@ -0,0 +1,5 @@ +package it.whitebox.event.ticket.business.result; + +public class BusinessError { + +} diff --git a/src/main/java/it/whitebox/event/business/result/CreatePurchaseResponse.java b/src/main/java/it/whitebox/event/ticket/business/result/CreatePurchaseResponse.java similarity index 73% rename from src/main/java/it/whitebox/event/business/result/CreatePurchaseResponse.java rename to src/main/java/it/whitebox/event/ticket/business/result/CreatePurchaseResponse.java index b5a4cff..b173a4e 100644 --- a/src/main/java/it/whitebox/event/business/result/CreatePurchaseResponse.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/CreatePurchaseResponse.java @@ -1,6 +1,6 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; -import it.whitebox.event.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Purchase; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/it/whitebox/event/business/result/CreateSubscriptionResponse.java b/src/main/java/it/whitebox/event/ticket/business/result/CreateSubscriptionResponse.java similarity index 73% rename from src/main/java/it/whitebox/event/business/result/CreateSubscriptionResponse.java rename to src/main/java/it/whitebox/event/ticket/business/result/CreateSubscriptionResponse.java index cb14882..6e7ee44 100644 --- a/src/main/java/it/whitebox/event/business/result/CreateSubscriptionResponse.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/CreateSubscriptionResponse.java @@ -1,6 +1,6 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; -import it.whitebox.event.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Subscription; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/it/whitebox/event/business/result/GetSubscriptionResponse.java b/src/main/java/it/whitebox/event/ticket/business/result/GetSubscriptionResponse.java similarity index 69% rename from src/main/java/it/whitebox/event/business/result/GetSubscriptionResponse.java rename to src/main/java/it/whitebox/event/ticket/business/result/GetSubscriptionResponse.java index 3cdf901..4db2e1d 100644 --- a/src/main/java/it/whitebox/event/business/result/GetSubscriptionResponse.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/GetSubscriptionResponse.java @@ -1,10 +1,10 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; import java.util.ArrayList; import java.util.List; -import it.whitebox.event.business.domain.Subscriber; -import it.whitebox.event.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Subscriber; +import it.whitebox.event.ticket.business.domain.Subscription; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/it/whitebox/event/business/result/GetTicketsResponse.java b/src/main/java/it/whitebox/event/ticket/business/result/GetTicketsResponse.java similarity index 76% rename from src/main/java/it/whitebox/event/business/result/GetTicketsResponse.java rename to src/main/java/it/whitebox/event/ticket/business/result/GetTicketsResponse.java index 11ab6f0..ceffaec 100644 --- a/src/main/java/it/whitebox/event/business/result/GetTicketsResponse.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/GetTicketsResponse.java @@ -1,9 +1,9 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; import java.util.ArrayList; import java.util.List; -import it.whitebox.event.business.domain.Ticket; +import it.whitebox.event.ticket.business.domain.Ticket; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/it/whitebox/event/business/result/ListPurchaseResponse.java b/src/main/java/it/whitebox/event/ticket/business/result/ListPurchaseResponse.java similarity index 77% rename from src/main/java/it/whitebox/event/business/result/ListPurchaseResponse.java rename to src/main/java/it/whitebox/event/ticket/business/result/ListPurchaseResponse.java index 5b33245..5b828f2 100644 --- a/src/main/java/it/whitebox/event/business/result/ListPurchaseResponse.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/ListPurchaseResponse.java @@ -1,9 +1,9 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; import java.util.ArrayList; import java.util.List; -import it.whitebox.event.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Purchase; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/it/whitebox/event/business/result/ListSubscriptionResponse.java b/src/main/java/it/whitebox/event/ticket/business/result/ListSubscriptionResponse.java similarity index 77% rename from src/main/java/it/whitebox/event/business/result/ListSubscriptionResponse.java rename to src/main/java/it/whitebox/event/ticket/business/result/ListSubscriptionResponse.java index ebf83f3..efcb471 100644 --- a/src/main/java/it/whitebox/event/business/result/ListSubscriptionResponse.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/ListSubscriptionResponse.java @@ -1,9 +1,9 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; import java.util.ArrayList; import java.util.List; -import it.whitebox.event.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Subscription; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/it/whitebox/event/business/result/ResultFailure.java b/src/main/java/it/whitebox/event/ticket/business/result/ResultFailure.java similarity index 83% rename from src/main/java/it/whitebox/event/business/result/ResultFailure.java rename to src/main/java/it/whitebox/event/ticket/business/result/ResultFailure.java index cc27485..09c5353 100644 --- a/src/main/java/it/whitebox/event/business/result/ResultFailure.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/ResultFailure.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/it/whitebox/event/business/result/ResultSuccess.java b/src/main/java/it/whitebox/event/ticket/business/result/ResultSuccess.java similarity index 52% rename from src/main/java/it/whitebox/event/business/result/ResultSuccess.java rename to src/main/java/it/whitebox/event/ticket/business/result/ResultSuccess.java index 6529130..326ee83 100644 --- a/src/main/java/it/whitebox/event/business/result/ResultSuccess.java +++ b/src/main/java/it/whitebox/event/ticket/business/result/ResultSuccess.java @@ -1,4 +1,4 @@ -package it.whitebox.event.business.result; +package it.whitebox.event.ticket.business.result; public class ResultSuccess extends ServiceResult { diff --git a/src/main/java/it/whitebox/event/ticket/business/result/ServiceResult.java b/src/main/java/it/whitebox/event/ticket/business/result/ServiceResult.java new file mode 100644 index 0000000..65264f0 --- /dev/null +++ b/src/main/java/it/whitebox/event/ticket/business/result/ServiceResult.java @@ -0,0 +1,5 @@ +package it.whitebox.event.ticket.business.result; + +public abstract class ServiceResult { + +} diff --git a/src/main/java/it/whitebox/event/frontend/GlobalExceptionHandler.java b/src/main/java/it/whitebox/event/ticket/frontend/GlobalExceptionHandler.java similarity index 94% rename from src/main/java/it/whitebox/event/frontend/GlobalExceptionHandler.java rename to src/main/java/it/whitebox/event/ticket/frontend/GlobalExceptionHandler.java index 281825f..1443666 100644 --- a/src/main/java/it/whitebox/event/frontend/GlobalExceptionHandler.java +++ b/src/main/java/it/whitebox/event/ticket/frontend/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package it.whitebox.event.frontend; +package it.whitebox.event.ticket.frontend; import org.apache.log4j.Logger; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/it/whitebox/event/frontend/TicketCSVServiceImpl.java b/src/main/java/it/whitebox/event/ticket/frontend/TicketCSVServiceImpl.java similarity index 94% rename from src/main/java/it/whitebox/event/frontend/TicketCSVServiceImpl.java rename to src/main/java/it/whitebox/event/ticket/frontend/TicketCSVServiceImpl.java index 746db9a..5522909 100644 --- a/src/main/java/it/whitebox/event/frontend/TicketCSVServiceImpl.java +++ b/src/main/java/it/whitebox/event/ticket/frontend/TicketCSVServiceImpl.java @@ -1,4 +1,4 @@ -package it.whitebox.event.frontend; +package it.whitebox.event.ticket.frontend; import java.io.IOException; import java.text.DateFormat; @@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import it.whitebox.event.business.TicketService; -import it.whitebox.event.business.domain.Purchase; -import it.whitebox.event.business.domain.Ticket; +import it.whitebox.event.ticket.business.TicketService; +import it.whitebox.event.ticket.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Ticket; import lombok.Setter; /** diff --git a/src/main/java/it/whitebox/event/frontend/TicketRestServiceImpl.java b/src/main/java/it/whitebox/event/ticket/frontend/TicketRestServiceImpl.java similarity index 79% rename from src/main/java/it/whitebox/event/frontend/TicketRestServiceImpl.java rename to src/main/java/it/whitebox/event/ticket/frontend/TicketRestServiceImpl.java index 3c466d0..6ce64dd 100644 --- a/src/main/java/it/whitebox/event/frontend/TicketRestServiceImpl.java +++ b/src/main/java/it/whitebox/event/ticket/frontend/TicketRestServiceImpl.java @@ -1,4 +1,4 @@ -package it.whitebox.event.frontend; +package it.whitebox.event.ticket.frontend; import java.util.Date; @@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import it.whitebox.event.business.TicketService; -import it.whitebox.event.business.domain.Purchase; -import it.whitebox.event.business.domain.Subscription; -import it.whitebox.event.business.result.CreatePurchaseResponse; -import it.whitebox.event.business.result.CreateSubscriptionResponse; -import it.whitebox.event.business.result.GetSubscriptionResponse; -import it.whitebox.event.business.result.GetTicketsResponse; -import it.whitebox.event.business.result.ListPurchaseResponse; -import it.whitebox.event.business.result.ListSubscriptionResponse; +import it.whitebox.event.ticket.business.TicketService; +import it.whitebox.event.ticket.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Subscription; +import it.whitebox.event.ticket.business.result.CreatePurchaseResponse; +import it.whitebox.event.ticket.business.result.CreateSubscriptionResponse; +import it.whitebox.event.ticket.business.result.GetSubscriptionResponse; +import it.whitebox.event.ticket.business.result.GetTicketsResponse; +import it.whitebox.event.ticket.business.result.ListPurchaseResponse; +import it.whitebox.event.ticket.business.result.ListSubscriptionResponse; import lombok.Setter; /** diff --git a/src/main/java/it/whitebox/event/integration/db/PurchaseDao.java b/src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDao.java similarity index 74% rename from src/main/java/it/whitebox/event/integration/db/PurchaseDao.java rename to src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDao.java index 10c03f3..8fcbf1b 100644 --- a/src/main/java/it/whitebox/event/integration/db/PurchaseDao.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDao.java @@ -1,9 +1,9 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import it.whitebox.event.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Purchase; /** * DAO for the Purchase diff --git a/src/main/java/it/whitebox/event/integration/db/PurchaseDaoCustom.java b/src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDaoCustom.java similarity index 58% rename from src/main/java/it/whitebox/event/integration/db/PurchaseDaoCustom.java rename to src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDaoCustom.java index 3db133e..78b020d 100644 --- a/src/main/java/it/whitebox/event/integration/db/PurchaseDaoCustom.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDaoCustom.java @@ -1,9 +1,9 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import java.util.Date; import java.util.List; -import it.whitebox.event.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Purchase; public interface PurchaseDaoCustom { public List findByDate(Date startDate, Date endDate); diff --git a/src/main/java/it/whitebox/event/integration/db/PurchaseDaoCustomImpl.java b/src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDaoCustomImpl.java similarity index 94% rename from src/main/java/it/whitebox/event/integration/db/PurchaseDaoCustomImpl.java rename to src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDaoCustomImpl.java index 6eb7d86..5a267d6 100644 --- a/src/main/java/it/whitebox/event/integration/db/PurchaseDaoCustomImpl.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/PurchaseDaoCustomImpl.java @@ -1,4 +1,4 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import java.util.ArrayList; import java.util.Date; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import it.whitebox.event.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Purchase; import lombok.Setter; /** diff --git a/src/main/java/it/whitebox/event/integration/db/ServiceDao.java b/src/main/java/it/whitebox/event/ticket/integration/db/ServiceDao.java similarity index 76% rename from src/main/java/it/whitebox/event/integration/db/ServiceDao.java rename to src/main/java/it/whitebox/event/ticket/integration/db/ServiceDao.java index 9bcb994..ffbe995 100644 --- a/src/main/java/it/whitebox/event/integration/db/ServiceDao.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/ServiceDao.java @@ -1,9 +1,9 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import it.whitebox.event.business.domain.Service; +import it.whitebox.event.ticket.business.domain.Service; /** * DAO for the Service (to populate the DB) diff --git a/src/main/java/it/whitebox/event/integration/db/SubscriberDao.java b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriberDao.java similarity index 79% rename from src/main/java/it/whitebox/event/integration/db/SubscriberDao.java rename to src/main/java/it/whitebox/event/ticket/integration/db/SubscriberDao.java index 4371a23..b903f3c 100644 --- a/src/main/java/it/whitebox/event/integration/db/SubscriberDao.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriberDao.java @@ -1,11 +1,11 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import it.whitebox.event.business.domain.Subscriber; +import it.whitebox.event.ticket.business.domain.Subscriber; /** * DAO for the Subscriber diff --git a/src/main/java/it/whitebox/event/integration/db/SubscriptionDao.java b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDao.java similarity index 79% rename from src/main/java/it/whitebox/event/integration/db/SubscriptionDao.java rename to src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDao.java index c5bec25..cb29541 100644 --- a/src/main/java/it/whitebox/event/integration/db/SubscriptionDao.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDao.java @@ -1,11 +1,11 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import it.whitebox.event.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Subscription; /** * DAO for the Subscription diff --git a/src/main/java/it/whitebox/event/integration/db/SubscriptionDaoCustom.java b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDaoCustom.java similarity index 71% rename from src/main/java/it/whitebox/event/integration/db/SubscriptionDaoCustom.java rename to src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDaoCustom.java index 57e56aa..fe68aff 100644 --- a/src/main/java/it/whitebox/event/integration/db/SubscriptionDaoCustom.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDaoCustom.java @@ -1,8 +1,8 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import java.util.List; -import it.whitebox.event.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Subscription; /** * Interface for the custom Subscription DAO diff --git a/src/main/java/it/whitebox/event/integration/db/SubscriptionDaoCustomImpl.java b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDaoCustomImpl.java similarity index 93% rename from src/main/java/it/whitebox/event/integration/db/SubscriptionDaoCustomImpl.java rename to src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDaoCustomImpl.java index f61bc7e..8c4252d 100644 --- a/src/main/java/it/whitebox/event/integration/db/SubscriptionDaoCustomImpl.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/SubscriptionDaoCustomImpl.java @@ -1,4 +1,4 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import java.util.List; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import it.whitebox.event.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Subscription; import lombok.Setter; /** diff --git a/src/main/java/it/whitebox/event/integration/db/TcktNamingStrategy.java b/src/main/java/it/whitebox/event/ticket/integration/db/TcktNamingStrategy.java similarity index 90% rename from src/main/java/it/whitebox/event/integration/db/TcktNamingStrategy.java rename to src/main/java/it/whitebox/event/ticket/integration/db/TcktNamingStrategy.java index 4069e24..8734349 100644 --- a/src/main/java/it/whitebox/event/integration/db/TcktNamingStrategy.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/TcktNamingStrategy.java @@ -1,4 +1,4 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import org.hibernate.cfg.ImprovedNamingStrategy; diff --git a/src/main/java/it/whitebox/event/integration/db/TicketDao.java b/src/main/java/it/whitebox/event/ticket/integration/db/TicketDao.java similarity index 80% rename from src/main/java/it/whitebox/event/integration/db/TicketDao.java rename to src/main/java/it/whitebox/event/ticket/integration/db/TicketDao.java index 73aa1d0..228daea 100644 --- a/src/main/java/it/whitebox/event/integration/db/TicketDao.java +++ b/src/main/java/it/whitebox/event/ticket/integration/db/TicketDao.java @@ -1,11 +1,11 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import it.whitebox.event.business.domain.Ticket; +import it.whitebox.event.ticket.business.domain.Ticket; /** * DAO for the Ticket diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml index bdd32d4..ddacb56 100644 --- a/src/main/resources/applicationContext.xml +++ b/src/main/resources/applicationContext.xml @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/src/main/resources/ticket.properties b/src/main/resources/ticket.properties index 15a4073..4aab4e8 100644 --- a/src/main/resources/ticket.properties +++ b/src/main/resources/ticket.properties @@ -20,9 +20,9 @@ db.password= hibernate.createDb=false hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.format_sql=true -hibernate.ejb.naming_strategy=it.whitebox.event.integration.db.TcktNamingStrategy +hibernate.ejb.naming_strategy=it.whitebox.event.ticket.integration.db.TcktNamingStrategy hibernate.show_sql=false #EntityManager #Declares the base package of the entity classes -entitymanager.packages.to.scan=it.whitebox.event.business.domain \ No newline at end of file +entitymanager.packages.to.scan=it.whitebox.event.ticket.business.domain \ No newline at end of file diff --git a/src/test/java/it/whitebox/event/BaseJunit4TestCase.java b/src/test/java/it/whitebox/event/BaseJunit4TestCase.java index 056b796..cad41af 100644 --- a/src/test/java/it/whitebox/event/BaseJunit4TestCase.java +++ b/src/test/java/it/whitebox/event/BaseJunit4TestCase.java @@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; -import it.whitebox.event.config.MainApplicationContext; +import it.whitebox.event.common.config.MainApplicationContext; import junit.framework.TestCase; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/it/whitebox/event/frontend/JsonMarshaller.java b/src/test/java/it/whitebox/event/ticket/frontend/JsonMarshaller.java similarity index 76% rename from src/test/java/it/whitebox/event/frontend/JsonMarshaller.java rename to src/test/java/it/whitebox/event/ticket/frontend/JsonMarshaller.java index 15af3a2..14dea3a 100644 --- a/src/test/java/it/whitebox/event/frontend/JsonMarshaller.java +++ b/src/test/java/it/whitebox/event/ticket/frontend/JsonMarshaller.java @@ -1,4 +1,4 @@ -package it.whitebox.event.frontend; +package it.whitebox.event.ticket.frontend; import java.util.ArrayList; import java.util.Date; @@ -6,12 +6,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import it.whitebox.event.business.domain.Discount; -import it.whitebox.event.business.domain.Purchase; -import it.whitebox.event.business.domain.Service; -import it.whitebox.event.business.domain.Subscriber; -import it.whitebox.event.business.domain.Subscription; -import it.whitebox.event.business.domain.Ticket; +import it.whitebox.event.ticket.business.domain.Discount; +import it.whitebox.event.ticket.business.domain.Purchase; +import it.whitebox.event.ticket.business.domain.Service; +import it.whitebox.event.ticket.business.domain.Subscriber; +import it.whitebox.event.ticket.business.domain.Subscription; +import it.whitebox.event.ticket.business.domain.Ticket; /** * Creates JSON objects from java one. diff --git a/src/test/java/it/whitebox/event/integration/db/DatabaseCreatorBatch.java b/src/test/java/it/whitebox/event/ticket/integration/db/DatabaseCreatorBatch.java similarity index 90% rename from src/test/java/it/whitebox/event/integration/db/DatabaseCreatorBatch.java rename to src/test/java/it/whitebox/event/ticket/integration/db/DatabaseCreatorBatch.java index 9438b89..fe7f03d 100644 --- a/src/test/java/it/whitebox/event/integration/db/DatabaseCreatorBatch.java +++ b/src/test/java/it/whitebox/event/ticket/integration/db/DatabaseCreatorBatch.java @@ -1,4 +1,4 @@ -package it.whitebox.event.integration.db; +package it.whitebox.event.ticket.integration.db; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -6,7 +6,7 @@ import org.springframework.transaction.annotation.Transactional; import it.whitebox.event.BaseJunit4TestCase; -import it.whitebox.event.business.domain.Service; +import it.whitebox.event.ticket.business.domain.Service; import lombok.Setter;