diff --git a/src/main/java/org/eclipse/cargotracker/application/BookingService.java b/src/main/java/org/eclipse/cargotracker/application/BookingService.java index cbc4bfb07..31d643d6a 100644 --- a/src/main/java/org/eclipse/cargotracker/application/BookingService.java +++ b/src/main/java/org/eclipse/cargotracker/application/BookingService.java @@ -2,9 +2,11 @@ import java.time.LocalDate; import java.util.List; + import javax.validation.Valid; import javax.validation.constraints.Future; import javax.validation.constraints.NotNull; + import org.eclipse.cargotracker.domain.model.cargo.Itinerary; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; import org.eclipse.cargotracker.domain.model.location.UnLocode; diff --git a/src/main/java/org/eclipse/cargotracker/application/CargoInspectionService.java b/src/main/java/org/eclipse/cargotracker/application/CargoInspectionService.java index 19a35a9c6..63834431c 100644 --- a/src/main/java/org/eclipse/cargotracker/application/CargoInspectionService.java +++ b/src/main/java/org/eclipse/cargotracker/application/CargoInspectionService.java @@ -2,6 +2,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; + import org.eclipse.cargotracker.domain.model.cargo.TrackingId; public interface CargoInspectionService { diff --git a/src/main/java/org/eclipse/cargotracker/application/HandlingEventService.java b/src/main/java/org/eclipse/cargotracker/application/HandlingEventService.java index 49c649405..85b9937da 100644 --- a/src/main/java/org/eclipse/cargotracker/application/HandlingEventService.java +++ b/src/main/java/org/eclipse/cargotracker/application/HandlingEventService.java @@ -1,8 +1,10 @@ package org.eclipse.cargotracker.application; import java.time.LocalDateTime; + import javax.validation.Valid; import javax.validation.constraints.NotNull; + import org.eclipse.cargotracker.domain.model.cargo.TrackingId; import org.eclipse.cargotracker.domain.model.handling.CannotCreateHandlingEventException; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; diff --git a/src/main/java/org/eclipse/cargotracker/application/internal/DefaultBookingService.java b/src/main/java/org/eclipse/cargotracker/application/internal/DefaultBookingService.java index ee8328f90..67c5860b3 100644 --- a/src/main/java/org/eclipse/cargotracker/application/internal/DefaultBookingService.java +++ b/src/main/java/org/eclipse/cargotracker/application/internal/DefaultBookingService.java @@ -5,8 +5,10 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import javax.ejb.Stateless; import javax.inject.Inject; + import org.eclipse.cargotracker.application.BookingService; import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.CargoRepository; diff --git a/src/main/java/org/eclipse/cargotracker/application/internal/DefaultCargoInspectionService.java b/src/main/java/org/eclipse/cargotracker/application/internal/DefaultCargoInspectionService.java index f24f87de3..9c9a91464 100644 --- a/src/main/java/org/eclipse/cargotracker/application/internal/DefaultCargoInspectionService.java +++ b/src/main/java/org/eclipse/cargotracker/application/internal/DefaultCargoInspectionService.java @@ -2,8 +2,10 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.ejb.Stateless; import javax.inject.Inject; + import org.eclipse.cargotracker.application.ApplicationEvents; import org.eclipse.cargotracker.application.CargoInspectionService; import org.eclipse.cargotracker.domain.model.cargo.Cargo; diff --git a/src/main/java/org/eclipse/cargotracker/application/internal/DefaultHandlingEventService.java b/src/main/java/org/eclipse/cargotracker/application/internal/DefaultHandlingEventService.java index e97896551..3f4334fca 100644 --- a/src/main/java/org/eclipse/cargotracker/application/internal/DefaultHandlingEventService.java +++ b/src/main/java/org/eclipse/cargotracker/application/internal/DefaultHandlingEventService.java @@ -2,8 +2,10 @@ import java.time.LocalDateTime; import java.util.logging.Logger; + import javax.ejb.Stateless; import javax.inject.Inject; + import org.eclipse.cargotracker.application.ApplicationEvents; import org.eclipse.cargotracker.application.HandlingEventService; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; diff --git a/src/main/java/org/eclipse/cargotracker/application/util/RestConfiguration.java b/src/main/java/org/eclipse/cargotracker/application/util/RestConfiguration.java index 22e057015..8046674ac 100644 --- a/src/main/java/org/eclipse/cargotracker/application/util/RestConfiguration.java +++ b/src/main/java/org/eclipse/cargotracker/application/util/RestConfiguration.java @@ -1,11 +1,12 @@ package org.eclipse.cargotracker.application.util; -import org.glassfish.jersey.server.ServerProperties; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; -import java.util.HashMap; -import java.util.Map; + +import org.glassfish.jersey.server.ServerProperties; /** Jakarta REST configuration. */ @ApplicationPath("rest") diff --git a/src/main/java/org/eclipse/cargotracker/application/util/SampleDataGenerator.java b/src/main/java/org/eclipse/cargotracker/application/util/SampleDataGenerator.java index 30cf2d689..3ae4ed0f3 100644 --- a/src/main/java/org/eclipse/cargotracker/application/util/SampleDataGenerator.java +++ b/src/main/java/org/eclipse/cargotracker/application/util/SampleDataGenerator.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import java.util.logging.Logger; + import javax.annotation.PostConstruct; import javax.ejb.Singleton; import javax.ejb.Startup; @@ -13,6 +14,7 @@ import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.Itinerary; import org.eclipse.cargotracker.domain.model.cargo.Leg; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Cargo.java b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Cargo.java index e63648bd7..b2de645c2 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Cargo.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Cargo.java @@ -1,6 +1,7 @@ package org.eclipse.cargotracker.domain.model.cargo; import java.io.Serializable; + import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -9,6 +10,7 @@ import javax.persistence.ManyToOne; import javax.persistence.NamedQuery; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; import org.eclipse.cargotracker.domain.model.handling.HandlingHistory; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Delivery.java b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Delivery.java index 8c4721b30..314a1a88e 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Delivery.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Delivery.java @@ -13,6 +13,7 @@ import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.Iterator; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.Embedded; @@ -21,6 +22,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/HandlingActivity.java b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/HandlingActivity.java index 78467a511..69cf4acbe 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/HandlingActivity.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/HandlingActivity.java @@ -1,6 +1,7 @@ package org.eclipse.cargotracker.domain.model.cargo; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.EnumType; @@ -8,6 +9,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Itinerary.java b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Itinerary.java index aee57ab9a..7513e4bbc 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Itinerary.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Itinerary.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import java.util.Collections; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Embeddable; import javax.persistence.JoinColumn; @@ -11,6 +12,7 @@ import javax.persistence.OrderColumn; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; + import org.apache.commons.lang3.Validate; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; import org.eclipse.cargotracker.domain.model.location.Location; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Leg.java b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Leg.java index 4c2c7015b..b8257b992 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Leg.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/Leg.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -10,6 +11,7 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecification.java b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecification.java index f0925c046..988da5c24 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecification.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecification.java @@ -2,11 +2,13 @@ import java.io.Serializable; import java.time.LocalDate; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/TrackingId.java b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/TrackingId.java index 4e202974f..403765323 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/cargo/TrackingId.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/cargo/TrackingId.java @@ -1,9 +1,11 @@ package org.eclipse.cargotracker.domain.model.cargo; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.NotEmpty; + import org.apache.commons.lang3.Validate; /** Uniquely identifies a particular cargo. Automatically generated by the application. */ diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEvent.java b/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEvent.java index 1cea64df9..78dc95b01 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEvent.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEvent.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; @@ -14,6 +15,7 @@ import javax.persistence.NamedQuery; import javax.persistence.Transient; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventFactory.java b/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventFactory.java index 3a16ce65c..8115a275b 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventFactory.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventFactory.java @@ -2,8 +2,10 @@ import java.io.Serializable; import java.time.LocalDateTime; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.CargoRepository; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistory.java b/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistory.java index 8c4d22e0b..b3bb0045b 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistory.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistory.java @@ -6,6 +6,7 @@ import java.util.Comparator; import java.util.HashSet; import java.util.List; + import org.apache.commons.lang3.Validate; public class HandlingHistory { diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/location/Location.java b/src/main/java/org/eclipse/cargotracker/domain/model/location/Location.java index 68bc3305d..a62829bf0 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/location/Location.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/location/Location.java @@ -1,6 +1,7 @@ package org.eclipse.cargotracker.domain.model.location; import java.io.Serializable; + import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -8,6 +9,7 @@ import javax.persistence.NamedQuery; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; /** diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/location/UnLocode.java b/src/main/java/org/eclipse/cargotracker/domain/model/location/UnLocode.java index f77f1070c..912d2232a 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/location/UnLocode.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/location/UnLocode.java @@ -1,9 +1,11 @@ package org.eclipse.cargotracker.domain.model.location; import java.io.Serializable; + import javax.persistence.Embeddable; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; + import org.apache.commons.lang3.Validate; /** diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/CarrierMovement.java b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/CarrierMovement.java index 87a4f1e2e..6838910e0 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/CarrierMovement.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/CarrierMovement.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -11,6 +12,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/SampleVoyages.java b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/SampleVoyages.java index fbe13640c..5e21f7f2f 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/SampleVoyages.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/SampleVoyages.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.eclipse.cargotracker.domain.model.location.Location; import org.eclipse.cargotracker.domain.model.location.SampleLocations; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Schedule.java b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Schedule.java index c11a00475..7d114d8e3 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Schedule.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Schedule.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Collections; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Embeddable; import javax.persistence.JoinColumn; @@ -10,6 +11,7 @@ import javax.persistence.OrderColumn; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Voyage.java b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Voyage.java index 559af31a4..6b41b4938 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Voyage.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/Voyage.java @@ -4,12 +4,14 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; + import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.NamedQuery; import javax.validation.constraints.NotNull; + import org.apache.commons.lang3.Validate; import org.eclipse.cargotracker.domain.model.location.Location; diff --git a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/VoyageNumber.java b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/VoyageNumber.java index 8c0a5f6f2..efb1642d9 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/model/voyage/VoyageNumber.java +++ b/src/main/java/org/eclipse/cargotracker/domain/model/voyage/VoyageNumber.java @@ -1,9 +1,11 @@ package org.eclipse.cargotracker.domain.model.voyage; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.validation.constraints.NotEmpty; + import org.apache.commons.lang3.Validate; @Embeddable diff --git a/src/main/java/org/eclipse/cargotracker/domain/service/RoutingService.java b/src/main/java/org/eclipse/cargotracker/domain/service/RoutingService.java index cf79b50f0..5aa2fc9ef 100644 --- a/src/main/java/org/eclipse/cargotracker/domain/service/RoutingService.java +++ b/src/main/java/org/eclipse/cargotracker/domain/service/RoutingService.java @@ -1,6 +1,7 @@ package org.eclipse.cargotracker.domain.service; import java.util.List; + import org.eclipse.cargotracker.domain.model.cargo.Itinerary; import org.eclipse.cargotracker.domain.model.cargo.RouteSpecification; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/events/cdi/CargoUpdated.java b/src/main/java/org/eclipse/cargotracker/infrastructure/events/cdi/CargoUpdated.java index 14c794cc1..21a272c56 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/events/cdi/CargoUpdated.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/events/cdi/CargoUpdated.java @@ -6,6 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.inject.Qualifier; @Qualifier diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/logging/LoggerProducer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/logging/LoggerProducer.java index 1f37d5765..8fbc7b7f8 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/logging/LoggerProducer.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/logging/LoggerProducer.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.logging.Logger; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java index 903171a81..45b025e9f 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java @@ -2,6 +2,7 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; import javax.inject.Inject; @@ -9,6 +10,7 @@ import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.TextMessage; + import org.eclipse.cargotracker.application.CargoInspectionService; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java index 38d11182f..43998fd68 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java @@ -2,6 +2,7 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; import javax.inject.Inject; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java index ef90e169f..ab838c9a4 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java @@ -7,6 +7,7 @@ import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.ObjectMessage; + import org.eclipse.cargotracker.application.HandlingEventService; import org.eclipse.cargotracker.domain.model.handling.CannotCreateHandlingEventException; import org.eclipse.cargotracker.interfaces.handling.HandlingEventRegistrationAttempt; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java index 8876042b7..0eec7d848 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java @@ -3,11 +3,13 @@ import java.io.Serializable; import java.util.logging.Level; import java.util.logging.Logger; + import javax.annotation.Resource; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.jms.Destination; import javax.jms.JMSContext; + import org.eclipse.cargotracker.application.ApplicationEvents; import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java index 9271e0f93..960373804 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java @@ -2,6 +2,7 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; import javax.inject.Inject; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java index 5d33d56e0..0f6d175e9 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java @@ -2,6 +2,7 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; import javax.inject.Inject; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaCargoRepository.java b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaCargoRepository.java index 8ebbec257..596b62a11 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaCargoRepository.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaCargoRepository.java @@ -5,12 +5,14 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; + import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Event; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.CargoRepository; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaHandlingEventRepository.java b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaHandlingEventRepository.java index 3f28c75fd..f72587f46 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaHandlingEventRepository.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaHandlingEventRepository.java @@ -1,9 +1,11 @@ package org.eclipse.cargotracker.infrastructure.persistence.jpa; import java.io.Serializable; + import javax.enterprise.context.ApplicationScoped; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; + import org.eclipse.cargotracker.domain.model.cargo.TrackingId; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; import org.eclipse.cargotracker.domain.model.handling.HandlingEventRepository; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaLocationRepository.java b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaLocationRepository.java index b6fb47f3b..080a31299 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaLocationRepository.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaLocationRepository.java @@ -2,9 +2,11 @@ import java.io.Serializable; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; + import org.eclipse.cargotracker.domain.model.location.Location; import org.eclipse.cargotracker.domain.model.location.LocationRepository; import org.eclipse.cargotracker.domain.model.location.UnLocode; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaVoyageRepository.java b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaVoyageRepository.java index ab0b4cea8..1383f6959 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaVoyageRepository.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/persistence/jpa/JpaVoyageRepository.java @@ -2,9 +2,11 @@ import java.io.Serializable; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; + import org.eclipse.cargotracker.domain.model.voyage.Voyage; import org.eclipse.cargotracker.domain.model.voyage.VoyageNumber; import org.eclipse.cargotracker.domain.model.voyage.VoyageRepository; diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingService.java b/src/main/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingService.java index c94a4cdbd..30fce9bf1 100644 --- a/src/main/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingService.java +++ b/src/main/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingService.java @@ -5,6 +5,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; + import javax.annotation.PostConstruct; import javax.annotation.Resource; import javax.ejb.Stateless; @@ -14,6 +15,7 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; + import org.eclipse.cargotracker.domain.model.cargo.Itinerary; import org.eclipse.cargotracker.domain.model.cargo.Leg; import org.eclipse.cargotracker.domain.model.cargo.RouteSpecification; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/CoordinatesFactory.java b/src/main/java/org/eclipse/cargotracker/interfaces/CoordinatesFactory.java index 9dd9f7117..d5b1cd9ef 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/CoordinatesFactory.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/CoordinatesFactory.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; + import org.eclipse.cargotracker.domain.model.location.Location; import org.eclipse.cargotracker.domain.model.location.UnLocode; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/BookingServiceFacade.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/BookingServiceFacade.java index d472abd64..e58e47a39 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/BookingServiceFacade.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/BookingServiceFacade.java @@ -2,6 +2,7 @@ import java.time.LocalDate; import java.util.List; + import org.eclipse.cargotracker.interfaces.booking.facade.dto.CargoRoute; import org.eclipse.cargotracker.interfaces.booking.facade.dto.CargoStatus; import org.eclipse.cargotracker.interfaces.booking.facade.dto.Location; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/CargoRoute.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/CargoRoute.java index c4f371b83..2c6250870 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/CargoRoute.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/CargoRoute.java @@ -4,6 +4,7 @@ import java.time.LocalDate; import java.util.Collections; import java.util.List; + import org.eclipse.cargotracker.application.util.DateConverter; /** DTO for registering and routing a cargo. */ diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/Leg.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/Leg.java index d9e08497c..84db5f891 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/Leg.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/dto/Leg.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.time.LocalDateTime; + import org.eclipse.cargotracker.application.util.DateConverter; /** DTO for a leg in an itinerary. */ diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/DefaultBookingServiceFacade.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/DefaultBookingServiceFacade.java index 89ab55f31..72701c747 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/DefaultBookingServiceFacade.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/DefaultBookingServiceFacade.java @@ -5,9 +5,9 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.transaction.Transactional; import org.eclipse.cargotracker.application.BookingService; import org.eclipse.cargotracker.domain.model.cargo.Cargo; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoRouteDtoAssembler.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoRouteDtoAssembler.java index e9ae4307b..b584092d7 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoRouteDtoAssembler.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoRouteDtoAssembler.java @@ -3,8 +3,10 @@ import static java.util.stream.Collectors.toList; import java.util.List; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.RoutingStatus; import org.eclipse.cargotracker.domain.model.cargo.TransportStatus; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoStatusDtoAssembler.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoStatusDtoAssembler.java index 230e12e3d..8ac5d50b8 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoStatusDtoAssembler.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/CargoStatusDtoAssembler.java @@ -3,8 +3,10 @@ import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.Delivery; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/ItineraryCandidateDtoAssembler.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/ItineraryCandidateDtoAssembler.java index 1d8e42ad1..2203d99f0 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/ItineraryCandidateDtoAssembler.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/ItineraryCandidateDtoAssembler.java @@ -3,8 +3,10 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; + import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.domain.model.cargo.Itinerary; import org.eclipse.cargotracker.domain.model.cargo.Leg; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/LocationDtoAssembler.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/LocationDtoAssembler.java index aed478124..76cd54390 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/LocationDtoAssembler.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/LocationDtoAssembler.java @@ -3,7 +3,9 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; + import javax.enterprise.context.ApplicationScoped; + import org.eclipse.cargotracker.domain.model.location.Location; @ApplicationScoped diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/TrackingEventsDtoAssembler.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/TrackingEventsDtoAssembler.java index 6e7c4306d..fa165ff9f 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/TrackingEventsDtoAssembler.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/facade/internal/assembler/TrackingEventsDtoAssembler.java @@ -1,6 +1,7 @@ package org.eclipse.cargotracker.interfaces.booking.facade.internal.assembler; import javax.enterprise.context.ApplicationScoped; + import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java index 4073a1e8b..edf4ec888 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java @@ -2,6 +2,7 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.ejb.Singleton; @@ -16,6 +17,7 @@ import javax.ws.rs.sse.Sse; import javax.ws.rs.sse.SseBroadcaster; import javax.ws.rs.sse.SseEventSink; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.CargoRepository; import org.eclipse.cargotracker.infrastructure.events.cdi.CargoUpdated; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingViewAdapter.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingViewAdapter.java index 2301a60d9..e2f6dcc76 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingViewAdapter.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingViewAdapter.java @@ -2,6 +2,7 @@ import java.util.EnumMap; import java.util.Map; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.RoutingStatus; import org.eclipse.cargotracker.domain.model.cargo.TransportStatus; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Booking.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Booking.java index 2ae3f1c55..2549da5a4 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Booking.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Booking.java @@ -5,12 +5,14 @@ import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; + import javax.annotation.PostConstruct; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; import javax.faces.flow.FlowScoped; import javax.inject.Inject; import javax.inject.Named; + import org.eclipse.cargotracker.interfaces.booking.facade.BookingServiceFacade; import org.eclipse.cargotracker.interfaces.booking.facade.dto.Location; import org.primefaces.PrimeFaces; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/CargoDetails.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/CargoDetails.java index 499cd0ac2..0d6f888ab 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/CargoDetails.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/CargoDetails.java @@ -3,6 +3,7 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.inject.Named; + import org.eclipse.cargotracker.interfaces.booking.facade.BookingServiceFacade; import org.eclipse.cargotracker.interfaces.booking.facade.dto.CargoRoute; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadline.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadline.java index 6a37bc697..19f2220f1 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadline.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadline.java @@ -2,9 +2,11 @@ import java.io.Serializable; import java.time.LocalDate; + import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; + import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.interfaces.booking.facade.BookingServiceFacade; import org.eclipse.cargotracker.interfaces.booking.facade.dto.CargoRoute; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadlineDialog.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadlineDialog.java index bfdee97a1..b7a9a7e8b 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadlineDialog.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeArrivalDeadlineDialog.java @@ -5,8 +5,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.enterprise.context.SessionScoped; import javax.inject.Named; + import org.primefaces.PrimeFaces; import org.primefaces.event.SelectEvent; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestination.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestination.java index a329b073b..03aa734aa 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestination.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestination.java @@ -3,9 +3,11 @@ import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; + import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; + import org.eclipse.cargotracker.interfaces.booking.facade.BookingServiceFacade; import org.eclipse.cargotracker.interfaces.booking.facade.dto.CargoRoute; import org.eclipse.cargotracker.interfaces.booking.facade.dto.Location; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestinationDialog.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestinationDialog.java index 0ce68ea42..88d3ae462 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestinationDialog.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ChangeDestinationDialog.java @@ -5,8 +5,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.enterprise.context.SessionScoped; import javax.inject.Named; + import org.primefaces.PrimeFaces; import org.primefaces.event.SelectEvent; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ItinerarySelection.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ItinerarySelection.java index 8f2383847..a5e3f633d 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ItinerarySelection.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ItinerarySelection.java @@ -2,9 +2,11 @@ import java.io.Serializable; import java.util.List; + import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; + import org.eclipse.cargotracker.interfaces.booking.facade.BookingServiceFacade; import org.eclipse.cargotracker.interfaces.booking.facade.dto.CargoRoute; import org.eclipse.cargotracker.interfaces.booking.facade.dto.RouteCandidate; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ListCargo.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ListCargo.java index 00b0ebd71..c0e18d89c 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ListCargo.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/ListCargo.java @@ -3,6 +3,7 @@ import static java.util.stream.Collectors.toList; import java.util.List; + import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Track.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Track.java index c11979f42..480bcb00b 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Track.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/web/Track.java @@ -2,10 +2,12 @@ import java.io.Serializable; import java.util.List; + import javax.annotation.PostConstruct; import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; + import org.eclipse.cargotracker.interfaces.booking.facade.BookingServiceFacade; import org.eclipse.cargotracker.interfaces.booking.facade.dto.CargoStatus; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/HandlingEventRegistrationAttempt.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/HandlingEventRegistrationAttempt.java index 094223f94..6b505a50e 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/HandlingEventRegistrationAttempt.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/HandlingEventRegistrationAttempt.java @@ -2,6 +2,7 @@ import java.io.Serializable; import java.time.LocalDateTime; + import org.eclipse.cargotracker.domain.model.cargo.TrackingId; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; import org.eclipse.cargotracker.domain.model.location.UnLocode; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemReader.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemReader.java index 4daa58c98..5030efbb9 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemReader.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemReader.java @@ -8,11 +8,13 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; + import javax.batch.api.chunk.AbstractItemReader; import javax.batch.runtime.context.JobContext; import javax.enterprise.context.Dependent; import javax.inject.Inject; import javax.inject.Named; + import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemWriter.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemWriter.java index d147bd329..5c921579d 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemWriter.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/EventItemWriter.java @@ -6,12 +6,14 @@ import java.io.PrintWriter; import java.io.Serializable; import java.util.List; + import javax.batch.api.chunk.AbstractItemWriter; import javax.batch.runtime.context.JobContext; import javax.enterprise.context.Dependent; import javax.inject.Inject; import javax.inject.Named; import javax.transaction.Transactional; + import org.eclipse.cargotracker.application.ApplicationEvents; import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.interfaces.handling.HandlingEventRegistrationAttempt; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/FileProcessorJobListener.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/FileProcessorJobListener.java index a509b6920..da9ba2194 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/FileProcessorJobListener.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/FileProcessorJobListener.java @@ -3,6 +3,7 @@ import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; + import javax.batch.api.listener.JobListener; import javax.enterprise.context.Dependent; import javax.inject.Inject; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/LineParseExceptionListener.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/LineParseExceptionListener.java index 292f81ef4..5bfdb7895 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/LineParseExceptionListener.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/file/LineParseExceptionListener.java @@ -6,6 +6,7 @@ import java.io.PrintWriter; import java.util.logging.Level; import java.util.logging.Logger; + import javax.batch.api.chunk.listener.SkipReadListener; import javax.batch.runtime.context.JobContext; import javax.enterprise.context.Dependent; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/mobile/EventLogger.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/mobile/EventLogger.java index 6ec641427..dd7fa0c77 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/mobile/EventLogger.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/mobile/EventLogger.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.function.Function; + import javax.annotation.PostConstruct; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; @@ -17,7 +18,7 @@ import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; -import javax.transaction.Transactional; + import org.eclipse.cargotracker.application.ApplicationEvents; import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.domain.model.cargo.Cargo; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReportService.java b/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReportService.java index 625043e21..5312bf4c3 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReportService.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/handling/rest/HandlingReportService.java @@ -1,6 +1,7 @@ package org.eclipse.cargotracker.interfaces.handling.rest; import java.time.LocalDateTime; + import javax.ejb.Stateless; import javax.inject.Inject; import javax.validation.Valid; @@ -8,6 +9,7 @@ import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; + import org.eclipse.cargotracker.application.ApplicationEvents; import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/CargoTrackingViewAdapter.java b/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/CargoTrackingViewAdapter.java index 6cb7ef3c0..90ef1e307 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/CargoTrackingViewAdapter.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/CargoTrackingViewAdapter.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.Delivery; diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/Track.java b/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/Track.java index b0e4b9d0b..0acafe6ec 100644 --- a/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/Track.java +++ b/src/main/java/org/eclipse/cargotracker/interfaces/tracking/web/Track.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java b/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java index eeb8207f8..cebb352e6 100644 --- a/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java +++ b/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.List; import java.util.Random; + import javax.ejb.Stateless; import javax.inject.Inject; import javax.validation.constraints.NotNull; @@ -15,6 +16,7 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; + import org.eclipse.pathfinder.internal.GraphDao; @Stateless diff --git a/src/main/java/org/eclipse/pathfinder/api/TransitPath.java b/src/main/java/org/eclipse/pathfinder/api/TransitPath.java index c6fd582d5..e2489d7bc 100644 --- a/src/main/java/org/eclipse/pathfinder/api/TransitPath.java +++ b/src/main/java/org/eclipse/pathfinder/api/TransitPath.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; + import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement diff --git a/src/main/java/org/eclipse/pathfinder/internal/GraphDao.java b/src/main/java/org/eclipse/pathfinder/internal/GraphDao.java index 236c9e607..f7726bd2d 100644 --- a/src/main/java/org/eclipse/pathfinder/internal/GraphDao.java +++ b/src/main/java/org/eclipse/pathfinder/internal/GraphDao.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import java.util.Random; + import javax.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/src/test/java/org/eclipse/cargotracker/application/BookingServiceTest.java b/src/test/java/org/eclipse/cargotracker/application/BookingServiceTest.java index c87291e4e..e59fb74a8 100644 --- a/src/test/java/org/eclipse/cargotracker/application/BookingServiceTest.java +++ b/src/test/java/org/eclipse/cargotracker/application/BookingServiceTest.java @@ -9,13 +9,14 @@ import java.util.Random; import java.util.logging.Level; import java.util.logging.Logger; + import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.transaction.UserTransaction; import org.eclipse.cargotracker.application.internal.DefaultBookingService; - +import org.eclipse.cargotracker.application.util.DateConverter; import org.eclipse.cargotracker.application.util.RestConfiguration; import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.CargoRepository; @@ -136,7 +137,7 @@ public static WebArchive createDeployment() { .addClass(RoutingService.class) // Application layer components .addClass(DefaultBookingService.class) - //.addClass(DateConverter.class) + .addClass(DateConverter.class) .addClass(RestConfiguration.class) // Infrastructure layer components. .addClass(JpaCargoRepository.class) diff --git a/src/test/java/org/eclipse/cargotracker/application/BookingServiceTestDataGenerator.java b/src/test/java/org/eclipse/cargotracker/application/BookingServiceTestDataGenerator.java index ad992c4d2..ad18fb7d0 100644 --- a/src/test/java/org/eclipse/cargotracker/application/BookingServiceTestDataGenerator.java +++ b/src/test/java/org/eclipse/cargotracker/application/BookingServiceTestDataGenerator.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.logging.Logger; + import javax.annotation.PostConstruct; import javax.ejb.Singleton; import javax.ejb.Startup; @@ -10,6 +11,7 @@ import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.location.SampleLocations; import org.eclipse.cargotracker.domain.model.voyage.SampleVoyages; diff --git a/src/test/java/org/eclipse/cargotracker/application/HandlingEventServiceTest.java b/src/test/java/org/eclipse/cargotracker/application/HandlingEventServiceTest.java index 917316bb4..3f599ef29 100644 --- a/src/test/java/org/eclipse/cargotracker/application/HandlingEventServiceTest.java +++ b/src/test/java/org/eclipse/cargotracker/application/HandlingEventServiceTest.java @@ -2,6 +2,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; + import org.eclipse.cargotracker.application.internal.DefaultHandlingEventService; import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.RouteSpecification; diff --git a/src/test/java/org/eclipse/cargotracker/domain/model/cargo/CargoTest.java b/src/test/java/org/eclipse/cargotracker/domain/model/cargo/CargoTest.java index 8eddd4e95..999586d21 100644 --- a/src/test/java/org/eclipse/cargotracker/domain/model/cargo/CargoTest.java +++ b/src/test/java/org/eclipse/cargotracker/domain/model/cargo/CargoTest.java @@ -10,6 +10,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; + import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; import org.eclipse.cargotracker.domain.model.handling.HandlingHistory; import org.eclipse.cargotracker.domain.model.location.Location; diff --git a/src/test/java/org/eclipse/cargotracker/domain/model/cargo/ItineraryTest.java b/src/test/java/org/eclipse/cargotracker/domain/model/cargo/ItineraryTest.java index 505757313..c03618e59 100644 --- a/src/test/java/org/eclipse/cargotracker/domain/model/cargo/ItineraryTest.java +++ b/src/test/java/org/eclipse/cargotracker/domain/model/cargo/ItineraryTest.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import org.eclipse.cargotracker.domain.model.handling.HandlingEvent; import org.eclipse.cargotracker.domain.model.location.SampleLocations; import org.eclipse.cargotracker.domain.model.voyage.Voyage; diff --git a/src/test/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecificationTest.java b/src/test/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecificationTest.java index ff66789f8..ca48ede3e 100644 --- a/src/test/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecificationTest.java +++ b/src/test/java/org/eclipse/cargotracker/domain/model/cargo/RouteSpecificationTest.java @@ -6,6 +6,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Arrays; + import org.eclipse.cargotracker.domain.model.location.SampleLocations; import org.eclipse.cargotracker.domain.model.voyage.Voyage; import org.eclipse.cargotracker.domain.model.voyage.VoyageNumber; diff --git a/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventTest.java b/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventTest.java index 76931ce32..3852de4ae 100644 --- a/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventTest.java +++ b/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingEventTest.java @@ -6,6 +6,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Arrays; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.RouteSpecification; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; diff --git a/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistoryTest.java b/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistoryTest.java index c1953d5ef..0cf713ce6 100644 --- a/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistoryTest.java +++ b/src/test/java/org/eclipse/cargotracker/domain/model/handling/HandlingHistoryTest.java @@ -6,6 +6,7 @@ import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.Arrays; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.RouteSpecification; import org.eclipse.cargotracker.domain.model.cargo.TrackingId; diff --git a/src/test/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingServiceTest.java b/src/test/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingServiceTest.java index a8fb8eb6f..7f948ce3c 100644 --- a/src/test/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingServiceTest.java +++ b/src/test/java/org/eclipse/cargotracker/infrastructure/routing/ExternalRoutingServiceTest.java @@ -6,6 +6,7 @@ import java.time.LocalDate; import java.util.List; + import org.eclipse.cargotracker.domain.model.cargo.Cargo; import org.eclipse.cargotracker.domain.model.cargo.Itinerary; import org.eclipse.cargotracker.domain.model.cargo.RouteSpecification; diff --git a/src/test/java/org/eclipse/cargotracker/scenario/CargoLifecycleScenarioTest.java b/src/test/java/org/eclipse/cargotracker/scenario/CargoLifecycleScenarioTest.java index 000751144..45db4b653 100644 --- a/src/test/java/org/eclipse/cargotracker/scenario/CargoLifecycleScenarioTest.java +++ b/src/test/java/org/eclipse/cargotracker/scenario/CargoLifecycleScenarioTest.java @@ -8,6 +8,7 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; + import org.eclipse.cargotracker.application.ApplicationEvents; import org.eclipse.cargotracker.application.BookingService; import org.eclipse.cargotracker.application.CargoInspectionService;