From fcf4d81fae6d0b75523821cc6837eca9b62ee42a Mon Sep 17 00:00:00 2001 From: Pete Muir Date: Tue, 1 May 2012 15:20:44 +0100 Subject: [PATCH] Minor cleanup --- pom.xml | 5 ++--- .../org/jboss/jdf/example/ticketmonster/model/Address.java | 3 +-- .../org/jboss/jdf/example/ticketmonster/model/Booking.java | 4 +--- .../org/jboss/jdf/example/ticketmonster/model/Event.java | 1 - .../org/jboss/jdf/example/ticketmonster/model/Section.java | 2 -- .../java/org/jboss/jdf/example/ticketmonster/model/Show.java | 2 -- .../org/jboss/jdf/example/ticketmonster/model/Ticket.java | 1 - .../jboss/jdf/example/ticketmonster/rest/ShowService.java | 2 ++ .../jdf/example/ticketmonster/service/MediaManager.java | 2 -- .../example/ticketmonster/service/SeatAllocationService.java | 2 +- 10 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 339153702..7cc2f15db 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ + the TicketMonster booking monitor --> org.jboss.errai errai-bus @@ -186,7 +186,7 @@ mvel2 - + org.jboss.errai errai-cdi-client @@ -222,7 +222,6 @@ gwt-dev provided - diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Address.java b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Address.java index 8e52fcdf9..d1d4a0453 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Address.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Address.java @@ -19,12 +19,11 @@ * @author Marius Bogoevici * @author Pete Muir */ +@SuppressWarnings("serial") @Embeddable @Portable public class Address implements Serializable { - private static final long serialVersionUID = -1; - /* Declaration of fields */ private String street; private String city; diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Booking.java b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Booking.java index 13de54852..befb55cd9 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Booking.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Booking.java @@ -4,7 +4,6 @@ import static javax.persistence.FetchType.EAGER; import static javax.persistence.GenerationType.IDENTITY; -import java.math.BigDecimal; import java.io.Serializable; import java.util.Date; import java.util.HashSet; @@ -35,12 +34,11 @@ * * @author Marius Bogoevici */ +@SuppressWarnings("serial") @Entity @Portable public class Booking implements Serializable { - private static final long serialVersionUID = -1; - /* Declaration of fields */ /** diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Event.java b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Event.java index a502c2834..c2d3d98e6 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Event.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Event.java @@ -12,7 +12,6 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.hibernate.validator.constraints.NotEmpty; import org.jboss.errai.common.client.api.annotations.Portable; /** diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Section.java b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Section.java index 525bfd12e..1d16cacc3 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Section.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Section.java @@ -3,8 +3,6 @@ import static javax.persistence.GenerationType.IDENTITY; import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Show.java b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Show.java index e611c6589..673aa6c73 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Show.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Show.java @@ -18,8 +18,6 @@ import javax.persistence.UniqueConstraint; import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.NotEmpty; import org.jboss.errai.common.client.api.annotations.Portable; /** diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Ticket.java b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Ticket.java index c9cf56308..12743f5bd 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/model/Ticket.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/model/Ticket.java @@ -10,7 +10,6 @@ import javax.persistence.ManyToOne; import javax.validation.constraints.NotNull; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.jboss.errai.common.client.api.annotations.Portable; /** diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/rest/ShowService.java b/src/main/java/org/jboss/jdf/example/ticketmonster/rest/ShowService.java index 25bc806b6..cebd6a8a7 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/rest/ShowService.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/rest/ShowService.java @@ -57,6 +57,8 @@ protected Predicate[] extractPredicates(MultivaluedMap> getPricing(@PathParam("showId") Long showId) { Query query = getEntityManager().createQuery("select pc from PriceCategory pc where pc.show.id = :showId order by pc.section.id"); query.setParameter("showId", showId); + + @SuppressWarnings("unchecked") List priceCategories = query.getResultList(); Map> priceCategoryMap = new LinkedHashMap> (); diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/service/MediaManager.java b/src/main/java/org/jboss/jdf/example/ticketmonster/service/MediaManager.java index 6aaef9041..a25207ee8 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/service/MediaManager.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/service/MediaManager.java @@ -18,9 +18,7 @@ import java.util.Map; import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; import javax.inject.Named; -import javax.persistence.EntityManager; import org.jboss.jdf.example.ticketmonster.model.MediaItem; import org.jboss.jdf.example.ticketmonster.model.MediaType; diff --git a/src/main/java/org/jboss/jdf/example/ticketmonster/service/SeatAllocationService.java b/src/main/java/org/jboss/jdf/example/ticketmonster/service/SeatAllocationService.java index 63fd5f2e1..54dcbf819 100644 --- a/src/main/java/org/jboss/jdf/example/ticketmonster/service/SeatAllocationService.java +++ b/src/main/java/org/jboss/jdf/example/ticketmonster/service/SeatAllocationService.java @@ -7,7 +7,6 @@ import javax.persistence.EntityManager; import javax.persistence.NoResultException; -import org.jboss.jdf.example.ticketmonster.model.Booking; import org.jboss.jdf.example.ticketmonster.model.Performance; import org.jboss.jdf.example.ticketmonster.model.Seat; import org.jboss.jdf.example.ticketmonster.model.Section; @@ -16,6 +15,7 @@ /** * @author Marius Bogoevici */ +@SuppressWarnings("serial") public class SeatAllocationService implements Serializable { @Inject