From 9bf3d7c9c7c73059c3e8e175dea3311264f9a2d6 Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Thu, 27 Nov 2014 01:26:53 +0100 Subject: [PATCH] pull shared events and analyzers onto AbstractLog level --- .../impl/DomainObjectFactoryImpl.java | 33 ++++---- .../domain/persistence/impl/FieldNames.java | 2 +- .../impl/MongoObjectFactoryImpl.java | 83 ++++++++++--------- .../impl/MongoRaceLogStoreVisitor.java | 32 +++---- .../DeviceIdentifierMongoHandler.java | 2 +- .../tracking/impl/MongoGPSFixStoreImpl.java | 12 +-- ...aceHolderDeviceIdentifierMongoHandler.java | 4 +- .../test/AbstractGPSFixStoreTest.java | 2 +- .../impl/CreateAndTrackWithRaceLogTest.java | 2 +- .../test/impl/TrackedRaceLoadsFixesTest.java | 2 +- .../test/mock/SmartphoneImeiIdentifier.java | 2 +- .../test/mock/SmartphoneImeiJsonHandler.java | 2 +- .../test/mock/SmartphoneImeiMongoHandler.java | 2 +- .../SmartphoneImeiSerializationHandler.java | 2 +- ...rtphoneImeiStringSerializationHandler.java | 2 +- .../racelogtracking/PingDeviceIdentifier.java | 2 - .../RaceLogTrackingAdapter.java | 14 ++-- .../racelogtracking/impl/Activator.java | 4 +- .../impl/PingDeviceIdentifierJsonHandler.java | 2 +- .../PingDeviceIdentifierMongoHandler.java | 2 +- ...gDeviceIdentifierSerializationHandler.java | 2 +- ...eIdentifierStringSerializationHandler.java | 2 +- .../impl/RaceLogRaceTracker.java | 39 ++++----- .../impl/RaceLogTrackingAdapterImpl.java | 26 +++--- .../impl/SmartphoneUUIDMongoHandler.java | 4 +- ...rtphoneUUIDStringSerializationHandler.java | 4 +- ...FileImportDeviceIdentifierJsonHandler.java | 2 +- ...ileImportDeviceIdentifierMongoHandler.java | 2 +- ...eIdentifierStringSerializationHandler.java | 4 +- .../racelog/test/RaceLogRevocationTest.java | 4 +- .../test/SerializeRaceLogEventsTest.java | 8 +- .../test/DeviceMappingFinderTest.java | 8 +- .../META-INF/MANIFEST.MF | 5 +- .../sailing/domain/abstractlog/Revokable.java | 2 +- .../domain/abstractlog/race/RaceLogEvent.java | 22 +---- .../abstractlog/race/RaceLogEventData.java | 26 ++++++ .../abstractlog/race/RaceLogEventFactory.java | 34 ++++---- .../race/RaceLogEventRestoreFactory.java | 34 ++++---- .../abstractlog/race/RaceLogEventVisitor.java | 32 +++---- .../AdditionalScoringInformationFinder.java | 22 ++--- .../impl/AbstractRaceLogChangedVisitor.java | 32 +++---- .../race/impl/BaseRaceLogEventVisitor.java | 32 +++---- .../race/impl/RaceLogEventDataImpl.java | 36 ++++++++ .../race/impl/RaceLogEventFactoryImpl.java | 66 +++++++-------- .../race/impl/RaceLogEventImpl.java | 18 ++-- .../impl/RaceLogEventRestoreFactoryImpl.java | 66 +++++++-------- .../race/impl/RaceLogRevokeEventImpl.java | 19 +++-- ...LogAdditionalScoringInformationEvent.java} | 2 +- ...dditionalScoringInformationEventImpl.java} | 6 +- .../abstractlog/race/state/RaceState.java | 4 +- .../race/state/impl/RaceStateImpl.java | 6 +- .../DeviceCompetitorMappingEvent.java | 7 -- .../race/tracking/DeviceMarkMappingEvent.java | 7 -- ...ceLogCloseOpenEndedDeviceMappingEvent.java | 10 +++ ...Event.java => RaceLogDefineMarkEvent.java} | 2 +- ...ava => RaceLogDenoteForTrackingEvent.java} | 3 +- .../RaceLogDeviceCompetitorMappingEvent.java | 10 +++ .../RaceLogDeviceMarkMappingEvent.java | 10 +++ .../RaceLogRegisterCompetitorEvent.java | 10 +++ ...nt.java => RaceLogStartTrackingEvent.java} | 6 +- .../analyzing/impl/DefinedMarkFinder.java | 6 +- .../impl/DeviceCompetitorMappingFinder.java | 18 ---- .../impl/DeviceMarkMappingFinder.java | 18 ---- .../impl/LastPingMappingEventFinder.java | 33 -------- .../impl/OpenEndedDeviceMappingCloser.java | 49 ----------- .../analyzing/impl/RaceInformationFinder.java | 10 +-- .../RaceLogDeviceCompetitorMappingFinder.java | 15 ++++ .../impl/RaceLogDeviceMappingFinder.java | 16 ++++ .../impl/RaceLogDeviceMarkMappingFinder.java | 15 ++++ .../RaceLogLastPingMappingEventFinder.java | 16 ++++ .../RaceLogOpenEndedDeviceMappingCloser.java | 30 +++++++ .../impl/RaceLogTrackingStateAnalyzer.java | 8 +- .../CloseOpenEndedDeviceMappingEventImpl.java | 42 ---------- .../events/DeviceMarkMappingEventImpl.java | 25 ------ .../events/RegisterCompetitorEventImpl.java | 35 -------- ...AbstractRaceLogDeviceMappingEventImpl.java | 43 ++++++++++ ...gCloseOpenEndedDeviceMappingEventImpl.java | 46 ++++++++++ .../RaceLogDefineMarkEventImpl.java} | 8 +- .../RaceLogDenoteForTrackingEventImpl.java} | 10 +-- ...eLogDeviceCompetitorMappingEventImpl.java} | 12 +-- .../RaceLogDeviceMarkMappingEventImpl.java | 25 ++++++ .../RaceLogRegisterCompetitorEventImpl.java | 45 ++++++++++ .../RaceLogStartTrackingEventImpl.java} | 10 +-- .../DeviceCompetitorMappingFinder.java | 21 +++++ .../analyzing}/DeviceMappingFinder.java | 44 +++++----- .../analyzing/DeviceMarkMappingFinder.java | 21 +++++ .../analyzing/LastPingMappingEventFinder.java | 35 ++++++++ .../OpenEndedDeviceMappingCloser.java | 53 ++++++++++++ .../RegisteredCompetitorsAnalyzer.java | 7 +- .../CloseOpenEndedDeviceMappingEvent.java | 6 +- .../events/DeviceCompetitorMappingEvent.java | 7 ++ .../events}/DeviceMappingEvent.java | 8 +- .../shared/events/DeviceMarkMappingEvent.java | 8 ++ .../events}/DeviceWithTimeRange.java | 3 +- .../events}/RegisterCompetitorEvent.java | 6 +- .../impl}/AbstractDeviceMappingEventImpl.java | 18 ++-- ...eCloseOpenEndedDeviceMappingEventImpl.java | 35 ++++++++ .../impl/BaseRegisterCompetitorEventImpl.java | 31 +++++++ .../DeviceIdentifier.java | 2 +- .../DeviceIdentifierSerializationHandler.java | 2 +- ...eIdentifierStringSerializationHandler.java | 2 +- .../DeviceMapping.java | 5 +- .../PlaceHolderDeviceIdentifier.java | 2 +- .../SmartphoneUUIDIdentifier.java | 2 +- .../SmartphoneUUIDSerializationHandler.java | 4 +- .../impl/DeviceMappingImpl.java | 10 +-- ...rDeviceIdentifierSerializationHandler.java | 6 +- .../impl/SmartphoneUUIDIdentifierImpl.java | 4 +- .../LeaderboardScoringAndRankingTest.java | 10 +-- .../impl/RaceColumnRaceLogReplicator.java | 32 +++---- ...ghPointFirstGets10Or8AndLastBreaksTie.java | 6 +- .../racelog/tracking/EmptyGPSFixStore.java | 4 +- .../tracking/GPSFixReceivedListener.java | 2 +- .../domain/racelog/tracking/GPSFixStore.java | 8 +- .../TrackFileImportDeviceIdentifier.java | 2 +- .../TrackFileImportDeviceIdentifierImpl.java | 2 +- .../domain/trackimport/GPSFixImporter.java | 2 +- .../sailing/domain/tracking/TrackedRace.java | 2 +- .../domain/tracking/impl/TrackedRaceImpl.java | 2 +- .../sailing/gwt/ui/client/SailingService.java | 4 +- ...eIdentifierStringSerializationHandler.java | 4 +- .../gwt/ui/server/SailingServiceImpl.java | 36 ++++---- .../StoreAndLoadDeviceIdentifierTest.java | 8 +- .../test/StoreAndLoadRaceLogEventsTest.java | 38 ++++----- .../mongodb/test/StoreGPSFixTrackTest.java | 2 +- ...ionIdentifierWithGPSFixesDeserializer.java | 2 +- .../DeviceIdentifierJsonDeserializer.java | 4 +- ...iceCompetitorMappingEventDeserializer.java | 2 +- ...RaceLogDeviceMappingEventDeserializer.java | 2 +- ...LogDeviceMarkMappingEventDeserializer.java | 2 +- .../impl/RaceLogEventDeserializer.java | 4 +- ...ssionIdentifierWithGPSFixesSerializer.java | 2 +- .../impl/DeviceIdentifierJsonSerializer.java | 4 +- .../DeviceWithTimeRangeJsonSerializer.java | 2 +- ...dditionalScoringInformationSerializer.java | 6 +- ...OpenEndedDeviceMappingEventSerializer.java | 5 +- .../RaceLogDefineMarkEventSerializer.java | 6 +- ...ceLogDenoteForTrackingEventSerializer.java | 6 +- ...eviceCompetitorMappingEventSerializer.java | 4 +- .../RaceLogDeviceMappingEventSerializer.java | 8 +- ...ceLogDeviceMarkMappingEventSerializer.java | 4 +- .../racelog/impl/RaceLogEventSerializer.java | 36 ++++---- ...eLogRegisterCompetitorEventSerializer.java | 2 +- .../RaceLogStartTrackingEventSerializer.java | 4 +- .../tracking/DeviceIdentifierJsonHandler.java | 2 +- ...laceHolderDeviceIdentifierJsonHandler.java | 4 +- .../impl/SmartphoneUUIDJsonHandler.java | 4 +- .../test/RaceLogSerializationTest.java | 21 ++--- .../test/jaxrs/GPSFixesResourceTest.java | 4 +- .../trackfiles/impl/GPSFixImportTest.java | 2 +- .../gateway/jaxrs/api/GPSFixesResource.java | 4 +- .../impl/DeviceWithTimeRangeImpl.java | 4 +- .../impl/TrackFilesImportServlet.java | 2 +- .../server/impl/RacingEventServiceImpl.java | 2 +- .../app/ui/activities/LaunchActivity.java | 4 +- 155 files changed, 1183 insertions(+), 858 deletions(-) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventData.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventDataImpl.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/{AdditionalScoringInformationEvent.java => RaceLogAdditionalScoringInformationEvent.java} (85%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/impl/{AdditionalScoringInformationEventImpl.java => RaceLogAdditionalScoringInformationEventImpl.java} (78%) delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceCompetitorMappingEvent.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMarkMappingEvent.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogCloseOpenEndedDeviceMappingEvent.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/{DefineMarkEvent.java => RaceLogDefineMarkEvent.java} (81%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/{DenoteForTrackingEvent.java => RaceLogDenoteForTrackingEvent.java} (82%) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceCompetitorMappingEvent.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceMarkMappingEvent.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogRegisterCompetitorEvent.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/{StartTrackingEvent.java => RaceLogStartTrackingEvent.java} (58%) delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceCompetitorMappingFinder.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMarkMappingFinder.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/LastPingMappingEventFinder.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/OpenEndedDeviceMappingCloser.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceCompetitorMappingFinder.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMappingFinder.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMarkMappingFinder.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogLastPingMappingEventFinder.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogOpenEndedDeviceMappingCloser.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/CloseOpenEndedDeviceMappingEventImpl.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DeviceMarkMappingEventImpl.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/RegisterCompetitorEventImpl.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/AbstractRaceLogDeviceMappingEventImpl.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogCloseOpenEndedDeviceMappingEventImpl.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/{events/DefineMarkEventImpl.java => impl/RaceLogDefineMarkEventImpl.java} (70%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/{events/DenoteForTrackingEventImpl.java => impl/RaceLogDenoteForTrackingEventImpl.java} (77%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/{events/DeviceCompetitorMappingEventImpl.java => impl/RaceLogDeviceCompetitorMappingEventImpl.java} (54%) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDeviceMarkMappingEventImpl.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogRegisterCompetitorEventImpl.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/{events/StartTrackingEventImpl.java => impl/RaceLogStartTrackingEventImpl.java} (65%) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceCompetitorMappingFinder.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/{race/tracking/analyzing/impl => shared/analyzing}/DeviceMappingFinder.java (66%) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMarkMappingFinder.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/LastPingMappingEventFinder.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/OpenEndedDeviceMappingCloser.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/{race/tracking/analyzing/impl => shared/analyzing}/RegisteredCompetitorsAnalyzer.java (76%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/{race/tracking => shared/events}/CloseOpenEndedDeviceMappingEvent.java (76%) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceCompetitorMappingEvent.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/{race/tracking => shared/events}/DeviceMappingEvent.java (79%) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceMarkMappingEvent.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/{race/tracking => shared/events}/DeviceWithTimeRange.java (63%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/{race/tracking => shared/events}/RegisterCompetitorEvent.java (74%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/{race/tracking/events => shared/events/impl}/AbstractDeviceMappingEventImpl.java (59%) create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseCloseOpenEndedDeviceMappingEventImpl.java create mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseRegisterCompetitorEventImpl.java rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/DeviceIdentifier.java (97%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/DeviceIdentifierSerializationHandler.java (97%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/DeviceIdentifierStringSerializationHandler.java (90%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/DeviceMapping.java (77%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/PlaceHolderDeviceIdentifier.java (97%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/SmartphoneUUIDIdentifier.java (73%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/SmartphoneUUIDSerializationHandler.java (88%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/impl/DeviceMappingImpl.java (85%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/impl/PlaceHolderDeviceIdentifierSerializationHandler.java (83%) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/{abstractlog/race/tracking => racelogtracking}/impl/SmartphoneUUIDIdentifierImpl.java (86%) diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java index ef49bd44ada..fc603fdedcf 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java @@ -52,16 +52,14 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; -import com.sap.sailing.domain.abstractlog.race.scoring.impl.AdditionalScoringInformationEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; +import com.sap.sailing.domain.abstractlog.race.scoring.impl.RaceLogAdditionalScoringInformationEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.RegisterCompetitorEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; @@ -145,6 +143,8 @@ import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongo import com.sap.sailing.domain.persistence.racelog.tracking.impl.PlaceHolderDeviceIdentifierMongoHandler; import com.sap.sailing.domain.racelog.RaceLogIdentifier; import com.sap.sailing.domain.racelog.RaceLogStore; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; import com.sap.sailing.domain.tracking.TrackedRegattaRegistry; import com.sap.sailing.domain.tracking.Wind; import com.sap.sailing.domain.tracking.WindTrack; @@ -1332,19 +1332,19 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { return loadRaceLogDeviceCompetitorMappingEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); } else if (eventClass.equals(DeviceMarkMappingEvent.class.getSimpleName())) { return loadRaceLogDeviceMarkMappingEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); - } else if (eventClass.equals(DenoteForTrackingEvent.class.getSimpleName())) { + } else if (eventClass.equals(RaceLogDenoteForTrackingEvent.class.getSimpleName())) { return loadRaceLogDenoteForTrackingEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); - } else if (eventClass.equals(StartTrackingEvent.class.getSimpleName())) { + } else if (eventClass.equals(RaceLogStartTrackingEvent.class.getSimpleName())) { return loadRaceLogStartEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); } else if (eventClass.equals(RevokeEvent.class.getSimpleName())) { return loadRaceLogRevokeEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); } else if (eventClass.equals(RegisterCompetitorEvent.class.getSimpleName())) { return loadRaceLogRegisterCompetitorEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); - } else if (eventClass.equals(DefineMarkEvent.class.getSimpleName())) { + } else if (eventClass.equals(RaceLogDefineMarkEvent.class.getSimpleName())) { return loadRaceLogDefineMarkEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); } else if (eventClass.equals(CloseOpenEndedDeviceMappingEvent.class.getSimpleName())) { return loadRaceLogCloseOpenEndedDeviceMappingEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); - } else if (eventClass.equals(AdditionalScoringInformationEventImpl.class.getSimpleName())) { + } else if (eventClass.equals(RaceLogAdditionalScoringInformationEventImpl.class.getSimpleName())) { return loadRaceLogAdditionalScoringInformationEvent(createdAt, author, logicalTimePoint, id, passId, competitors, dbObject); } @@ -1417,8 +1417,9 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory { private RaceLogEvent loadRaceLogRegisterCompetitorEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable id, Integer passId, List competitors, DBObject dbObject) { - assert competitors.size() == 1 : "Should have exactly one competitor for RegisterCompetitorEvent"; - return raceLogEventFactory.createRegisterCompetitorEvent(createdAt, author, logicalTimePoint, id, passId, competitors.get(0)); + Serializable competitorId = (Serializable) dbObject.get(FieldNames.RACE_LOG_COMPETITOR_ID.name()); + Competitor comp = baseDomainFactory.getCompetitorStore().getExistingCompetitorById(competitorId); + return raceLogEventFactory.createRegisterCompetitorEvent(createdAt, author, logicalTimePoint, id, passId, comp); } private RaceLogEvent loadRaceLogDefineMarkEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java index c81fa48aa95..cafc6b4137b 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java @@ -87,7 +87,7 @@ public enum FieldNames { RACE_LOG_POSITIONED_COMPETITORS, RACE_LOG_PATHFINDER_ID, RACE_LOG_GATE_LINE_OPENING_TIME, RACE_LOG_GOLF_DOWN_TIME, RACE_LOG_START_PROCEDURE_TYPE, RACE_LOG_PROTEST_START_TIME, RACE_LOG_COURSE_DESIGN_NAME, RACE_LOG_REVOKED_EVENT_ID, RACE_LOG_REVOKED_EVENT_TYPE, RACE_LOG_REVOKED_EVENT_SHORT_INFO, RACE_LOG_REVOKED_REASON, RACE_LOG_FROM, RACE_LOG_TO, RACE_LOG_MARK, RACE_LOG_DEVICE_MAPPING_EVENT_ID, - RACE_LOG_CLOSING_TIMEPOINT, MARK, + RACE_LOG_CLOSING_TIMEPOINT, MARK, RACE_LOG_COMPETITOR_ID, /** @deprecated Replaced by WAYPOINT_PASSINGINSTRUCTIONS, still used to migrate old races*/ @Deprecated WAYPOINT_PASSINGSIDE, /** @deprecated Replaced by CONTROLPOINTWITHTWOMARKS_ID, still used to migrate old races*/ @Deprecated GATE_ID, /** @deprecated Replaced by CONTROLPOINTWITHTWOMARKS_NAME, still used to migrate old races*/ @Deprecated GATE_NAME, diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java index 182e30d473b..c735925b4e8 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java @@ -35,16 +35,19 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.RegisterCompetitorEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.ControlPointWithTwoMarks; @@ -90,6 +93,7 @@ import com.sap.sailing.domain.persistence.MongoObjectFactory; import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler; import com.sap.sailing.domain.persistence.racelog.tracking.impl.PlaceHolderDeviceIdentifierMongoHandler; import com.sap.sailing.domain.racelog.RaceLogIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.Positioned; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.TrackedRegatta; @@ -101,7 +105,6 @@ import com.sap.sailing.server.gateway.serialization.impl.DeviceConfigurationJson import com.sap.sailing.server.gateway.serialization.impl.RegattaConfigurationJsonSerializer; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; -import com.sap.sse.common.WithID; import com.sap.sse.common.impl.MillisecondsTimePoint; public class MongoObjectFactoryImpl implements MongoObjectFactory { @@ -789,28 +792,28 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, DeviceCompetitorMappingEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogDeviceCompetitorMappingEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogDeviceCompetitorMappingEvent(event)); return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, DeviceMarkMappingEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogDeviceMarkMappingEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogDeviceMarkMappingEvent(event)); return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, DenoteForTrackingEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogDenoteForTrackingEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogDenoteForTrackingEvent(event)); return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, StartTrackingEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogStartTrackingEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogStartTrackingEvent(event)); @@ -824,35 +827,35 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RegisterCompetitorEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogRegisterCompetitorEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogRegisterCompetitorEvent(event)); return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, DefineMarkEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogDefineMarkEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogDefineMarkEvent(event)); return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, CloseOpenEndedDeviceMappingEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogCloseOpenEndedDeviceMappingEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeRaceLogCloseOpenEndedDeviceMappingEvent(event)); return result; } - public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, AdditionalScoringInformationEvent event) { + public DBObject storeRaceLogEntry(RaceLogIdentifier raceLogIdentifier, RaceLogAdditionalScoringInformationEvent event) { BasicDBObject result = new BasicDBObject(); storeRaceLogIdentifier(raceLogIdentifier, result); result.put(FieldNames.RACE_LOG_EVENT.name(), storeAdditionalScoringInformation(event)); return result; } - private Object storeAdditionalScoringInformation(AdditionalScoringInformationEvent event) { + private Object storeAdditionalScoringInformation(RaceLogAdditionalScoringInformationEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), event.getClass().getSimpleName()); @@ -892,15 +895,12 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { return result; } - private void storeRaceLogDeviceMappingEvent(DeviceMappingEvent event, DBObject result) { - DBObject deviceId = null; - try { - deviceId = storeDeviceId(deviceIdentifierServiceFinder, event.getDevice()); - } catch (Exception e) { - logger.log(Level.WARNING, "Could not store deviceId for RaceLogEvent", e); - e.printStackTrace(); + private void storeDeviceMappingEvent(DeviceMappingEvent event, DBObject result) { + try { + result.put(FieldNames.DEVICE_ID.name(), storeDeviceId(deviceIdentifierServiceFinder, event.getDevice())); + } catch (TransformationException | NoCorrespondingServiceRegisteredException e) { + logger.log(Level.WARNING, "Could not store device identifier for mappng event", e); } - result.put(FieldNames.DEVICE_ID.name(), deviceId); if (event.getFrom() != null) { storeTimePoint(event.getFrom(), result, FieldNames.RACE_LOG_FROM); } @@ -909,38 +909,38 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { } } - private Object storeRaceLogDeviceCompetitorMappingEvent(DeviceCompetitorMappingEvent event) { + private Object storeRaceLogDeviceCompetitorMappingEvent(RaceLogDeviceCompetitorMappingEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), DeviceCompetitorMappingEvent.class.getSimpleName()); - storeRaceLogDeviceMappingEvent(event, result); + storeDeviceMappingEvent(event, result); result.put(FieldNames.COMPETITOR_ID.name(), event.getMappedTo().getId()); return result; } - private Object storeRaceLogDeviceMarkMappingEvent(DeviceMarkMappingEvent event) { + private Object storeRaceLogDeviceMarkMappingEvent(RaceLogDeviceMarkMappingEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), DeviceMarkMappingEvent.class.getSimpleName()); - storeRaceLogDeviceMappingEvent(event, result); + storeDeviceMappingEvent(event, result); result.put(FieldNames.MARK.name(), storeMark(event.getMappedTo())); return result; } - private Object storeRaceLogDenoteForTrackingEvent(DenoteForTrackingEvent event) { + private Object storeRaceLogDenoteForTrackingEvent(RaceLogDenoteForTrackingEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); - result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), DenoteForTrackingEvent.class.getSimpleName()); + result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RaceLogDenoteForTrackingEvent.class.getSimpleName()); result.put(FieldNames.RACE_NAME.name(), event.getRaceName()); result.put(FieldNames.BOAT_CLASS_NAME.name(), event.getBoatClass().getName()); result.put(FieldNames.RACE_ID.name(), event.getRaceId()); return result; } - private Object storeRaceLogStartTrackingEvent(StartTrackingEvent event) { + private Object storeRaceLogStartTrackingEvent(RaceLogStartTrackingEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); - result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), StartTrackingEvent.class.getSimpleName()); + result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RaceLogStartTrackingEvent.class.getSimpleName()); return result; } @@ -955,22 +955,23 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { return result; } - private Object storeRaceLogRegisterCompetitorEvent(RegisterCompetitorEvent event) { + private Object storeRaceLogRegisterCompetitorEvent(RaceLogRegisterCompetitorEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); - result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RegisterCompetitorEvent.class.getSimpleName()); + result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RegisterCompetitorEvent.class.getSimpleName()); + result.put(FieldNames.RACE_LOG_COMPETITOR_ID.name(), event.getCompetitor().getId()); return result; } - private Object storeRaceLogDefineMarkEvent(DefineMarkEvent event) { + private Object storeRaceLogDefineMarkEvent(RaceLogDefineMarkEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); - result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), DefineMarkEvent.class.getSimpleName()); + result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), RaceLogDefineMarkEvent.class.getSimpleName()); result.put(FieldNames.RACE_LOG_MARK.name(), storeMark(event.getMark())); return result; } - private Object storeRaceLogCloseOpenEndedDeviceMappingEvent(CloseOpenEndedDeviceMappingEvent event) { + private Object storeRaceLogCloseOpenEndedDeviceMappingEvent(RaceLogCloseOpenEndedDeviceMappingEvent event) { DBObject result = new BasicDBObject(); storeRaceLogEventProperties(event, result); result.put(FieldNames.RACE_LOG_EVENT_CLASS.name(), CloseOpenEndedDeviceMappingEvent.class.getSimpleName()); diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java index b09e981de9f..dfbb2440417 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java @@ -18,14 +18,14 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.persistence.MongoObjectFactory; import com.sap.sailing.domain.racelog.RaceLogIdentifier; @@ -121,25 +121,25 @@ public class MongoRaceLogStoreVisitor implements RaceLogEventVisitor { } @Override - public void visit(DeviceCompetitorMappingEvent event) { + public void visit(RaceLogDeviceCompetitorMappingEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } @Override - public void visit(DeviceMarkMappingEvent event) { + public void visit(RaceLogDeviceMarkMappingEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } @Override - public void visit(DenoteForTrackingEvent event) { + public void visit(RaceLogDenoteForTrackingEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } @Override - public void visit(StartTrackingEvent event) { + public void visit(RaceLogStartTrackingEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } @@ -151,25 +151,25 @@ public class MongoRaceLogStoreVisitor implements RaceLogEventVisitor { } @Override - public void visit(RegisterCompetitorEvent event) { + public void visit(RaceLogRegisterCompetitorEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } @Override - public void visit(DefineMarkEvent event) { + public void visit(RaceLogDefineMarkEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } @Override - public void visit(CloseOpenEndedDeviceMappingEvent event) { + public void visit(RaceLogCloseOpenEndedDeviceMappingEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } @Override - public void visit(AdditionalScoringInformationEvent event) { + public void visit(RaceLogAdditionalScoringInformationEvent event) { DBObject object = mongoObjectFactory.storeRaceLogEntry(raceLogIdentifier, event); mongoObjectFactory.storeRaceLogEventEvent(object); } diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/DeviceIdentifierMongoHandler.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/DeviceIdentifierMongoHandler.java index 890639443a4..ab45ab0ce85 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/DeviceIdentifierMongoHandler.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/DeviceIdentifierMongoHandler.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.persistence.racelog.tracking; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierSerializationHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierSerializationHandler; public interface DeviceIdentifierMongoHandler extends DeviceIdentifierSerializationHandler { } diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java index 57bacf58f9a..36037c39604 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java @@ -15,10 +15,8 @@ import com.mongodb.DBCursor; import com.mongodb.DBObject; import com.mongodb.QueryBuilder; import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceCompetitorMappingFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceMarkMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceCompetitorMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceMarkMappingFinder; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.TimeRange; @@ -36,6 +34,8 @@ import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongo import com.sap.sailing.domain.persistence.racelog.tracking.GPSFixMongoHandler; import com.sap.sailing.domain.persistence.racelog.tracking.MongoGPSFixStore; import com.sap.sailing.domain.racelog.tracking.GPSFixReceivedListener; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; @@ -107,7 +107,7 @@ public class MongoGPSFixStoreImpl implements MongoGPSFixStore { @Override public void loadCompetitorTrack(DynamicGPSFixTrack track, RaceLog raceLog, Competitor competitor) throws NoCorrespondingServiceRegisteredException, TransformationException{ - List> mappings = new DeviceCompetitorMappingFinder(raceLog).analyze().get(competitor); + List> mappings = new RaceLogDeviceCompetitorMappingFinder(raceLog).analyze().get(competitor); if (mappings != null) { for (DeviceMapping mapping : mappings) { @@ -119,7 +119,7 @@ public class MongoGPSFixStoreImpl implements MongoGPSFixStore { @Override public void loadMarkTrack(DynamicGPSFixTrack track, RaceLog raceLog, Mark mark) throws NoCorrespondingServiceRegisteredException, TransformationException{ - List> mappings = new DeviceMarkMappingFinder(raceLog).analyze().get(mark); + List> mappings = new RaceLogDeviceMarkMappingFinder(raceLog).analyze().get(mark); if (mappings != null) { for (DeviceMapping mapping : mappings) { diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/PlaceHolderDeviceIdentifierMongoHandler.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/PlaceHolderDeviceIdentifierMongoHandler.java index f74ea821419..ee3ee4fe186 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/PlaceHolderDeviceIdentifierMongoHandler.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/PlaceHolderDeviceIdentifierMongoHandler.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.persistence.racelog.tracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; public class PlaceHolderDeviceIdentifierMongoHandler extends PlaceHolderDeviceIdentifierSerializationHandler implements DeviceIdentifierMongoHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java index a97decd840a..e15e16f2a28 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java @@ -11,7 +11,6 @@ import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.Mark; @@ -24,6 +23,7 @@ import com.sap.sailing.domain.racelog.tracking.GPSFixStore; import com.sap.sailing.domain.racelog.tracking.test.mock.MockDeviceAndSessionIdentifierWithGPSFixesDeserializer; import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.Track; import com.sap.sailing.domain.tracking.impl.GPSFixMovingImpl; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java index 9dc45e5ad02..4b0723ab010 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java @@ -20,7 +20,6 @@ import org.junit.rules.ExpectedException; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.Fleet; @@ -39,6 +38,7 @@ import com.sap.sailing.domain.leaderboard.impl.HighPoint; import com.sap.sailing.domain.racelog.tracking.GPSFixStore; import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter; import com.sap.sailing.domain.racelogtracking.impl.RaceLogTrackingAdapterFactoryImpl; import com.sap.sailing.domain.tracking.Track; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java index 260eb541e92..8608fc7716d 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java @@ -9,7 +9,6 @@ import org.junit.Test; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; @@ -27,6 +26,7 @@ import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegi import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.racelogtracking.test.AbstractGPSFixStoreTest; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.TrackedRegatta; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiIdentifier.java b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiIdentifier.java index 8e28eb8f6e6..9bfdebc3545 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiIdentifier.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiIdentifier.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.racelog.tracking.test.mock; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; public class SmartphoneImeiIdentifier implements DeviceIdentifier { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiJsonHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiJsonHandler.java index 568a7d65e04..3a770d9dfbb 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiJsonHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiJsonHandler.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.racelog.tracking.test.mock; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler; public class SmartphoneImeiJsonHandler extends SmartphoneImeiSerializationHandler diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiMongoHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiMongoHandler.java index fbf81b864b7..1ac23ea7e8f 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiMongoHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiMongoHandler.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.racelog.tracking.test.mock; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; public class SmartphoneImeiMongoHandler extends SmartphoneImeiSerializationHandler implements DeviceIdentifierMongoHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiSerializationHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiSerializationHandler.java index c2f9daa1970..eaa539c68f6 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiSerializationHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiSerializationHandler.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.racelog.tracking.test.mock; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sse.common.Util; public class SmartphoneImeiSerializationHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiStringSerializationHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiStringSerializationHandler.java index b0ce6f98bd1..312ed3dfbe1 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiStringSerializationHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/SmartphoneImeiStringSerializationHandler.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.racelog.tracking.test.mock; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierStringSerializationHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierStringSerializationHandler; public class SmartphoneImeiStringSerializationHandler extends SmartphoneImeiSerializationHandler implements DeviceIdentifierStringSerializationHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/PingDeviceIdentifier.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/PingDeviceIdentifier.java index 6fbb46e8cd4..9312eb9f762 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/PingDeviceIdentifier.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/PingDeviceIdentifier.java @@ -2,8 +2,6 @@ package com.sap.sailing.domain.racelogtracking; import java.util.UUID; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; - /** * A device identifier used to identify a non-existent, virtual device, which is used only once as an * identifier to add a single fix to a track (i.e. pinging the location of that track's item). diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapter.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapter.java index 3d4ca1c155e..1eaacfeec70 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapter.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapter.java @@ -4,9 +4,9 @@ import java.util.Set; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Fleet; @@ -32,7 +32,7 @@ public interface RaceLogTrackingAdapter { *
    *
  • Is the racelog denoted for tracking? If not, throw exception.
    • *
  • Is a {@link RaceLogRaceTracker} already listening for this racelog? If not, add one.
    • - *
  • Is a {@link StartTrackingEvent} present in the racelog? If not, add one
    • + *
  • Is a {@link RaceLogStartTrackingEvent} present in the racelog? If not, add one
    • *
*/ void startTracking(RacingEventService service, Leaderboard leaderboard, RaceColumn raceColumn, Fleet fleet) @@ -46,7 +46,7 @@ public interface RaceLogTrackingAdapter { boolean isRaceLogRaceTrackerAttached(RacingEventService service, RaceLog raceLog); /** - * Denotes the {@link RaceLog} for racelog-tracking, by inserting a {@link DenoteForTrackingEvent}. + * Denotes the {@link RaceLog} for racelog-tracking, by inserting a {@link RaceLogDenoteForTrackingEvent}. * * @throws NotDenotableForRaceLogTrackingException * Fails, if no {@link RaceLog}, or a non-empty {@link RaceLog}, or one with attached @@ -57,7 +57,7 @@ public interface RaceLogTrackingAdapter { Fleet fleet, String raceName) throws NotDenotableForRaceLogTrackingException; /** - * Revoke the {@link DenoteForTrackingEvent}, and if it exists the {@link StartTrackingEvent}. + * Revoke the {@link RaceLogDenoteForTrackingEvent}, and if it exists the {@link RaceLogStartTrackingEvent}. * This does not affect existing an {@link RaceLogRaceTracker} * or {@link TrackedRace} for this {@code RaceLog}. */ @@ -80,7 +80,7 @@ public interface RaceLogTrackingAdapter { * Duplicate the course and competitor registrations in the newest {@link RaceLogCourseDesignChangedEvent} * in {@code from} race log to the {@code to} race logs. * The {@link Mark}s and {@link ControlPoint}s are duplicated and not reused. This also inserts the necessary - * {@link DefineMarkEvent}s into the {@code to} race logs. + * {@link RaceLogDefineMarkEvent}s into the {@code to} race logs. */ void copyCourseAndCompetitors(RaceLog from, Set to, SharedDomainFactory baseDomainFactory, RacingEventService service); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/Activator.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/Activator.java index 37b5c4242aa..9c8e84cac73 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/Activator.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/Activator.java @@ -11,12 +11,12 @@ import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierStringSerializationHandler; -import com.sap.sailing.domain.abstractlog.race.tracking.SmartphoneUUIDIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder; import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierStringSerializationHandler; import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifierImpl; import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory; +import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierJsonHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierJsonHandler.java index b38d8e5399c..60d1b57dfb7 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierJsonHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierJsonHandler.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.racelogtracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler; public class PingDeviceIdentifierJsonHandler extends PingDeviceIdentifierSerializationHandler diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierMongoHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierMongoHandler.java index 1b9a0b55fa3..efb7ecb08dc 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierMongoHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierMongoHandler.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.racelogtracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; public class PingDeviceIdentifierMongoHandler extends PingDeviceIdentifierSerializationHandler implements DeviceIdentifierMongoHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierSerializationHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierSerializationHandler.java index 6429460cbfb..415af995c85 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierSerializationHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierSerializationHandler.java @@ -2,8 +2,8 @@ package com.sap.sailing.domain.racelogtracking.impl; import java.util.UUID; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifier; import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifierImpl; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierStringSerializationHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierStringSerializationHandler.java index e6d3e50ce98..bb4bda1da78 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierStringSerializationHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/PingDeviceIdentifierStringSerializationHandler.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.racelogtracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierStringSerializationHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierStringSerializationHandler; public class PingDeviceIdentifierStringSerializationHandler extends PingDeviceIdentifierSerializationHandler implements DeviceIdentifierStringSerializationHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java index c6c7dce0e4e..7f817da4cff 100755 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java @@ -14,18 +14,16 @@ import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.LastPublishedCourseDesignFinder; import com.sap.sailing.domain.abstractlog.race.impl.BaseRaceLogEventVisitor; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceCompetitorMappingFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceMappingFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceMarkMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceInformationFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceCompetitorMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceMarkMappingFinder; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogTrackingStateAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RegisteredCompetitorsAnalyzer; +import com.sap.sailing.domain.abstractlog.shared.analyzing.RegisteredCompetitorsAnalyzer; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; @@ -52,6 +50,8 @@ import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.markpassingcalculation.MarkPassingCalculator; import com.sap.sailing.domain.racelog.tracking.GPSFixReceivedListener; import com.sap.sailing.domain.racelog.tracking.GPSFixStore; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; @@ -74,7 +74,7 @@ import difflib.PatchFailedException; * {@link RaceLogTrackingState#TRACKING} state, tracking commences immediately and existing fixes are loaded immediately * from the database. *

- * Otherwise, the tracker waits until a {@link StartTrackingEvent} is received to perform these tasks. + * Otherwise, the tracker waits until a {@link RaceLogStartTrackingEvent} is received to perform these tasks. * * @author Fredrik Teschke * @@ -170,11 +170,11 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT } private Map>> getNewCompetitorMappings() { - return new DeviceCompetitorMappingFinder(params.getRaceLog()).analyze(); + return new RaceLogDeviceCompetitorMappingFinder(params.getRaceLog()).analyze(); } private Map>> getNewMarkMappings() { - return new DeviceMarkMappingFinder(params.getRaceLog()).analyze(); + return new RaceLogDeviceMarkMappingFinder(params.getRaceLog()).analyze(); } /** @@ -283,7 +283,7 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT } @Override - public void visit(DeviceMarkMappingEvent event) { + public void visit(RaceLogDeviceMarkMappingEvent event) { if (trackedRace != null) { updateMarkMappings(true); gpsFixStore.addListener(this, event.getDevice()); @@ -325,7 +325,7 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT } @Override - public void visit(DeviceCompetitorMappingEvent event) { + public void visit(RaceLogDeviceCompetitorMappingEvent event) { if (trackedRace != null) { updateCompetitorMappings(true); gpsFixStore.addListener(this, event.getDevice()); @@ -333,7 +333,7 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT } @Override - public void visit(StartTrackingEvent event) { + public void visit(RaceLogStartTrackingEvent event) { if (trackedRace == null) startTracking(event); } @@ -356,12 +356,12 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT } } - private void startTracking(StartTrackingEvent event) { + private void startTracking(RaceLogStartTrackingEvent event) { RaceLog raceLog = params.getRaceLog(); RaceColumn raceColumn = params.getRaceColumn(); Fleet fleet = params.getFleet(); - DenoteForTrackingEvent denoteEvent = new RaceInformationFinder(raceLog).analyze(); + RaceLogDenoteForTrackingEvent denoteEvent = new RaceInformationFinder(raceLog).analyze(); BoatClass boatClass = denoteEvent.getBoatClass(); String raceName = denoteEvent.getRaceName(); CourseBase courseBase = new LastPublishedCourseDesignFinder(raceLog).analyze(); @@ -397,7 +397,8 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.TRACKING, 0)); //add listeners for devices in mappings - for (List> mappings : new DeviceMappingFinder(params.getRaceLog()).analyze().values()) { + for (List> mappings : + new RaceLogDeviceMappingFinder(params.getRaceLog()).analyze().values()) { for (DeviceMapping mapping : mappings) { gpsFixStore.addListener(this, mapping.getDevice()); } diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java index a97f01df477..5630a9aeb1d 100755 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java @@ -10,20 +10,19 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; -import com.sap.sailing.domain.abstractlog.Revokable; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.LastPublishedCourseDesignFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.AllEventsOfTypeFinder; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.LastEventOfTypeFinder; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogTrackingStateAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RegisteredCompetitorsAnalyzer; +import com.sap.sailing.domain.abstractlog.shared.analyzing.RegisteredCompetitorsAnalyzer; +import com.sap.sailing.domain.abstractlog.shared.events.RegisterCompetitorEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; @@ -48,6 +47,7 @@ import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.RegattaLeaderboard; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.racelogtracking.PingDeviceIdentifierImpl; import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter; import com.sap.sailing.domain.tracking.GPSFix; @@ -91,7 +91,7 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter { } /** - * Adds a {@link RaceLogRaceTracker}. If a {@link StartTrackingEvent} is already present in the {@code RaceLog} + * Adds a {@link RaceLogRaceTracker}. If a {@link RaceLogStartTrackingEvent} is already present in the {@code RaceLog} * linked to the {@code raceColumn} and {@code fleet}, a {@code TrackedRace} is created immediately and tracking begins. * Otherwise, the {@code RaceLogRaceTracker} waits until a {@code StartTrackingEvent} is added to perform these actions. * The race first has to be denoted for racelog tracking. @@ -200,7 +200,7 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter { } private void revokeAlreadyDefinedMarks(RaceLog raceLog, AbstractLogEventAuthor author) { - List markEvents = new AllEventsOfTypeFinder(raceLog, true, DefineMarkEvent.class).analyze(); + List markEvents = new AllEventsOfTypeFinder(raceLog, true, RaceLogDefineMarkEvent.class).analyze(); for (RaceLogEvent event : markEvents) { try { raceLog.revokeEvent(author, event, "removing mark that was already defined"); @@ -263,8 +263,8 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter { @Override public void removeDenotationForRaceLogTracking(RacingEventService service, RaceLog raceLog) { - Revokable denoteForTrackingEvent = (Revokable) new LastEventOfTypeFinder(raceLog, true, DenoteForTrackingEvent.class).analyze(); - Revokable startTrackingEvent = (Revokable) new LastEventOfTypeFinder(raceLog, true, StartTrackingEvent.class).analyze(); + RaceLogEvent denoteForTrackingEvent = new LastEventOfTypeFinder(raceLog, true, RaceLogDenoteForTrackingEvent.class).analyze(); + RaceLogEvent startTrackingEvent = new LastEventOfTypeFinder(raceLog, true, RaceLogStartTrackingEvent.class).analyze(); try { raceLog.revokeEvent(service.getServerAuthor(), denoteForTrackingEvent, "remove denotation"); raceLog.revokeEvent(service.getServerAuthor(), startTrackingEvent, "reset start time upon removing denotation"); @@ -295,10 +295,10 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter { //unregister for (RaceLogEvent event : raceLog.getUnrevokedEventsDescending()) { if (event instanceof RegisterCompetitorEvent) { - RegisterCompetitorEvent registerEvent = (RegisterCompetitorEvent) event; + RaceLogRegisterCompetitorEvent registerEvent = (RaceLogRegisterCompetitorEvent) event; if (toBeRemoved.contains(registerEvent.getCompetitor())) { try { - raceLog.revokeEvent(service.getServerAuthor(), (RegisterCompetitorEvent) event, + raceLog.revokeEvent(service.getServerAuthor(), (RaceLogRegisterCompetitorEvent) event, "unregistering competitor because no longer selected for registration"); } catch (NotRevokableException e) { logger.log(Level.WARNING, "could not unregister competitor by adding RevokeEvent", e); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDMongoHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDMongoHandler.java index 8442ed46d4c..8646b044541 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDMongoHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDMongoHandler.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.racelogtracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.SmartphoneUUIDSerializationHandler; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDSerializationHandler; public class SmartphoneUUIDMongoHandler extends SmartphoneUUIDSerializationHandler implements DeviceIdentifierMongoHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDStringSerializationHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDStringSerializationHandler.java index 64c0668ed46..083c09d22a9 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDStringSerializationHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDStringSerializationHandler.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.racelogtracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierStringSerializationHandler; -import com.sap.sailing.domain.abstractlog.race.tracking.SmartphoneUUIDSerializationHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierStringSerializationHandler; +import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDSerializationHandler; public class SmartphoneUUIDStringSerializationHandler extends SmartphoneUUIDSerializationHandler implements DeviceIdentifierStringSerializationHandler { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierJsonHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierJsonHandler.java index beea49d3265..cbbf63daa44 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierJsonHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierJsonHandler.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifierImpl; import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierMongoHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierMongoHandler.java index 87823eb0fa7..861510296f1 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierMongoHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierMongoHandler.java @@ -4,9 +4,9 @@ import java.util.UUID; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.persistence.racelog.tracking.DeviceIdentifierMongoHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifierImpl; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierStringSerializationHandler.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierStringSerializationHandler.java index 20f16b1dc4c..e121abd0502 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierStringSerializationHandler.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/TrackFileImportDeviceIdentifierStringSerializationHandler.java @@ -2,9 +2,9 @@ package com.sap.sailing.domain.racelogtracking.impl; import java.util.UUID; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierStringSerializationHandler; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierStringSerializationHandler; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifierImpl; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java index 9f4c9e36cfa..895ab6a854c 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java @@ -17,7 +17,7 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogChangedVisitor; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; import com.sap.sailing.domain.common.abstractlog.NotRevokableException; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -107,7 +107,7 @@ public class RaceLogRevocationTest { @Test public void sameEventRevokedByTwoClientsBeforeSync() throws NotRevokableException { - DenoteForTrackingEvent event = RaceLogEventFactory.INSTANCE.createDenoteForTrackingEvent( + RaceLogDenoteForTrackingEvent event = RaceLogEventFactory.INSTANCE.createDenoteForTrackingEvent( now(), serverAuthor, 0, "race", null, null); serverRaceLog.add(event); diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java index f2abb2999af..035e393f9c7 100755 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java @@ -16,7 +16,7 @@ import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; import com.sap.sailing.domain.test.AbstractLeaderboardTest; import com.sap.sse.common.Util; @@ -79,7 +79,7 @@ public class SerializeRaceLogEventsTest { @Test public void testRaceLogSerializationWithEventContainingDeviceIdentifier() throws IOException, ClassNotFoundException { - DeviceCompetitorMappingEvent mappingEvent = eventFactory.createDeviceCompetitorMappingEvent( + RaceLogDeviceCompetitorMappingEvent mappingEvent = eventFactory.createDeviceCompetitorMappingEvent( MillisecondsTimePoint.now(), new LogEventAuthorImpl("Author Name", /* priority */0), new SmartphoneImeiIdentifier("1948364938463903"), AbstractLeaderboardTest.createCompetitor("Test Competitor"), 0, new MillisecondsTimePoint(0), new MillisecondsTimePoint(10)); raceLog.add(mappingEvent); @@ -89,8 +89,8 @@ public class SerializeRaceLogEventsTest { raceLog.lockForRead(); rl.lockForRead(); try { - DeviceCompetitorMappingEvent expected = ((DeviceCompetitorMappingEvent) raceLog.getFirstRawFix()); - DeviceCompetitorMappingEvent actual = ((DeviceCompetitorMappingEvent) rl.getFirstRawFix()); + RaceLogDeviceCompetitorMappingEvent expected = ((RaceLogDeviceCompetitorMappingEvent) raceLog.getFirstRawFix()); + RaceLogDeviceCompetitorMappingEvent actual = ((RaceLogDeviceCompetitorMappingEvent) rl.getFirstRawFix()); assertEquals(Util.size(raceLog.getRawFixes()), Util.size(rl.getRawFixes())); assertEquals(expected.getDevice().getIdentifierType(), actual.getDevice().getIdentifierType()); diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/DeviceMappingFinderTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/DeviceMappingFinderTest.java index 26904d76029..8fd25b70db0 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/DeviceMappingFinderTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/DeviceMappingFinderTest.java @@ -12,12 +12,12 @@ import org.junit.Test; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceCompetitorMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceCompetitorMappingFinder; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.impl.CompetitorImpl; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -29,7 +29,7 @@ public class DeviceMappingFinderTest extends AbstractRaceLogTrackingTest { private int time = 0; private List> getMappings() { - return new DeviceCompetitorMappingFinder(log).analyze().get(competitor); + return new RaceLogDeviceCompetitorMappingFinder(log).analyze().get(competitor); } private TimePoint t() { diff --git a/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF index df595e81de5..d9ca0ac7797 100644 --- a/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain.shared.android/META-INF/MANIFEST.MF @@ -32,8 +32,9 @@ Export-Package: com.sap.sailing.domain.abstractlog, com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl, com.sap.sailing.domain.abstractlog.race.tracking, com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl, - com.sap.sailing.domain.abstractlog.race.tracking.events, com.sap.sailing.domain.abstractlog.race.tracking.impl, + com.sap.sailing.domain.abstractlog.shared.analyzing, + com.sap.sailing.domain.abstractlog.shared.events, com.sap.sailing.domain.base, com.sap.sailing.domain.base.configuration, com.sap.sailing.domain.base.configuration.impl, @@ -41,6 +42,8 @@ Export-Package: com.sap.sailing.domain.abstractlog, com.sap.sailing.domain.base.impl, com.sap.sailing.domain.base.racegroup, com.sap.sailing.domain.base.racegroup.impl, + com.sap.sailing.domain.racelogtracking, + com.sap.sailing.domain.racelogtracking.impl, com.sap.sailing.domain.tracking, com.sap.sailing.domain.tracking.impl, com.sap.sailing.util.impl diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/Revokable.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/Revokable.java index 77f5c400bf6..a4643c274a3 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/Revokable.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/Revokable.java @@ -16,6 +16,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; * @author Fredrik Teschke * */ -public interface Revokable extends RaceLogEvent { +public interface Revokable { } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEvent.java index 9319be74b8e..1892397f800 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEvent.java @@ -1,27 +1,7 @@ package com.sap.sailing.domain.abstractlog.race; -import java.util.List; - import com.sap.sailing.domain.abstractlog.AbstractLogEvent; -import com.sap.sailing.domain.base.Competitor; -public interface RaceLogEvent extends AbstractLogEvent { +public interface RaceLogEvent extends AbstractLogEvent, RaceLogEventData { - /** - * Gets the event's pass identifier. - * - * Each {@link RaceLogEvent} is associated to a certain pass. A pass is every attempt to start and run a race. A - * new pass is initiated when a new start time is proposed (e.g. after the race was aborted). There might be certain - * event type that are not strictly bound to its pass. - * - */ - int getPassId(); - - /** - * Gets the list of associated {@link Competitor}s. - * - * A {@link RaceLogEvent} might be associated with a list of competitors, which are somehow relevant for this - * kind of event. An example is a list of competitors who are marked for an individual recall. - */ - List getInvolvedBoats(); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventData.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventData.java new file mode 100644 index 00000000000..97ce1745da2 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventData.java @@ -0,0 +1,26 @@ +package com.sap.sailing.domain.abstractlog.race; + +import java.util.List; + +import com.sap.sailing.domain.base.Competitor; + +public interface RaceLogEventData { + + /** + * Gets the event's pass identifier. + * + * Each {@link RaceLogEventData} is associated to a certain pass. A pass is every attempt to start and run a race. A + * new pass is initiated when a new start time is proposed (e.g. after the race was aborted). There might be certain + * event type that are not strictly bound to its pass. + * + */ + int getPassId(); + + /** + * Gets the list of associated {@link Competitor}s. + * + * A {@link RaceLogEventData} might be associated with a list of competitors, which are somehow relevant for this + * kind of event. An example is a list of competitors who are marked for an individual recall. + */ + List getInvolvedBoats(); +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventFactory.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventFactory.java index 8ebca9345cb..194a5812477 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventFactory.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventFactory.java @@ -5,16 +5,15 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventFactoryImpl; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CourseBase; @@ -22,6 +21,7 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.racelog.Flags; import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus; import com.sap.sailing.domain.common.racelog.RacingProcedureType; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.Wind; import com.sap.sse.common.TimePoint; @@ -101,26 +101,26 @@ public interface RaceLogEventFactory { RaceLogWindFixEvent createWindFixEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, Serializable id, List competitors, int passId, Wind wind); - DeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, + RaceLogDeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, DeviceIdentifier device, Competitor mappedTo, int passId, TimePoint from, TimePoint to); - DeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, + RaceLogDeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, DeviceIdentifier device, Mark mappedTo, int passId, TimePoint from, TimePoint to); - DenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, + RaceLogDenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, String raceName, BoatClass boatClass, Serializable raceId); - StartTrackingEvent createStartTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId); + RaceLogStartTrackingEvent createStartTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId); RaceLogRevokeEvent createRevokeEvent(AbstractLogEventAuthor author, int passId, RaceLogEvent toRevoke, String reason); - RegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Competitor competitor); + RaceLogRegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Competitor competitor); - DefineMarkEvent createDefineMarkEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Mark mark); + RaceLogDefineMarkEvent createDefineMarkEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Mark mark); - CloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, + RaceLogCloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Serializable deviceMappingEventId, TimePoint closingTimePoint); - AdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint timePoint, Serializable id, AbstractLogEventAuthor author, int currentPassId, + RaceLogAdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint timePoint, Serializable id, AbstractLogEventAuthor author, int currentPassId, AdditionalScoringInformationType informationType); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventRestoreFactory.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventRestoreFactory.java index 70b2c2942bc..feb012ddede 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventRestoreFactory.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventRestoreFactory.java @@ -5,16 +5,15 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventRestoreFactoryImpl; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CourseBase; @@ -22,6 +21,7 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.racelog.Flags; import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus; import com.sap.sailing.domain.common.racelog.RacingProcedureType; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.Wind; import com.sap.sse.common.TimePoint; @@ -70,32 +70,32 @@ public interface RaceLogEventRestoreFactory extends RaceLogEventFactory { RaceLogWindFixEvent createWindFixEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable id, List competitors, Integer passId, Wind wind); - DeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogDeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, DeviceIdentifier device, Competitor mappedTo, int passId, TimePoint from, TimePoint to); - DeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogDeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, DeviceIdentifier device, Mark mappedTo, int passId, TimePoint from, TimePoint to); - DenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogDenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, String raceName, BoatClass boatClass, Serializable raceId); - StartTrackingEvent createStartTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogStartTrackingEvent createStartTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId); RaceLogRevokeEvent createRevokeEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Serializable revokedEventId, String revokedEventType, String revokedEventShortInfo, String reason); - RegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogRegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Competitor competitor); - DefineMarkEvent createDefineMarkEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogDefineMarkEvent createDefineMarkEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Mark mark); - CloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogCloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Serializable deviceMappingEventId, TimePoint closingTimePoint); - AdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint createdAt, AbstractLogEventAuthor author, + RaceLogAdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, List competitors, int passId, AdditionalScoringInformationType informationType); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java index 6ea42fabadc..faac5c3074c 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.abstractlog.race; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; public interface RaceLogEventVisitor { @@ -39,19 +39,19 @@ public interface RaceLogEventVisitor { public void visit(RaceLogWindFixEvent event); - public void visit(DeviceCompetitorMappingEvent event); + public void visit(RaceLogDeviceCompetitorMappingEvent event); - public void visit(DeviceMarkMappingEvent event); + public void visit(RaceLogDeviceMarkMappingEvent event); - public void visit(DenoteForTrackingEvent event); + public void visit(RaceLogDenoteForTrackingEvent event); - public void visit(StartTrackingEvent event); + public void visit(RaceLogStartTrackingEvent event); - public void visit(RegisterCompetitorEvent event); + public void visit(RaceLogRegisterCompetitorEvent event); - public void visit(DefineMarkEvent event); + public void visit(RaceLogDefineMarkEvent event); - public void visit(CloseOpenEndedDeviceMappingEvent event); + public void visit(RaceLogCloseOpenEndedDeviceMappingEvent event); - public void visit(AdditionalScoringInformationEvent additionalScoringInformation); + public void visit(RaceLogAdditionalScoringInformationEvent additionalScoringInformation); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/AdditionalScoringInformationFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/AdditionalScoringInformationFinder.java index 3b4ef55d25d..d93be127975 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/AdditionalScoringInformationFinder.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/AdditionalScoringInformationFinder.java @@ -5,11 +5,11 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; /** - * Returns all {@link AdditionalScoringInformationEvent}s from the race log + * Returns all {@link RaceLogAdditionalScoringInformationEvent}s from the race log * that have not been revoked when using {@link #analyze()}. The resulting list * has the newest event first. The pass id is not relevant for the result. * @@ -21,7 +21,7 @@ import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformat * * @author Simon Marcel Pamies */ -public class AdditionalScoringInformationFinder extends RaceLogAnalyzer> { +public class AdditionalScoringInformationFinder extends RaceLogAnalyzer> { public AdditionalScoringInformationFinder(RaceLog raceLog) { super(raceLog); @@ -31,10 +31,10 @@ public class AdditionalScoringInformationFinder extends RaceLogAnalyzernewest * one as we assume that there can be only one unrevoked event of the same type. */ - public AdditionalScoringInformationEvent analyze(AdditionalScoringInformationType filterBy) { - AdditionalScoringInformationEvent result = null; - final List allUnrevokedEventsFromNewestToOldest = analyze(); - for (AdditionalScoringInformationEvent event : allUnrevokedEventsFromNewestToOldest) { + public RaceLogAdditionalScoringInformationEvent analyze(AdditionalScoringInformationType filterBy) { + RaceLogAdditionalScoringInformationEvent result = null; + final List allUnrevokedEventsFromNewestToOldest = analyze(); + for (RaceLogAdditionalScoringInformationEvent event : allUnrevokedEventsFromNewestToOldest) { if (event != null && event.getType() == filterBy) { result = event; break; @@ -44,12 +44,12 @@ public class AdditionalScoringInformationFinder extends RaceLogAnalyzer performAnalysis() { - final List result = new ArrayList(); + protected List performAnalysis() { + final List result = new ArrayList(); // fetch all unrevoked events starting with newest going to oldest for (RaceLogEvent event : getLog().getUnrevokedEventsDescending()) { - if (event instanceof AdditionalScoringInformationEvent) { - result.add((AdditionalScoringInformationEvent) event); + if (event instanceof RaceLogAdditionalScoringInformationEvent) { + result.add((RaceLogAdditionalScoringInformationEvent) event); } } return result; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java index a01b4e0c5c3..6be4ba80b79 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java @@ -16,14 +16,14 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; public abstract class AbstractRaceLogChangedVisitor implements RaceLogEventVisitor { protected abstract void notifyListenerAboutEventAdded(RaceLogEvent event); @@ -88,22 +88,22 @@ public abstract class AbstractRaceLogChangedVisitor implements RaceLogEventVisit } @Override - public void visit(DeviceCompetitorMappingEvent event) { + public void visit(RaceLogDeviceCompetitorMappingEvent event) { notifyListenerAboutEventAdded(event); } @Override - public void visit(DeviceMarkMappingEvent event) { + public void visit(RaceLogDeviceMarkMappingEvent event) { notifyListenerAboutEventAdded(event); } @Override - public void visit(DenoteForTrackingEvent event) { + public void visit(RaceLogDenoteForTrackingEvent event) { notifyListenerAboutEventAdded(event); } @Override - public void visit(StartTrackingEvent event) { + public void visit(RaceLogStartTrackingEvent event) { notifyListenerAboutEventAdded(event); } @@ -113,22 +113,22 @@ public abstract class AbstractRaceLogChangedVisitor implements RaceLogEventVisit } @Override - public void visit(RegisterCompetitorEvent event) { + public void visit(RaceLogRegisterCompetitorEvent event) { notifyListenerAboutEventAdded(event); } @Override - public void visit(DefineMarkEvent event) { + public void visit(RaceLogDefineMarkEvent event) { notifyListenerAboutEventAdded(event); } @Override - public void visit(CloseOpenEndedDeviceMappingEvent event) { + public void visit(RaceLogCloseOpenEndedDeviceMappingEvent event) { notifyListenerAboutEventAdded(event); } @Override - public void visit(AdditionalScoringInformationEvent additionalScoringInformation) { + public void visit(RaceLogAdditionalScoringInformationEvent additionalScoringInformation) { notifyListenerAboutEventAdded(additionalScoringInformation); } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java index 54365c8642a..159948d96d7 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java @@ -15,14 +15,14 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; /** * Base class implementing {@link RaceLogEventVisitor}. Every method is implemented as a no-op. @@ -95,22 +95,22 @@ public abstract class BaseRaceLogEventVisitor implements RaceLogEventVisitor { } @Override - public void visit(DeviceCompetitorMappingEvent event) { + public void visit(RaceLogDeviceCompetitorMappingEvent event) { } @Override - public void visit(DeviceMarkMappingEvent event) { + public void visit(RaceLogDeviceMarkMappingEvent event) { } @Override - public void visit(DenoteForTrackingEvent event) { + public void visit(RaceLogDenoteForTrackingEvent event) { } @Override - public void visit(StartTrackingEvent event) { + public void visit(RaceLogStartTrackingEvent event) { } @@ -120,22 +120,22 @@ public abstract class BaseRaceLogEventVisitor implements RaceLogEventVisitor { } @Override - public void visit(RegisterCompetitorEvent event) { + public void visit(RaceLogRegisterCompetitorEvent event) { } @Override - public void visit(DefineMarkEvent event) { + public void visit(RaceLogDefineMarkEvent event) { } @Override - public void visit(CloseOpenEndedDeviceMappingEvent event) { + public void visit(RaceLogCloseOpenEndedDeviceMappingEvent event) { } @Override - public void visit(AdditionalScoringInformationEvent event) { + public void visit(RaceLogAdditionalScoringInformationEvent event) { } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventDataImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventDataImpl.java new file mode 100644 index 00000000000..5115dc81adc --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventDataImpl.java @@ -0,0 +1,36 @@ +package com.sap.sailing.domain.abstractlog.race.impl; + +import java.util.Collections; +import java.util.List; + +import com.sap.sailing.domain.abstractlog.race.RaceLogEventData; +import com.sap.sailing.domain.base.Competitor; + +public class RaceLogEventDataImpl implements RaceLogEventData { + private final List involvedBoats; + private final int passId; + + public RaceLogEventDataImpl(List involvedBoats, int passId) { + if (involvedBoats == null) { + this.involvedBoats = Collections.emptyList(); + } else { + this.involvedBoats = involvedBoats; + } + this.passId = passId; + } + + @Override + public List getInvolvedBoats() { + return involvedBoats; + } + + @Override + public int getPassId() { + return passId; + } + + @Override + public String toString() { + return super.toString() + ", involvedBoats: " + getInvolvedBoats() + ", passId: " + getPassId(); + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java index b1ea5d16a69..8b78d0e4101 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java @@ -23,24 +23,23 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; -import com.sap.sailing.domain.abstractlog.race.scoring.impl.AdditionalScoringInformationEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.events.CloseOpenEndedDeviceMappingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DefineMarkEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DenoteForTrackingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DeviceCompetitorMappingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DeviceMarkMappingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.RegisterCompetitorEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.StartTrackingEventImpl; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.impl.RaceLogAdditionalScoringInformationEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogCloseOpenEndedDeviceMappingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDefineMarkEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDenoteForTrackingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDeviceCompetitorMappingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDeviceMarkMappingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogRegisterCompetitorEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogStartTrackingEventImpl; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CourseBase; @@ -48,6 +47,7 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.racelog.Flags; import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus; import com.sap.sailing.domain.common.racelog.RacingProcedureType; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.Wind; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -224,29 +224,29 @@ public class RaceLogEventFactoryImpl implements RaceLogEventFactory { } @Override - public DeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, + public RaceLogDeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, DeviceIdentifier device, Competitor mappedTo, int passId, TimePoint from, TimePoint to) { - return new DeviceCompetitorMappingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), + return new RaceLogDeviceCompetitorMappingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, mappedTo, device, from, to); } @Override - public DeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, + public RaceLogDeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, DeviceIdentifier device, Mark mappedTo, int passId, TimePoint from, TimePoint to) { - return new DeviceMarkMappingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), + return new RaceLogDeviceMarkMappingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, mappedTo, device, from, to); } @Override - public DenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, + public RaceLogDenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, String raceName, BoatClass boatClass, Serializable raceId) { - return new DenoteForTrackingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, raceName, + return new RaceLogDenoteForTrackingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, raceName, boatClass, raceId); } @Override - public StartTrackingEvent createStartTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId) { - return new StartTrackingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId); + public RaceLogStartTrackingEvent createStartTrackingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId) { + return new RaceLogStartTrackingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId); } @Override @@ -255,28 +255,28 @@ public class RaceLogEventFactoryImpl implements RaceLogEventFactory { } @Override - public RegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, + public RaceLogRegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Competitor competitor) { - return new RegisterCompetitorEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, competitor); + return new RaceLogRegisterCompetitorEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, competitor); } @Override - public DefineMarkEvent createDefineMarkEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, + public RaceLogDefineMarkEvent createDefineMarkEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Mark mark) { - return new DefineMarkEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, mark); + return new RaceLogDefineMarkEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, mark); } @Override - public CloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint logicalTimePoint, + public RaceLogCloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint logicalTimePoint, AbstractLogEventAuthor author, int passId, Serializable deviceMappingEventId, TimePoint closingTimePoint) { - return new CloseOpenEndedDeviceMappingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, + return new RaceLogCloseOpenEndedDeviceMappingEventImpl(MillisecondsTimePoint.now(), author, logicalTimePoint, UUID.randomUUID(), passId, deviceMappingEventId, closingTimePoint); } @Override - public AdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint timePoint, Serializable id, + public RaceLogAdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint timePoint, Serializable id, AbstractLogEventAuthor author, int currentPassId, AdditionalScoringInformationType informationType) { - return new AdditionalScoringInformationEventImpl(MillisecondsTimePoint.now(), author, timePoint, id, Collections.emptyList(), currentPassId, + return new RaceLogAdditionalScoringInformationEventImpl(MillisecondsTimePoint.now(), author, timePoint, id, Collections.emptyList(), currentPassId, informationType); } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventImpl.java index 67215a51a0b..d3d5ad55d8c 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventImpl.java @@ -6,35 +6,33 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventData; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; import com.sap.sailing.domain.base.Competitor; import com.sap.sse.common.TimePoint; public abstract class RaceLogEventImpl extends AbstractLogEventImpl implements RaceLogEvent { - private final List involvedBoats; - private final int passId; - private static final long serialVersionUID = -2557594972618769182L; + private final RaceLogEventData raceLogEventData; public RaceLogEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, List pInvolvedBoats, int pPassId) { super(createdAt, author, logicalTimePoint, pId); - this.involvedBoats = pInvolvedBoats; - this.passId = pPassId; + this.raceLogEventData = new RaceLogEventDataImpl(pInvolvedBoats, pPassId); } - + @Override public List getInvolvedBoats() { - return involvedBoats; + return raceLogEventData.getInvolvedBoats(); } - + @Override public int getPassId() { - return passId; + return raceLogEventData.getPassId(); } @Override public String toString() { - return super.toString() + ", involvedBoats: " + getInvolvedBoats() + ", passId: " + getPassId(); + return raceLogEventData.toString(); } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventRestoreFactoryImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventRestoreFactoryImpl.java index 9224fee263f..bebd30a80cb 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventRestoreFactoryImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventRestoreFactoryImpl.java @@ -20,24 +20,23 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; -import com.sap.sailing.domain.abstractlog.race.scoring.impl.AdditionalScoringInformationEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.events.CloseOpenEndedDeviceMappingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DefineMarkEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DenoteForTrackingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DeviceCompetitorMappingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DeviceMarkMappingEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.RegisterCompetitorEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.events.StartTrackingEventImpl; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.impl.RaceLogAdditionalScoringInformationEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogCloseOpenEndedDeviceMappingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDefineMarkEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDenoteForTrackingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDeviceCompetitorMappingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDeviceMarkMappingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogRegisterCompetitorEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogStartTrackingEventImpl; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CourseBase; @@ -45,6 +44,7 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.racelog.Flags; import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus; import com.sap.sailing.domain.common.racelog.RacingProcedureType; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.Wind; import com.sap.sse.common.TimePoint; @@ -131,28 +131,28 @@ public class RaceLogEventRestoreFactoryImpl extends RaceLogEventFactoryImpl impl } @Override - public DeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + public RaceLogDeviceCompetitorMappingEvent createDeviceCompetitorMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, DeviceIdentifier device, Competitor mappedTo, int passId, TimePoint from, TimePoint to) { - return new DeviceCompetitorMappingEventImpl(createdAt, author, logicalTimePoint, pId, passId, mappedTo, device, from, to); + return new RaceLogDeviceCompetitorMappingEventImpl(createdAt, author, logicalTimePoint, pId, passId, mappedTo, device, from, to); } @Override - public DeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + public RaceLogDeviceMarkMappingEvent createDeviceMarkMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, DeviceIdentifier device, Mark mappedTo, int passId, TimePoint from, TimePoint to) { - return new DeviceMarkMappingEventImpl(createdAt, author, logicalTimePoint, pId, passId, mappedTo, device, from, to); + return new RaceLogDeviceMarkMappingEventImpl(createdAt, author, logicalTimePoint, pId, passId, mappedTo, device, from, to); } @Override - public DenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, + public RaceLogDenoteForTrackingEvent createDenoteForTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, String raceName, BoatClass boatClass, Serializable raceId) { - return new DenoteForTrackingEventImpl(createdAt, author, logicalTimePoint, pId, passId, raceName, boatClass, raceId); + return new RaceLogDenoteForTrackingEventImpl(createdAt, author, logicalTimePoint, pId, passId, raceName, boatClass, raceId); } @Override - public StartTrackingEvent createStartTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, + public RaceLogStartTrackingEvent createStartTrackingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId) { - return new StartTrackingEventImpl(createdAt, author, logicalTimePoint, pId, passId); + return new RaceLogStartTrackingEventImpl(createdAt, author, logicalTimePoint, pId, passId); } @Override @@ -162,29 +162,29 @@ public class RaceLogEventRestoreFactoryImpl extends RaceLogEventFactoryImpl impl } @Override - public RegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, + public RaceLogRegisterCompetitorEvent createRegisterCompetitorEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Competitor competitor) { - return new RegisterCompetitorEventImpl(createdAt, author, logicalTimePoint, pId, passId, competitor); + return new RaceLogRegisterCompetitorEventImpl(createdAt, author, logicalTimePoint, pId, passId, competitor); } @Override - public DefineMarkEvent createDefineMarkEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, + public RaceLogDefineMarkEvent createDefineMarkEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Mark mark) { - return new DefineMarkEventImpl(createdAt, author, logicalTimePoint, pId, passId, mark); + return new RaceLogDefineMarkEventImpl(createdAt, author, logicalTimePoint, pId, passId, mark); } @Override - public CloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint createdAt, + public RaceLogCloseOpenEndedDeviceMappingEvent createCloseOpenEndedDeviceMappingEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Serializable deviceMappingEventId, TimePoint closingTimePoint) { - return new CloseOpenEndedDeviceMappingEventImpl(createdAt, author, logicalTimePoint, pId, passId, + return new RaceLogCloseOpenEndedDeviceMappingEventImpl(createdAt, author, logicalTimePoint, pId, passId, deviceMappingEventId, closingTimePoint); } @Override - public AdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint createdAt, + public RaceLogAdditionalScoringInformationEvent createAdditionalScoringInformationEvent(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, List competitors, int passId, AdditionalScoringInformationType informationType) { - return new AdditionalScoringInformationEventImpl(createdAt, author, logicalTimePoint, pId, competitors, passId, informationType); + return new RaceLogAdditionalScoringInformationEventImpl(createdAt, author, logicalTimePoint, pId, competitors, passId, informationType); } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogRevokeEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogRevokeEventImpl.java index dad26727031..faaadf7faf7 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogRevokeEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogRevokeEventImpl.java @@ -1,46 +1,51 @@ package com.sap.sailing.domain.abstractlog.race.impl; import java.io.Serializable; -import java.util.Collections; import java.util.List; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.RevokeEventImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventData; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sse.common.TimePoint; public class RaceLogRevokeEventImpl extends RevokeEventImpl implements RaceLogRevokeEvent { - private final int passId; + private static final long serialVersionUID = 1886722815573499311L; + private final RaceLogEventData raceLogEventData; public RaceLogRevokeEventImpl(AbstractLogEventAuthor author, int passId, RaceLogEvent toRevoke, String reason) { super(author, toRevoke, reason); - this.passId = passId; + this.raceLogEventData = new RaceLogEventDataImpl(null, passId); } public RaceLogRevokeEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int passId, Serializable revokedEventId, String revokedEventType, String revokedEventShortInfo, String reason) { super(createdAt, author, logicalTimePoint, pId, revokedEventId, revokedEventType, revokedEventShortInfo, reason); - this.passId = passId; + this.raceLogEventData = new RaceLogEventDataImpl(null, passId); } - private static final long serialVersionUID = 1886722815573499311L; @Override public int getPassId() { - return passId; + return raceLogEventData.getPassId(); } @Override public List getInvolvedBoats() { - return Collections.emptyList(); + return raceLogEventData.getInvolvedBoats(); } @Override public void accept(RaceLogEventVisitor visitor) { visitor.visit(this); } + + @Override + public String toString() { + return raceLogEventData.toString(); + } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/AdditionalScoringInformationEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/RaceLogAdditionalScoringInformationEvent.java similarity index 85% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/AdditionalScoringInformationEvent.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/RaceLogAdditionalScoringInformationEvent.java index 336b570e856..279e226166c 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/AdditionalScoringInformationEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/RaceLogAdditionalScoringInformationEvent.java @@ -12,7 +12,7 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; * * @author Simon Marcel Pamies */ -public interface AdditionalScoringInformationEvent extends RaceLogEvent, Revokable, InvalidatesLeaderboardCache { +public interface RaceLogAdditionalScoringInformationEvent extends RaceLogEvent, Revokable, InvalidatesLeaderboardCache { /** * @return the type of information this event holds diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/impl/AdditionalScoringInformationEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/impl/RaceLogAdditionalScoringInformationEventImpl.java similarity index 78% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/impl/AdditionalScoringInformationEventImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/impl/RaceLogAdditionalScoringInformationEventImpl.java index 73756f06931..ba25a697404 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/impl/AdditionalScoringInformationEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/scoring/impl/RaceLogAdditionalScoringInformationEventImpl.java @@ -6,17 +6,17 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; import com.sap.sailing.domain.base.Competitor; import com.sap.sse.common.TimePoint; -public class AdditionalScoringInformationEventImpl extends RaceLogEventImpl implements AdditionalScoringInformationEvent { +public class RaceLogAdditionalScoringInformationEventImpl extends RaceLogEventImpl implements RaceLogAdditionalScoringInformationEvent { private static final long serialVersionUID = -7627714111951381979L; private final AdditionalScoringInformationType informationType; - public AdditionalScoringInformationEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, + public RaceLogAdditionalScoringInformationEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, List competitors, int pPassId, AdditionalScoringInformationType informationType) { super(createdAt, author, logicalTimePoint, pId, competitors, pPassId); this.informationType = informationType; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/RaceState.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/RaceState.java index de248e37fc1..a0d5f94fb90 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/RaceState.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/RaceState.java @@ -4,7 +4,7 @@ import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure; import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite; @@ -142,7 +142,7 @@ public interface RaceState extends ReadonlyRaceState { void setWindFix(TimePoint now, Wind wind); /** - * Marks this race state with a new {@link AdditionalScoringInformationEvent} or revokes + * Marks this race state with a new {@link RaceLogAdditionalScoringInformationEvent} or revokes * an already existing one. */ void setAdditionalScoringInformationEnabled(TimePoint creationTimePoint, boolean enable, AdditionalScoringInformationType informationType); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateImpl.java index 08e97f5b6d0..5ce66d5c9ce 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateImpl.java @@ -10,7 +10,7 @@ import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.AdditionalScoringInformationFinder; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceStatusAnalyzer; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; import com.sap.sailing.domain.abstractlog.race.state.RaceState; import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure; @@ -169,7 +169,7 @@ public class RaceStateImpl extends ReadonlyRaceStateImpl implements RaceState { @Override public void setAdditionalScoringInformationEnabled(TimePoint timePoint, boolean enable, AdditionalScoringInformationType informationType) { - final AdditionalScoringInformationEvent event = new AdditionalScoringInformationFinder(raceLog).analyze(/*filterBy*/informationType); + final RaceLogAdditionalScoringInformationEvent event = new AdditionalScoringInformationFinder(raceLog).analyze(/*filterBy*/informationType); if (enable) { if (event == null) { raceLog.add(factory.createAdditionalScoringInformationEvent(timePoint, UUID.randomUUID(), author, raceLog.getCurrentPassId(), informationType)); @@ -188,7 +188,7 @@ public class RaceStateImpl extends ReadonlyRaceStateImpl implements RaceState { @Override public boolean isAdditionalScoringInformationEnabled(AdditionalScoringInformationType informationType) { - final AdditionalScoringInformationEvent event = new AdditionalScoringInformationFinder(raceLog).analyze(/*filterBy*/informationType); + final RaceLogAdditionalScoringInformationEvent event = new AdditionalScoringInformationFinder(raceLog).analyze(/*filterBy*/informationType); return event != null; } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceCompetitorMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceCompetitorMappingEvent.java deleted file mode 100644 index 893d8ee5b7e..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceCompetitorMappingEvent.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; - -import com.sap.sailing.domain.base.Competitor; - -public interface DeviceCompetitorMappingEvent extends DeviceMappingEvent { - -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMarkMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMarkMappingEvent.java deleted file mode 100644 index 14b47983fb5..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMarkMappingEvent.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; - -import com.sap.sailing.domain.base.Mark; - -public interface DeviceMarkMappingEvent extends DeviceMappingEvent { - -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogCloseOpenEndedDeviceMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogCloseOpenEndedDeviceMappingEvent.java new file mode 100644 index 00000000000..25becd6a796 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogCloseOpenEndedDeviceMappingEvent.java @@ -0,0 +1,10 @@ +package com.sap.sailing.domain.abstractlog.race.tracking; + +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent; + +public interface RaceLogCloseOpenEndedDeviceMappingEvent extends RaceLogEvent, +CloseOpenEndedDeviceMappingEvent { + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DefineMarkEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDefineMarkEvent.java similarity index 81% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DefineMarkEvent.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDefineMarkEvent.java index 99409ee5e1c..f48da589609 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DefineMarkEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDefineMarkEvent.java @@ -9,6 +9,6 @@ import com.sap.sailing.domain.base.Mark; * @author Fredrik Teschke * */ -public interface DefineMarkEvent extends RaceLogEvent, Revokable { +public interface RaceLogDefineMarkEvent extends RaceLogEvent, Revokable { Mark getMark(); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DenoteForTrackingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDenoteForTrackingEvent.java similarity index 82% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DenoteForTrackingEvent.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDenoteForTrackingEvent.java index 6bda197053a..9035e3b53a6 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DenoteForTrackingEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDenoteForTrackingEvent.java @@ -5,6 +5,7 @@ import java.io.Serializable; import com.sap.sailing.domain.abstractlog.Revokable; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; import com.sap.sailing.domain.base.BoatClass; /** @@ -16,7 +17,7 @@ import com.sap.sailing.domain.base.BoatClass; * @author Fredrik Teschke * */ -public interface DenoteForTrackingEvent extends RaceLogEvent, Revokable { +public interface RaceLogDenoteForTrackingEvent extends RaceLogEvent, Revokable { String getRaceName(); BoatClass getBoatClass(); Serializable getRaceId(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceCompetitorMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceCompetitorMappingEvent.java new file mode 100644 index 00000000000..dbaee1c7e75 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceCompetitorMappingEvent.java @@ -0,0 +1,10 @@ +package com.sap.sailing.domain.abstractlog.race.tracking; + +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceCompetitorMappingEvent; + +public interface RaceLogDeviceCompetitorMappingEvent extends RaceLogEvent, +DeviceCompetitorMappingEvent { + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceMarkMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceMarkMappingEvent.java new file mode 100644 index 00000000000..73af94d801e --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogDeviceMarkMappingEvent.java @@ -0,0 +1,10 @@ +package com.sap.sailing.domain.abstractlog.race.tracking; + +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMarkMappingEvent; + +public interface RaceLogDeviceMarkMappingEvent extends RaceLogEvent, +DeviceMarkMappingEvent { + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogRegisterCompetitorEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogRegisterCompetitorEvent.java new file mode 100644 index 00000000000..185a9f226a8 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogRegisterCompetitorEvent.java @@ -0,0 +1,10 @@ +package com.sap.sailing.domain.abstractlog.race.tracking; + +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.events.RegisterCompetitorEvent; + +public interface RaceLogRegisterCompetitorEvent extends RaceLogEvent, +RegisterCompetitorEvent { + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/StartTrackingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogStartTrackingEvent.java similarity index 58% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/StartTrackingEvent.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogStartTrackingEvent.java index dfcf855a21b..cb162dcb430 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/StartTrackingEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RaceLogStartTrackingEvent.java @@ -3,15 +3,15 @@ package com.sap.sailing.domain.abstractlog.race.tracking; import com.sap.sailing.domain.abstractlog.Revokable; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.events.DeviceCompetitorMappingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogDeviceCompetitorMappingEventImpl; /** - * Closes the phase during which {@link DeviceCompetitorMappingEventImpl}s actually result + * Closes the phase during which {@link RaceLogDeviceCompetitorMappingEventImpl}s actually result * in competitors being added, and indicates that the server should create a {@link TrackedRace} * using the information in this {@link RaceLog}. * * @author Fredrik Teschke * */ -public interface StartTrackingEvent extends RaceLogEvent, Revokable { +public interface RaceLogStartTrackingEvent extends RaceLogEvent, Revokable { } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DefinedMarkFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DefinedMarkFinder.java index 4668fcda955..c1b381f81ba 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DefinedMarkFinder.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DefinedMarkFinder.java @@ -7,7 +7,7 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; import com.sap.sailing.domain.base.Mark; public class DefinedMarkFinder extends RaceLogAnalyzer> { @@ -19,8 +19,8 @@ public class DefinedMarkFinder extends RaceLogAnalyzer> { protected Collection performAnalysis() { List< Mark> result = new ArrayList(); for (RaceLogEvent event : getLog().getUnrevokedEvents()) { - if (event instanceof DefineMarkEvent) { - DefineMarkEvent dME = (DefineMarkEvent) event; + if (event instanceof RaceLogDefineMarkEvent) { + RaceLogDefineMarkEvent dME = (RaceLogDefineMarkEvent) event; result.add(dME.getMark()); } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceCompetitorMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceCompetitorMappingFinder.java deleted file mode 100644 index 2e9f75358cb..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceCompetitorMappingFinder.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; - -import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sailing.domain.base.Competitor; - -public class DeviceCompetitorMappingFinder extends DeviceMappingFinder { - - public DeviceCompetitorMappingFinder(RaceLog raceLog) { - super(raceLog); - } - - @Override - protected boolean isValidMapping(DeviceMappingEvent mapping) { - return mapping instanceof DeviceCompetitorMappingEvent; - } -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMarkMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMarkMappingFinder.java deleted file mode 100644 index e0e5e56c01d..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMarkMappingFinder.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; - -import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.base.Mark; - -public class DeviceMarkMappingFinder extends DeviceMappingFinder { - - public DeviceMarkMappingFinder(RaceLog raceLog) { - super(raceLog); - } - - @Override - protected boolean isValidMapping(DeviceMappingEvent mapping) { - return mapping instanceof DeviceMarkMappingEvent; - } -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/LastPingMappingEventFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/LastPingMappingEventFinder.java deleted file mode 100644 index 1e1fe3db773..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/LastPingMappingEventFinder.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; - -import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sse.common.WithID; - -public class LastPingMappingEventFinder extends RaceLogAnalyzer> { - private final WithID item; - - public LastPingMappingEventFinder(RaceLog raceLog, WithID forItem) { - super(raceLog); - this.item = forItem; - } - - @Override - protected DeviceMappingEvent performAnalysis() { - for (RaceLogEvent e : getLog().getUnrevokedEventsDescending()) { - if (e instanceof DeviceMappingEvent) { - DeviceMappingEvent mappingEvent = (DeviceMappingEvent) e; - if (item.equals(mappingEvent.getMappedTo()) && mappingEvent.getFrom() != null && - mappingEvent.getTo() != null && mappingEvent.getFrom().equals(mappingEvent.getTo())) { - @SuppressWarnings("unchecked") - DeviceMappingEvent cast = (DeviceMappingEvent) mappingEvent; - return cast; - } - } - } - return null; - } - -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/OpenEndedDeviceMappingCloser.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/OpenEndedDeviceMappingCloser.java deleted file mode 100644 index af8b1983fa4..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/OpenEndedDeviceMappingCloser.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; -import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; -import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sse.common.TimePoint; -import com.sap.sse.common.impl.MillisecondsTimePoint; - -/** - * Generates events that close the events that are responsible for the {@link #mapping} - * that is passed to the constructor. - * @author Fredrik Teschke - * - */ -public class OpenEndedDeviceMappingCloser extends RaceLogAnalyzer> { - private final DeviceMapping mapping; - private final AbstractLogEventAuthor author; - private final TimePoint closingTimePoint; - - public OpenEndedDeviceMappingCloser(RaceLog raceLog, DeviceMapping mapping, AbstractLogEventAuthor author, - TimePoint closingTimePoint) { - super(raceLog); - this.mapping = mapping; - this.author = author; - this.closingTimePoint = closingTimePoint; - } - - @Override - protected List performAnalysis() { - List result = new ArrayList(); - - for (Serializable eventId : mapping.getOriginalRaceLogEventIds()) { - DeviceMappingEvent event = (DeviceMappingEvent) getLog().getEventById(eventId); - if (event.getFrom() == null || event.getTo() == null) { - result.add(RaceLogEventFactory.INSTANCE.createCloseOpenEndedDeviceMappingEvent( - MillisecondsTimePoint.now(), author, getLog().getCurrentPassId(), event.getId(), closingTimePoint)); - } - } - return result; - } -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceInformationFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceInformationFinder.java index a1cb846d4e7..3d6acdc2ec4 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceInformationFinder.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceInformationFinder.java @@ -3,18 +3,18 @@ package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; -public class RaceInformationFinder extends RaceLogAnalyzer { +public class RaceInformationFinder extends RaceLogAnalyzer { public RaceInformationFinder(RaceLog raceLog) { super(raceLog); } @Override - protected DenoteForTrackingEvent performAnalysis() { + protected RaceLogDenoteForTrackingEvent performAnalysis() { for (RaceLogEvent event : getAllEvents()) { - if (event instanceof DenoteForTrackingEvent) { - return (DenoteForTrackingEvent) event; + if (event instanceof RaceLogDenoteForTrackingEvent) { + return (RaceLogDenoteForTrackingEvent) event; } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceCompetitorMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceCompetitorMappingFinder.java new file mode 100644 index 00000000000..8cb68c77322 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceCompetitorMappingFinder.java @@ -0,0 +1,15 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; + +import com.sap.sailing.domain.abstractlog.race.RaceLog; +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.analyzing.DeviceCompetitorMappingFinder; + +public class RaceLogDeviceCompetitorMappingFinder +extends DeviceCompetitorMappingFinder { + + public RaceLogDeviceCompetitorMappingFinder(RaceLog log) { + super(log); + } + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMappingFinder.java new file mode 100644 index 00000000000..30fc9abee46 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMappingFinder.java @@ -0,0 +1,16 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; + +import com.sap.sailing.domain.abstractlog.race.RaceLog; +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.analyzing.DeviceMappingFinder; +import com.sap.sse.common.WithID; + +public class RaceLogDeviceMappingFinder +extends DeviceMappingFinder { + + public RaceLogDeviceMappingFinder(RaceLog log) { + super(log); + } + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMarkMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMarkMappingFinder.java new file mode 100644 index 00000000000..d7af9fb6ee8 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogDeviceMarkMappingFinder.java @@ -0,0 +1,15 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; + +import com.sap.sailing.domain.abstractlog.race.RaceLog; +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.analyzing.DeviceMarkMappingFinder; + +public class RaceLogDeviceMarkMappingFinder +extends DeviceMarkMappingFinder { + + public RaceLogDeviceMarkMappingFinder(RaceLog log) { + super(log); + } + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogLastPingMappingEventFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogLastPingMappingEventFinder.java new file mode 100644 index 00000000000..dd484bce77a --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogLastPingMappingEventFinder.java @@ -0,0 +1,16 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; + +import com.sap.sailing.domain.abstractlog.race.RaceLog; +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.shared.analyzing.LastPingMappingEventFinder; +import com.sap.sse.common.WithID; + +public class RaceLogLastPingMappingEventFinder +extends LastPingMappingEventFinder { + + public RaceLogLastPingMappingEventFinder(RaceLog log, WithID forItem) { + super(log, forItem); + } + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogOpenEndedDeviceMappingCloser.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogOpenEndedDeviceMappingCloser.java new file mode 100644 index 00000000000..f7183da288f --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogOpenEndedDeviceMappingCloser.java @@ -0,0 +1,30 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; + +import java.io.Serializable; + +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.race.RaceLog; +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.analyzing.OpenEndedDeviceMappingCloser; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; +import com.sap.sse.common.TimePoint; + +public class RaceLogOpenEndedDeviceMappingCloser extends + OpenEndedDeviceMappingCloser { + + public RaceLogOpenEndedDeviceMappingCloser(RaceLog log, DeviceMapping mapping, AbstractLogEventAuthor author, + TimePoint closingTimePoint) { + super(log, mapping, author, closingTimePoint); + } + + @Override + protected RaceLogCloseOpenEndedDeviceMappingEvent createCloseEvent(TimePoint logicalTimePoint, + Serializable eventToCloseId) { + return RaceLogEventFactory.INSTANCE.createCloseOpenEndedDeviceMappingEvent( + logicalTimePoint, author, getLog().getCurrentPassId(), eventToCloseId, closingTimePoint); + } + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogTrackingStateAnalyzer.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogTrackingStateAnalyzer.java index fd6026c4f8a..cb41747a50d 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogTrackingStateAnalyzer.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RaceLogTrackingStateAnalyzer.java @@ -3,8 +3,8 @@ package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.common.racelog.tracking.RaceLogTrackingState; public class RaceLogTrackingStateAnalyzer extends RaceLogAnalyzer { @@ -16,9 +16,9 @@ public class RaceLogTrackingStateAnalyzer extends RaceLogAnalyzeremptyList(), pPassId); - this.deviceMappingEventId = deviceMappingEventId; - this.closingTimePoint = closingTimePoint; - } - - @Override - public void accept(RaceLogEventVisitor visitor) { - visitor.visit(this); - } - - @Override - public Serializable getDeviceMappingEventId() { - return deviceMappingEventId; - } - - @Override - public TimePoint getClosingTimePoint() { - return closingTimePoint; - } - -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DeviceMarkMappingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DeviceMarkMappingEventImpl.java deleted file mode 100644 index c22ec2d4086..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DeviceMarkMappingEventImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.events; - -import java.io.Serializable; - -import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; -import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.base.Mark; -import com.sap.sse.common.TimePoint; - -public class DeviceMarkMappingEventImpl extends AbstractDeviceMappingEventImpl -implements DeviceMarkMappingEvent { - public DeviceMarkMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, - Serializable pId, int pPassId, Mark mappedTo, DeviceIdentifier device, TimePoint from, TimePoint to) { - super(createdAt, author, logicalTimePoint, pId, pPassId, mappedTo, device, from, to); - } - - private static final long serialVersionUID = -1494030544804758753L; - - @Override - public void accept(RaceLogEventVisitor visitor) { - visitor.visit(this); - } -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/RegisterCompetitorEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/RegisterCompetitorEventImpl.java deleted file mode 100644 index 667e99da2d6..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/RegisterCompetitorEventImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.events; - -import java.io.Serializable; -import java.util.Collections; - -import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; -import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; -import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.base.Competitor; -import com.sap.sse.common.TimePoint; - -public class RegisterCompetitorEventImpl extends RaceLogEventImpl implements RegisterCompetitorEvent { - private static final long serialVersionUID = -30864810737555657L; - - public RegisterCompetitorEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, - Serializable pId, int pPassId, Competitor competitor) { - super(createdAt, author, logicalTimePoint, pId, Collections.singletonList(competitor), pPassId); - } - - @Override - public void accept(RaceLogEventVisitor visitor) { - visitor.visit(this); - } - - @Override - public Competitor getCompetitor() { - return getInvolvedBoats().get(0); - } - - @Override - public String getShortInfo() { - return "competitor: " + getCompetitor().toString(); - } -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/AbstractRaceLogDeviceMappingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/AbstractRaceLogDeviceMappingEventImpl.java new file mode 100644 index 00000000000..54b6e405c36 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/AbstractRaceLogDeviceMappingEventImpl.java @@ -0,0 +1,43 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.impl; + +import java.io.Serializable; +import java.util.List; + +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventData; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventDataImpl; +import com.sap.sailing.domain.abstractlog.shared.events.impl.AbstractDeviceMappingEventImpl; +import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sse.common.TimePoint; +import com.sap.sse.common.WithID; + +public abstract class AbstractRaceLogDeviceMappingEventImpl +extends AbstractDeviceMappingEventImpl implements RaceLogEvent { + private static final long serialVersionUID = -5114645637316367845L; + private final RaceLogEventData raceLogEventData; + + public AbstractRaceLogDeviceMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, + TimePoint logicalTimePoint, Serializable id, int passId, ItemT mappedTo, DeviceIdentifier device, + TimePoint from, TimePoint to) { + super(createdAt, author, logicalTimePoint, id, mappedTo, device, from, to); + this.raceLogEventData = new RaceLogEventDataImpl(null, passId); + } + + @Override + public int getPassId() { + return raceLogEventData.getPassId(); + } + + @Override + public List getInvolvedBoats() { + return raceLogEventData.getInvolvedBoats(); + } + + @Override + public String toString() { + return raceLogEventData.toString(); + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogCloseOpenEndedDeviceMappingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogCloseOpenEndedDeviceMappingEventImpl.java new file mode 100644 index 00000000000..fbd1631f9d6 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogCloseOpenEndedDeviceMappingEventImpl.java @@ -0,0 +1,46 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.impl; + +import java.io.Serializable; +import java.util.List; + +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventData; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventDataImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.impl.BaseCloseOpenEndedDeviceMappingEventImpl; +import com.sap.sailing.domain.base.Competitor; +import com.sap.sse.common.TimePoint; + +public class RaceLogCloseOpenEndedDeviceMappingEventImpl extends BaseCloseOpenEndedDeviceMappingEventImpl +implements RaceLogCloseOpenEndedDeviceMappingEvent { + private static final long serialVersionUID = -5114645637316367845L; + private final RaceLogEventData raceLogEventData; + + public RaceLogCloseOpenEndedDeviceMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, + TimePoint logicalTimePoint, Serializable id, int passId, Serializable deviceMappingEventId, + TimePoint closingTimePoint) { + super(createdAt, author, logicalTimePoint, id, deviceMappingEventId, closingTimePoint); + this.raceLogEventData = new RaceLogEventDataImpl(null, passId); + } + + @Override + public int getPassId() { + return raceLogEventData.getPassId(); + } + + @Override + public List getInvolvedBoats() { + return raceLogEventData.getInvolvedBoats(); + } + + @Override + public String toString() { + return raceLogEventData.toString(); + } + + @Override + public void accept(RaceLogEventVisitor visitor) { + visitor.visit(this); + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DefineMarkEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDefineMarkEventImpl.java similarity index 70% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DefineMarkEventImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDefineMarkEventImpl.java index 7bd86161414..dcfccce6aeb 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DefineMarkEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDefineMarkEventImpl.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.events; +package com.sap.sailing.domain.abstractlog.race.tracking.impl; import java.io.Serializable; import java.util.Collections; @@ -6,17 +6,17 @@ import java.util.Collections; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; import com.sap.sse.common.TimePoint; -public class DefineMarkEventImpl extends RaceLogEventImpl implements DefineMarkEvent { +public class RaceLogDefineMarkEventImpl extends RaceLogEventImpl implements RaceLogDefineMarkEvent { private static final long serialVersionUID = 277007856878002208L; private final Mark mark; - public DefineMarkEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, + public RaceLogDefineMarkEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int pPassId, Mark mark) { super(createdAt, author, logicalTimePoint, pId, Collections.emptyList(), pPassId); this.mark = mark; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DenoteForTrackingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDenoteForTrackingEventImpl.java similarity index 77% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DenoteForTrackingEventImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDenoteForTrackingEventImpl.java index 465a6625825..21d6d7ea445 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DenoteForTrackingEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDenoteForTrackingEventImpl.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.events; +package com.sap.sailing.domain.abstractlog.race.tracking.impl; import java.io.Serializable; import java.util.Collections; @@ -6,20 +6,20 @@ import java.util.Collections; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sse.common.TimePoint; -public class DenoteForTrackingEventImpl extends RaceLogEventImpl implements -DenoteForTrackingEvent { +public class RaceLogDenoteForTrackingEventImpl extends RaceLogEventImpl implements +RaceLogDenoteForTrackingEvent { private static final long serialVersionUID = 6937741283401976385L; private final String raceName; private final BoatClass boatClass; private final Serializable raceId; - public DenoteForTrackingEventImpl(TimePoint createdAt, + public RaceLogDenoteForTrackingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int pPassId, String raceName, BoatClass boatClass, Serializable raceId) { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DeviceCompetitorMappingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDeviceCompetitorMappingEventImpl.java similarity index 54% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DeviceCompetitorMappingEventImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDeviceCompetitorMappingEventImpl.java index a4100857b52..41ef893339c 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/DeviceCompetitorMappingEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDeviceCompetitorMappingEventImpl.java @@ -1,17 +1,17 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.events; +package com.sap.sailing.domain.abstractlog.race.tracking.impl; import java.io.Serializable; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sse.common.TimePoint; -public class DeviceCompetitorMappingEventImpl extends AbstractDeviceMappingEventImpl -implements DeviceCompetitorMappingEvent { - public DeviceCompetitorMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, +public class RaceLogDeviceCompetitorMappingEventImpl extends AbstractRaceLogDeviceMappingEventImpl +implements RaceLogDeviceCompetitorMappingEvent { + public RaceLogDeviceCompetitorMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int pPassId, Competitor mappedTo, DeviceIdentifier device, TimePoint from, TimePoint to) { super(createdAt, author, logicalTimePoint, pId, pPassId, mappedTo, device, from, to); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDeviceMarkMappingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDeviceMarkMappingEventImpl.java new file mode 100644 index 00000000000..4ad9650c8c4 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDeviceMarkMappingEventImpl.java @@ -0,0 +1,25 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.impl; + +import java.io.Serializable; + +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.base.Mark; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sse.common.TimePoint; + +public class RaceLogDeviceMarkMappingEventImpl extends AbstractRaceLogDeviceMappingEventImpl +implements RaceLogDeviceMarkMappingEvent { + private static final long serialVersionUID = -7223543830755457196L; + + public RaceLogDeviceMarkMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, + Serializable pId, int pPassId, Mark mappedTo, DeviceIdentifier device, TimePoint from, TimePoint to) { + super(createdAt, author, logicalTimePoint, pId, pPassId, mappedTo, device, from, to); + } + + @Override + public void accept(RaceLogEventVisitor visitor) { + visitor.visit(this); + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogRegisterCompetitorEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogRegisterCompetitorEventImpl.java new file mode 100644 index 00000000000..2987db180c0 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogRegisterCompetitorEventImpl.java @@ -0,0 +1,45 @@ +package com.sap.sailing.domain.abstractlog.race.tracking.impl; + +import java.io.Serializable; +import java.util.List; + +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventData; +import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; +import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventDataImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.shared.events.impl.BaseRegisterCompetitorEventImpl; +import com.sap.sailing.domain.base.Competitor; +import com.sap.sse.common.TimePoint; + +public class RaceLogRegisterCompetitorEventImpl extends BaseRegisterCompetitorEventImpl +implements RaceLogRegisterCompetitorEvent { + private static final long serialVersionUID = -5114645637316367845L; + private final RaceLogEventData raceLogEventData; + + public RaceLogRegisterCompetitorEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, + TimePoint logicalTimePoint, Serializable id, int passId, Competitor competitor) { + super(createdAt, author, logicalTimePoint, id, competitor); + this.raceLogEventData = new RaceLogEventDataImpl(null, passId); + } + + @Override + public int getPassId() { + return raceLogEventData.getPassId(); + } + + @Override + public List getInvolvedBoats() { + return raceLogEventData.getInvolvedBoats(); + } + + @Override + public String toString() { + return raceLogEventData.toString(); + } + + @Override + public void accept(RaceLogEventVisitor visitor) { + visitor.visit(this); + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/StartTrackingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogStartTrackingEventImpl.java similarity index 65% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/StartTrackingEventImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogStartTrackingEventImpl.java index aece2279488..33a0fdca17b 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/StartTrackingEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogStartTrackingEventImpl.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.events; +package com.sap.sailing.domain.abstractlog.race.tracking.impl; import java.io.Serializable; import java.util.Collections; @@ -6,15 +6,15 @@ import java.util.Collections; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sse.common.TimePoint; -public class StartTrackingEventImpl extends RaceLogEventImpl implements -StartTrackingEvent { +public class RaceLogStartTrackingEventImpl extends RaceLogEventImpl implements +RaceLogStartTrackingEvent { private static final long serialVersionUID = 6017954368580125221L; - public StartTrackingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, + public RaceLogStartTrackingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, int pPassId) { super(createdAt, author, logicalTimePoint, pId, Collections.emptyList(), pPassId); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceCompetitorMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceCompetitorMappingFinder.java new file mode 100644 index 00000000000..bd3fcf133d8 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceCompetitorMappingFinder.java @@ -0,0 +1,21 @@ +package com.sap.sailing.domain.abstractlog.shared.analyzing; + +import com.sap.sailing.domain.abstractlog.AbstractLog; +import com.sap.sailing.domain.abstractlog.AbstractLogEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; +import com.sap.sailing.domain.base.Competitor; + +public class DeviceCompetitorMappingFinder, EventT extends AbstractLogEvent, VisitorT> +extends DeviceMappingFinder { + + public DeviceCompetitorMappingFinder(LogT log) { + super(log); + } + + @Override + protected boolean isValidMapping(DeviceMappingEvent mapping) { + return mapping instanceof DeviceCompetitorMappingEvent; + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMappingFinder.java similarity index 66% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMappingFinder.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMappingFinder.java index 1296105e346..c8989f7c1a8 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMappingFinder.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMappingFinder.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; +package com.sap.sailing.domain.abstractlog.shared.analyzing; import java.io.Serializable; import java.util.ArrayList; @@ -8,16 +8,17 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; +import com.sap.sailing.domain.abstractlog.AbstractLog; +import com.sap.sailing.domain.abstractlog.AbstractLogAnalyzer; +import com.sap.sailing.domain.abstractlog.AbstractLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.DeviceMappingImpl; +import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.common.impl.TimeRangeImpl; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; +import com.sap.sailing.domain.racelogtracking.impl.DeviceMappingImpl; import com.sap.sse.common.TimePoint; import com.sap.sse.common.WithID; @@ -34,14 +35,15 @@ import com.sap.sse.common.WithID; * {@code DeviceMapping}, the only changes being introduced by closing open time ranges in cases where an * according {@code CloseOpenEndedDeviceMappingEvent} exists. */ -public class DeviceMappingFinder extends RaceLogAnalyzer>>> { +public class DeviceMappingFinder, EventT extends AbstractLogEvent, +VisitorT, ItemT extends WithID> extends AbstractLogAnalyzer>>> { private static Logger logger = Logger.getLogger(DeviceMappingFinder.class.getName()); - public DeviceMappingFinder(RaceLog raceLog) { - super(raceLog); + public DeviceMappingFinder(LogT log) { + super(log); } - protected boolean isValidMapping(DeviceMappingEvent mapping) { + protected boolean isValidMapping(DeviceMappingEvent mapping) { return mapping instanceof DeviceMappingEvent; } @@ -61,18 +63,18 @@ public class DeviceMappingFinder extends RaceLogAnalyzer>> performAnalysis() { - Map>> events = new HashMap>>(); + Map>> events = new HashMap>>(); Map>> mappings = new HashMap>>(); - Map closingEvents = new HashMap(); + Map> closingEvents = new HashMap>(); - for (RaceLogEvent e : getLog().getUnrevokedEvents()) { - if (e instanceof DeviceMappingEvent && isValidMapping(((DeviceMappingEvent) e))) { + for (EventT e : getLog().getUnrevokedEvents()) { + if (e instanceof DeviceMappingEvent && isValidMapping(((DeviceMappingEvent) e))) { @SuppressWarnings("unchecked") - DeviceMappingEvent mappingEvent = (DeviceMappingEvent) e; + DeviceMappingEvent mappingEvent = (DeviceMappingEvent) e; getItemSet(events, mappingEvent.getMappedTo()).add(mappingEvent); } else if (e instanceof CloseOpenEndedDeviceMappingEvent) { //a higher priority closing events for the same mapping event overwrites the lower priority one - CloseOpenEndedDeviceMappingEvent closingEvent = (CloseOpenEndedDeviceMappingEvent) e; + CloseOpenEndedDeviceMappingEvent closingEvent = (CloseOpenEndedDeviceMappingEvent) e; closingEvents.put(closingEvent.getDeviceMappingEventId(), closingEvent); } } @@ -84,11 +86,11 @@ public class DeviceMappingFinder extends RaceLogAnalyzer> closeOpenRanges(List> events, ItemT item, - Map closingEvents) { + private List> closeOpenRanges(List> events, ItemT item, + Map> closingEvents) { List> result = new ArrayList>(); - for (DeviceMappingEvent event : events) { + for (DeviceMappingEvent event : events) { TimePoint from = event.getFrom(); TimePoint to = event.getTo(); TimePoint closingTimePoint = closingEvents.containsKey(event.getId()) ? diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMarkMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMarkMappingFinder.java new file mode 100644 index 00000000000..93035b49b10 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMarkMappingFinder.java @@ -0,0 +1,21 @@ +package com.sap.sailing.domain.abstractlog.shared.analyzing; + +import com.sap.sailing.domain.abstractlog.AbstractLog; +import com.sap.sailing.domain.abstractlog.AbstractLogEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMarkMappingEvent; +import com.sap.sailing.domain.base.Mark; + +public class DeviceMarkMappingFinder +, EventT extends AbstractLogEvent, VisitorT> +extends DeviceMappingFinder { + + public DeviceMarkMappingFinder(LogT log) { + super(log); + } + + @Override + protected boolean isValidMapping(DeviceMappingEvent mapping) { + return mapping instanceof DeviceMarkMappingEvent; + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/LastPingMappingEventFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/LastPingMappingEventFinder.java new file mode 100644 index 00000000000..aa571e092ab --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/LastPingMappingEventFinder.java @@ -0,0 +1,35 @@ +package com.sap.sailing.domain.abstractlog.shared.analyzing; + +import com.sap.sailing.domain.abstractlog.AbstractLog; +import com.sap.sailing.domain.abstractlog.AbstractLogAnalyzer; +import com.sap.sailing.domain.abstractlog.AbstractLogEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; +import com.sap.sse.common.WithID; + +public class LastPingMappingEventFinder , +EventT extends AbstractLogEvent, VisitorT, ItemT extends WithID> +extends AbstractLogAnalyzer> { + private final WithID item; + + public LastPingMappingEventFinder(LogT log, WithID forItem) { + super(log); + this.item = forItem; + } + + @Override + protected DeviceMappingEvent performAnalysis() { + for (EventT e : getLog().getUnrevokedEventsDescending()) { + if (e instanceof DeviceMappingEvent) { + DeviceMappingEvent mappingEvent = (DeviceMappingEvent) e; + if (item.equals(mappingEvent.getMappedTo()) && mappingEvent.getFrom() != null && + mappingEvent.getTo() != null && mappingEvent.getFrom().equals(mappingEvent.getTo())) { + @SuppressWarnings("unchecked") + DeviceMappingEvent cast = (DeviceMappingEvent) mappingEvent; + return cast; + } + } + } + return null; + } + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/OpenEndedDeviceMappingCloser.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/OpenEndedDeviceMappingCloser.java new file mode 100644 index 00000000000..8e588ce9cd9 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/OpenEndedDeviceMappingCloser.java @@ -0,0 +1,53 @@ +package com.sap.sailing.domain.abstractlog.shared.analyzing; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import com.sap.sailing.domain.abstractlog.AbstractLog; +import com.sap.sailing.domain.abstractlog.AbstractLogAnalyzer; +import com.sap.sailing.domain.abstractlog.AbstractLogEvent; +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; +import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.MillisecondsTimePoint; + +/** + * Generates events that close the events that are responsible for the {@link #mapping} + * that is passed to the constructor. + * @author Fredrik Teschke + * + */ +public abstract class OpenEndedDeviceMappingCloser, +EventT extends AbstractLogEvent,VisitorT, CloseEventT extends CloseOpenEndedDeviceMappingEvent> +extends AbstractLogAnalyzer> { + private final DeviceMapping mapping; + protected final AbstractLogEventAuthor author; + protected final TimePoint closingTimePoint; + + public OpenEndedDeviceMappingCloser(LogT log, DeviceMapping mapping, AbstractLogEventAuthor author, + TimePoint closingTimePoint) { + super(log); + this.mapping = mapping; + this.author = author; + this.closingTimePoint = closingTimePoint; + } + + protected abstract CloseEventT createCloseEvent(TimePoint logicalTimePoint, + Serializable eventToCloseId); + + @Override + protected List performAnalysis() { + List result = new ArrayList(); + + for (Serializable eventId : mapping.getOriginalRaceLogEventIds()) { + DeviceMappingEvent event = (DeviceMappingEvent) getLog().getEventById(eventId); + if (event.getFrom() == null || event.getTo() == null) { + result.add(createCloseEvent(MillisecondsTimePoint.now(), event.getId())); + } + } + return result; + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RegisteredCompetitorsAnalyzer.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/RegisteredCompetitorsAnalyzer.java similarity index 76% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RegisteredCompetitorsAnalyzer.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/RegisteredCompetitorsAnalyzer.java index d01da5cb3f1..cda68c17f71 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/RegisteredCompetitorsAnalyzer.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/RegisteredCompetitorsAnalyzer.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl; +package com.sap.sailing.domain.abstractlog.shared.analyzing; import java.util.HashSet; import java.util.Set; @@ -6,7 +6,8 @@ import java.util.Set; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.shared.events.RegisterCompetitorEvent; import com.sap.sailing.domain.base.Competitor; /** @@ -27,7 +28,7 @@ public class RegisteredCompetitorsAnalyzer extends RaceLogAnalyzer extends AbstractLogEvent, Revokable { /** * Returns the timepoint that shall substitute the missing one in the corresponding {@link DeviceMappingEvent}. */ diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceCompetitorMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceCompetitorMappingEvent.java new file mode 100644 index 00000000000..b69f0a013da --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceCompetitorMappingEvent.java @@ -0,0 +1,7 @@ +package com.sap.sailing.domain.abstractlog.shared.events; + +import com.sap.sailing.domain.base.Competitor; + +public interface DeviceCompetitorMappingEvent extends DeviceMappingEvent { + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceMappingEvent.java similarity index 79% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMappingEvent.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceMappingEvent.java index 1b206ae2490..2a31b71140e 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMappingEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceMappingEvent.java @@ -1,10 +1,12 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.abstractlog.shared.events; +import com.sap.sailing.domain.abstractlog.AbstractLogEvent; import com.sap.sailing.domain.abstractlog.Revokable; -import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DefinedMarkFinder; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sse.common.TimePoint; import com.sap.sse.common.WithID; @@ -20,7 +22,7 @@ import com.sap.sse.common.WithID; * @see DefinedMarkFinder for rules by which {@link DeviceMapping}s are derived from these events. * @author Fredrik Teschke */ -public interface DeviceMappingEvent extends RaceLogEvent, Revokable { +public interface DeviceMappingEvent extends AbstractLogEvent, Revokable { ItemType getMappedTo(); DeviceIdentifier getDevice(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceMarkMappingEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceMarkMappingEvent.java new file mode 100644 index 00000000000..57cf64aa6c9 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceMarkMappingEvent.java @@ -0,0 +1,8 @@ +package com.sap.sailing.domain.abstractlog.shared.events; + +import com.sap.sailing.domain.base.Mark; + + +public interface DeviceMarkMappingEvent extends DeviceMappingEvent { + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceWithTimeRange.java similarity index 63% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceWithTimeRange.java index 612501b8b4e..c866b49d6f7 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DeviceWithTimeRange.java @@ -1,7 +1,8 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.abstractlog.shared.events; import com.sap.sailing.domain.base.Timed; import com.sap.sailing.domain.common.TimeRange; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; public interface DeviceWithTimeRange extends Timed { DeviceIdentifier getDevice(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RegisterCompetitorEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/RegisterCompetitorEvent.java similarity index 74% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RegisterCompetitorEvent.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/RegisterCompetitorEvent.java index af42482ae87..9533e293da3 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/RegisterCompetitorEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/RegisterCompetitorEvent.java @@ -1,8 +1,8 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.abstractlog.shared.events; +import com.sap.sailing.domain.abstractlog.AbstractLogEvent; import com.sap.sailing.domain.abstractlog.Revokable; import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sse.common.IsManagedByCache; @@ -16,6 +16,6 @@ import com.sap.sse.common.IsManagedByCache; * @author Fredrik Teschke * */ -public interface RegisterCompetitorEvent extends RaceLogEvent, Revokable { +public interface RegisterCompetitorEvent extends AbstractLogEvent, Revokable { Competitor getCompetitor(); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/AbstractDeviceMappingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/AbstractDeviceMappingEventImpl.java similarity index 59% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/AbstractDeviceMappingEventImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/AbstractDeviceMappingEventImpl.java index 84318b98880..edcfc7a5748 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/events/AbstractDeviceMappingEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/AbstractDeviceMappingEventImpl.java @@ -1,18 +1,16 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.events; +package com.sap.sailing.domain.abstractlog.shared.events.impl; import java.io.Serializable; -import java.util.Collections; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; -import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventImpl; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sse.common.TimePoint; import com.sap.sse.common.WithID; -public abstract class AbstractDeviceMappingEventImpl extends RaceLogEventImpl implements -DeviceMappingEvent { +public abstract class AbstractDeviceMappingEventImpl extends AbstractLogEventImpl implements +DeviceMappingEvent { private static final long serialVersionUID = -8439653251231710356L; private final ItemType mappedTo; @@ -21,9 +19,9 @@ DeviceMappingEvent { private final TimePoint to; public AbstractDeviceMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, - TimePoint logicalTimePoint, Serializable pId, int pPassId, ItemType mappedTo, + TimePoint logicalTimePoint, Serializable id, ItemType mappedTo, DeviceIdentifier device, TimePoint from, TimePoint to) { - super(createdAt, author, logicalTimePoint, pId, Collections.emptyList(), pPassId); + super(createdAt, author, logicalTimePoint, id); this.mappedTo = mappedTo; this.device = device; this.from = from; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseCloseOpenEndedDeviceMappingEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseCloseOpenEndedDeviceMappingEventImpl.java new file mode 100644 index 00000000000..99b59436624 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseCloseOpenEndedDeviceMappingEventImpl.java @@ -0,0 +1,35 @@ +package com.sap.sailing.domain.abstractlog.shared.events.impl; + +import java.io.Serializable; + +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventImpl; +import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent; +import com.sap.sse.common.TimePoint; + +public abstract class BaseCloseOpenEndedDeviceMappingEventImpl extends AbstractLogEventImpl +implements CloseOpenEndedDeviceMappingEvent { + private static final long serialVersionUID = -2401732623610224918L; + + private final Serializable deviceMappingEventId; + private final TimePoint closingTimePoint; + + public BaseCloseOpenEndedDeviceMappingEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, + TimePoint logicalTimePoint, Serializable pId, Serializable deviceMappingEventId, + TimePoint closingTimePoint) { + super(createdAt, author, logicalTimePoint, pId); + this.deviceMappingEventId = deviceMappingEventId; + this.closingTimePoint = closingTimePoint; + } + + @Override + public Serializable getDeviceMappingEventId() { + return deviceMappingEventId; + } + + @Override + public TimePoint getClosingTimePoint() { + return closingTimePoint; + } + +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseRegisterCompetitorEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseRegisterCompetitorEventImpl.java new file mode 100644 index 00000000000..b94da1f285c --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/BaseRegisterCompetitorEventImpl.java @@ -0,0 +1,31 @@ +package com.sap.sailing.domain.abstractlog.shared.events.impl; + +import java.io.Serializable; + +import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventImpl; +import com.sap.sailing.domain.abstractlog.shared.events.RegisterCompetitorEvent; +import com.sap.sailing.domain.base.Competitor; +import com.sap.sse.common.TimePoint; + +public abstract class BaseRegisterCompetitorEventImpl extends AbstractLogEventImpl +implements RegisterCompetitorEvent { + private static final long serialVersionUID = -30864810737555657L; + private final Competitor competitor; + + public BaseRegisterCompetitorEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, + Serializable pId, Competitor competitor) { + super(createdAt, author, logicalTimePoint, pId); + this.competitor = competitor; + } + + @Override + public Competitor getCompetitor() { + return competitor; + } + + @Override + public String getShortInfo() { + return "competitor: " + getCompetitor().toString(); + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifier.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifier.java similarity index 97% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifier.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifier.java index 88ba1ce69b7..5471253c027 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifier.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifier.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.racelogtracking; import java.io.Serializable; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifierSerializationHandler.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifierSerializationHandler.java similarity index 97% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifierSerializationHandler.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifierSerializationHandler.java index 3c898f3746f..57327658980 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifierSerializationHandler.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifierSerializationHandler.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.racelogtracking; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifierStringSerializationHandler.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifierStringSerializationHandler.java similarity index 90% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifierStringSerializationHandler.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifierStringSerializationHandler.java index c92ed9308f8..2ec787586cb 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceIdentifierStringSerializationHandler.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceIdentifierStringSerializationHandler.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.racelogtracking; /** diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMapping.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceMapping.java similarity index 77% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMapping.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceMapping.java index 76fe4547104..2ddcf0fb7d6 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMapping.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/DeviceMapping.java @@ -1,9 +1,10 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.racelogtracking; import java.io.Serializable; import java.util.List; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceMappingFinder; +import com.sap.sailing.domain.abstractlog.shared.analyzing.DeviceMappingFinder; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceWithTimeRange; import com.sap.sailing.domain.base.Timed; import com.sap.sailing.domain.common.TimeRange; import com.sap.sse.common.WithID; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/PlaceHolderDeviceIdentifier.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/PlaceHolderDeviceIdentifier.java similarity index 97% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/PlaceHolderDeviceIdentifier.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/PlaceHolderDeviceIdentifier.java index 8f7b2fb7640..6adb0e30b79 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/PlaceHolderDeviceIdentifier.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/PlaceHolderDeviceIdentifier.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.racelogtracking; import com.sap.sailing.domain.abstractlog.race.RaceLog; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/SmartphoneUUIDIdentifier.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/SmartphoneUUIDIdentifier.java similarity index 73% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/SmartphoneUUIDIdentifier.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/SmartphoneUUIDIdentifier.java index 5ebd8514ba9..05d6e8e3671 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/SmartphoneUUIDIdentifier.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/SmartphoneUUIDIdentifier.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.racelogtracking; import java.util.UUID; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/SmartphoneUUIDSerializationHandler.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/SmartphoneUUIDSerializationHandler.java similarity index 88% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/SmartphoneUUIDSerializationHandler.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/SmartphoneUUIDSerializationHandler.java index 80cdd5e9d35..8a284d26c53 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/SmartphoneUUIDSerializationHandler.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/SmartphoneUUIDSerializationHandler.java @@ -1,9 +1,9 @@ -package com.sap.sailing.domain.abstractlog.race.tracking; +package com.sap.sailing.domain.racelogtracking; import java.util.UUID; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sse.common.Util; public class SmartphoneUUIDSerializationHandler { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/DeviceMappingImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/DeviceMappingImpl.java similarity index 85% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/DeviceMappingImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/DeviceMappingImpl.java index 838450a7753..cbe33f98034 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/DeviceMappingImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/DeviceMappingImpl.java @@ -1,14 +1,14 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.impl; +package com.sap.sailing.domain.racelogtracking.impl; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.common.impl.TimeRangeImpl; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sse.common.TimePoint; import com.sap.sse.common.WithID; @@ -56,7 +56,7 @@ public class DeviceMappingImpl implements DeviceMapping return timeRange.from(); } - public static DeviceMapping convertToDeviceMapping(DeviceMappingEvent event) { + public static DeviceMapping convertToDeviceMapping(DeviceMappingEvent event) { return new DeviceMappingImpl(event.getMappedTo(), event.getDevice(), new TimeRangeImpl(event.getFrom(), event.getTo()), event.getId()); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/PlaceHolderDeviceIdentifierSerializationHandler.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/PlaceHolderDeviceIdentifierSerializationHandler.java similarity index 83% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/PlaceHolderDeviceIdentifierSerializationHandler.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/PlaceHolderDeviceIdentifierSerializationHandler.java index 0ac2494b630..383c40a7e5c 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/PlaceHolderDeviceIdentifierSerializationHandler.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/PlaceHolderDeviceIdentifierSerializationHandler.java @@ -1,8 +1,8 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.impl; +package com.sap.sailing.domain.racelogtracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.PlaceHolderDeviceIdentifier; import com.sap.sse.common.Util; /** diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/SmartphoneUUIDIdentifierImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDIdentifierImpl.java similarity index 86% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/SmartphoneUUIDIdentifierImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDIdentifierImpl.java index 5e184f116a8..7022d6a8c8c 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/SmartphoneUUIDIdentifierImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/SmartphoneUUIDIdentifierImpl.java @@ -1,8 +1,8 @@ -package com.sap.sailing.domain.abstractlog.race.tracking.impl; +package com.sap.sailing.domain.racelogtracking.impl; import java.util.UUID; -import com.sap.sailing.domain.abstractlog.race.tracking.SmartphoneUUIDIdentifier; +import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDIdentifier; public class SmartphoneUUIDIdentifierImpl implements SmartphoneUUIDIdentifier { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java index 99f4af1f647..5cef75414fc 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java @@ -24,9 +24,9 @@ import org.junit.Test; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.AdditionalScoringInformationFinder; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; -import com.sap.sailing.domain.abstractlog.race.scoring.impl.AdditionalScoringInformationEventImpl; +import com.sap.sailing.domain.abstractlog.race.scoring.impl.RaceLogAdditionalScoringInformationEventImpl; import com.sap.sailing.domain.abstractlog.race.state.RaceState; import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateImpl; import com.sap.sailing.domain.base.BoatClass; @@ -831,11 +831,11 @@ public class LeaderboardScoringAndRankingTest extends AbstractLeaderboardTest { assertEquals(new Double(18), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[1], later)); assertEquals(new Double(2), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later)); RaceLog raceLogForRace2 = leaderboardHighPoint10Or8AndLastBreaksTie.getRaceColumnByName("R2").getRaceLog(leaderboardHighPoint10Or8AndLastBreaksTie.getFleet(null)); - raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new LogEventAuthorImpl("Plopp", 1), later, "12345678", Collections.emptyList(), 0, AdditionalScoringInformationType.UNKNOWN)); + raceLogForRace2.add(new RaceLogAdditionalScoringInformationEventImpl(now, new LogEventAuthorImpl("Plopp", 1), later, "12345678", Collections.emptyList(), 0, AdditionalScoringInformationType.UNKNOWN)); assertEquals(new Double(20), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[0], later)); assertEquals(new Double(18), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[1], later)); assertEquals(new Double(2), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later)); - raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new LogEventAuthorImpl("Plopp", 1), later.plus(Duration.ONE_MINUTE), "123456789873773762", Collections.emptyList(), 0, AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE)); + raceLogForRace2.add(new RaceLogAdditionalScoringInformationEventImpl(now, new LogEventAuthorImpl("Plopp", 1), later.plus(Duration.ONE_MINUTE), "123456789873773762", Collections.emptyList(), 0, AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE)); assertEquals(new Double(18), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[0], later)); assertEquals(new Double(16), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[1], later)); assertEquals(new Double(2), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later)); @@ -844,7 +844,7 @@ public class LeaderboardScoringAndRankingTest extends AbstractLeaderboardTest { assertEquals(new Double(25), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[1], later)); assertEquals(new Double(3), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later)); AdditionalScoringInformationFinder finder = new AdditionalScoringInformationFinder(raceLogForRace2); - AdditionalScoringInformationEvent event = finder.analyze(/*filterBy*/AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE); + RaceLogAdditionalScoringInformationEvent event = finder.analyze(/*filterBy*/AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE); assert event != null; try { raceLogForRace2.revokeEvent(new LogEventAuthorImpl("Plopp", 1), event); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java index 434fcafae7d..906c2e17780 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java @@ -18,14 +18,14 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.racelog.RaceLogIdentifier; @@ -113,22 +113,22 @@ public class RaceColumnRaceLogReplicator implements RaceLogEventVisitor, Seriali } @Override - public void visit(DeviceCompetitorMappingEvent event) { + public void visit(RaceLogDeviceCompetitorMappingEvent event) { notifyOnAdd(event); } @Override - public void visit(DeviceMarkMappingEvent event) { + public void visit(RaceLogDeviceMarkMappingEvent event) { notifyOnAdd(event); } @Override - public void visit(DenoteForTrackingEvent event) { + public void visit(RaceLogDenoteForTrackingEvent event) { notifyOnAdd(event); } @Override - public void visit(StartTrackingEvent event) { + public void visit(RaceLogStartTrackingEvent event) { notifyOnAdd(event); } @@ -138,22 +138,22 @@ public class RaceColumnRaceLogReplicator implements RaceLogEventVisitor, Seriali } @Override - public void visit(RegisterCompetitorEvent event) { + public void visit(RaceLogRegisterCompetitorEvent event) { notifyOnAdd(event); } @Override - public void visit(DefineMarkEvent event) { + public void visit(RaceLogDefineMarkEvent event) { notifyOnAdd(event); } @Override - public void visit(CloseOpenEndedDeviceMappingEvent event) { + public void visit(RaceLogCloseOpenEndedDeviceMappingEvent event) { notifyOnAdd(event); } @Override - public void visit(AdditionalScoringInformationEvent additionalScoringInformation) { + public void visit(RaceLogAdditionalScoringInformationEvent additionalScoringInformation) { notifyOnAdd(additionalScoringInformation); } } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointFirstGets10Or8AndLastBreaksTie.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointFirstGets10Or8AndLastBreaksTie.java index 839bd89689d..ccea8452c6e 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointFirstGets10Or8AndLastBreaksTie.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointFirstGets10Or8AndLastBreaksTie.java @@ -5,7 +5,7 @@ import java.util.concurrent.Callable; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.AdditionalScoringInformationFinder; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Fleet; @@ -16,7 +16,7 @@ import com.sap.sse.common.Util; /** * {@link HighPointFirstGetsFixedScore} scheme that in most cases applies - * 10 points for the winner. Iff for one race column a {@link AdditionalScoringInformationEvent} + * 10 points for the winner. Iff for one race column a {@link RaceLogAdditionalScoringInformationEvent} * is found then 8 points are applied for the winner. * * From Phil, Race Director, on 12.09.2014: "If there is a tie in the regatta score between two or more boats at any time, the tie @@ -98,7 +98,7 @@ public class HighPointFirstGets10Or8AndLastBreaksTie extends HighPointFirstGetsF for (Fleet fleet : raceColumn.getFleets()) { RaceLog raceLog = raceColumn.getRaceLog(fleet); AdditionalScoringInformationFinder finder = new AdditionalScoringInformationFinder(raceLog); - AdditionalScoringInformationEvent event = finder.analyze(AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE); + RaceLogAdditionalScoringInformationEvent event = finder.analyze(AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE); if (event != null) { if (rank == 0) { result = null; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java index fb4fb3ebc6f..053828764b8 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.racelog.tracking; import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.TimeRange; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixReceivedListener.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixReceivedListener.java index b408e124a11..4e3ca135571 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixReceivedListener.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixReceivedListener.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.racelog.tracking; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.GPSFix; public interface GPSFixReceivedListener { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java index cae62dd832d..67b7534d15f 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java @@ -1,15 +1,15 @@ package com.sap.sailing.domain.racelog.tracking; import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMarkMappingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifier.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifier.java index 01e488a0564..9df153ea47f 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifier.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifier.java @@ -2,7 +2,7 @@ package com.sap.sailing.domain.trackfiles; import java.util.UUID; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifierImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifierImpl.java index e6d3ce02b18..ea27870e2a5 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifierImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackfiles/TrackFileImportDeviceIdentifierImpl.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackimport/GPSFixImporter.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackimport/GPSFixImporter.java index fa5a585741f..de8dc12f352 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackimport/GPSFixImporter.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/trackimport/GPSFixImporter.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.tracking.GPSFix; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java index 06b1dc85562..ecb0313d96f 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.SortedSet; import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Leg; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index 37e5bcad38b..1f18e090f53 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; @@ -85,6 +84,7 @@ import com.sap.sailing.domain.common.scalablevalue.impl.ScalablePosition; import com.sap.sailing.domain.confidence.ConfidenceBasedWindAverager; import com.sap.sailing.domain.confidence.ConfidenceFactory; import com.sap.sailing.domain.racelog.tracking.GPSFixStore; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java index 1211fdccf6c..2ab8d8e95a0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java @@ -10,7 +10,7 @@ import java.util.UUID; import com.google.gwt.user.client.rpc.RemoteService; import com.sap.sailing.domain.abstractlog.Revokable; import com.sap.sailing.domain.abstractlog.race.RaceLog; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.RemoteSailingServerReference; import com.sap.sailing.domain.common.DataImportProgress; @@ -432,7 +432,7 @@ public interface SailingService extends RemoteService { void denoteForRaceLogTracking(String leaderboardName, String raceColumnName, String fleetName) throws Exception; /** - * Revoke the {@link DenoteForTrackingEvent}. This does not affect an existing {@code RaceLogRaceTracker} + * Revoke the {@link RaceLogDenoteForTrackingEvent}. This does not affect an existing {@code RaceLogRaceTracker} * or {@link TrackedRace} for this {@code RaceLog}. * * @see RaceLogTrackingAdapter#removeDenotationForRaceLogTracking diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/PlaceHolderDeviceIdentifierStringSerializationHandler.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/PlaceHolderDeviceIdentifierStringSerializationHandler.java index f20a78d91c7..3ce0c9b057a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/PlaceHolderDeviceIdentifierStringSerializationHandler.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/PlaceHolderDeviceIdentifierStringSerializationHandler.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.ui.server; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierStringSerializationHandler; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierStringSerializationHandler; +import com.sap.sailing.domain.racelogtracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; public class PlaceHolderDeviceIdentifierStringSerializationHandler extends PlaceHolderDeviceIdentifierSerializationHandler implements DeviceIdentifierStringSerializationHandler { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index d1e3a567b5c..67db34f29bf 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -66,19 +66,15 @@ import com.sap.sailing.domain.abstractlog.race.state.impl.ReadonlyRaceStateImpl; import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.FlagPoleState; import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.ReadonlyGateStartRacingProcedure; import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.ReadonlyRRS26RacingProcedure; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierStringSerializationHandler; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DefinedMarkFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceCompetitorMappingFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceMarkMappingFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.LastPingMappingEventFinder; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.OpenEndedDeviceMappingCloser; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceCompetitorMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogDeviceMarkMappingFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogLastPingMappingEventFinder; +import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogOpenEndedDeviceMappingCloser; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogTrackingStateAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RegisteredCompetitorsAnalyzer; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.DeviceMappingImpl; +import com.sap.sailing.domain.abstractlog.shared.analyzing.RegisteredCompetitorsAnalyzer; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; @@ -214,8 +210,12 @@ import com.sap.sailing.domain.persistence.MongoObjectFactory; import com.sap.sailing.domain.persistence.MongoRaceLogStoreFactory; import com.sap.sailing.domain.polarsheets.PolarSheetGenerationWorker; import com.sap.sailing.domain.racelog.RaceStateOfSameDayHelper; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierStringSerializationHandler; +import com.sap.sailing.domain.racelogtracking.DeviceMapping; import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter; import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory; +import com.sap.sailing.domain.racelogtracking.impl.DeviceMappingImpl; import com.sap.sailing.domain.swisstimingadapter.StartList; import com.sap.sailing.domain.swisstimingadapter.SwissTimingAdapter; import com.sap.sailing.domain.swisstimingadapter.SwissTimingAdapterFactory; @@ -4719,7 +4719,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S List dtos = new ArrayList(); for (Mark mark : marks) { DynamicGPSFixTrackImpl track = new DynamicGPSFixTrackImpl(mark, 0); - DeviceMappingEvent lastPingMappingEvent = new LastPingMappingEventFinder(raceLog, mark).analyze(); + DeviceMappingEvent lastPingMappingEvent = new RaceLogLastPingMappingEventFinder(raceLog, mark).analyze(); if (lastPingMappingEvent != null) { try { getService().getGPSFixStore().loadMarkTrack(track, DeviceMappingImpl.convertToDeviceMapping(lastPingMappingEvent)); @@ -4894,12 +4894,12 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S String fleetName) throws TransformationException { RaceLog raceLog = getRaceLog(leaderboardName, raceColumnName, fleetName); List result = new ArrayList(); - for (List> list : new DeviceCompetitorMappingFinder(raceLog).analyze().values()) { + for (List> list : new RaceLogDeviceCompetitorMappingFinder(raceLog).analyze().values()) { for (DeviceMapping mapping : list) { result.add(convertToDeviceMappingDTO(mapping)); } } - for (List> list : new DeviceMarkMappingFinder(raceLog).analyze().values()) { + for (List> list : new RaceLogDeviceMarkMappingFinder(raceLog).analyze().values()) { for (DeviceMapping mapping : list) { result.add(convertToDeviceMappingDTO(mapping)); } @@ -4913,7 +4913,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S RaceLog raceLog = getRaceLog(leaderboardName, raceColumnName, fleetName); DeviceMapping mapping = convertToDeviceMapping(dto); TimePoint now = MillisecondsTimePoint.now(); - DeviceMappingEvent event = null; + RaceLogEvent event = null; TimePoint from = mapping.getTimeRange().openBeginning() ? null : mapping.getTimeRange().from(); TimePoint to = mapping.getTimeRange().openEnd() ? null : mapping.getTimeRange().to(); if (dto.mappedTo instanceof MarkDTO) { @@ -4974,8 +4974,8 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S DeviceMappingDTO mappingDTO, Date closingTimePoint) throws NoCorrespondingServiceRegisteredException, TransformationException { RaceLog raceLog = getRaceLog(leaderboardName, raceColumnName, fleetName); DeviceMapping mapping = convertToDeviceMapping(mappingDTO); - List closingEvents = - new OpenEndedDeviceMappingCloser(raceLog, mapping, getService().getServerAuthor(), + List closingEvents = + new RaceLogOpenEndedDeviceMappingCloser(raceLog, mapping, getService().getServerAuthor(), new MillisecondsTimePoint(closingTimePoint)).analyze(); for (RaceLogEvent event : closingEvents) { @@ -4992,7 +4992,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S RaceLogEvent event = raceLog.getEventById(idToRevoke); raceLog.unlockAfterRead(); if (event instanceof Revokable) { - raceLog.revokeEvent(getService().getServerAuthor(), (Revokable) event, "revoke triggered by GWT user action"); + raceLog.revokeEvent(getService().getServerAuthor(), event, "revoke triggered by GWT user action"); } } } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java index 8ec79405b84..60901ad863c 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java @@ -16,9 +16,7 @@ import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.impl.CompetitorImpl; @@ -33,6 +31,8 @@ import com.sap.sailing.domain.racelog.RaceLogIdentifier; import com.sap.sailing.domain.racelog.tracking.test.mock.MockEmptyServiceFinderFactory; import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.PlaceHolderDeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifierImpl; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -92,7 +92,7 @@ public class StoreAndLoadDeviceIdentifierTest extends AbstractMongoDBTest { RaceLog loadedRaceLog = loadRaceLog(); loadedRaceLog.lockForRead(); assertEquals(1, Util.size(loadedRaceLog.getRawFixes())); - DeviceCompetitorMappingEvent mapping = (DeviceCompetitorMappingEvent) loadedRaceLog.getRawFixes().iterator().next(); + RaceLogDeviceCompetitorMappingEvent mapping = (RaceLogDeviceCompetitorMappingEvent) loadedRaceLog.getRawFixes().iterator().next(); loadedRaceLog.unlockAfterRead(); return mapping.getDevice(); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java index a3a8a0e6ccc..84b39d90664 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java @@ -28,13 +28,12 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogPassChangeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogRaceStatusEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; @@ -48,6 +47,7 @@ import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl; import com.sap.sailing.domain.racelog.RaceLogIdentifier; import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -177,11 +177,11 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { Competitor mappedTo = DomainFactory.INSTANCE.getOrCreateCompetitor("abc", "abc", null, null, null); TimePoint from = new MillisecondsTimePoint(20); TimePoint to = new MillisecondsTimePoint(30); - DeviceCompetitorMappingEvent expectedEvent = eventFactory.createDeviceCompetitorMappingEvent( + RaceLogDeviceCompetitorMappingEvent expectedEvent = eventFactory.createDeviceCompetitorMappingEvent( expectedEventTime, author, expectedEventTime, expectedId, device, mappedTo, expectedPassId, from, to); DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent); - DeviceCompetitorMappingEvent actualEvent = loadEvent(dbObject); + RaceLogDeviceCompetitorMappingEvent actualEvent = loadEvent(dbObject); assertBaseFields(expectedEvent, actualEvent); assertEquals(device, actualEvent.getDevice()); @@ -196,11 +196,11 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { Mark mappedTo = DomainFactory.INSTANCE.getOrCreateMark("abc", "abc"); TimePoint from = new MillisecondsTimePoint(20); TimePoint to = new MillisecondsTimePoint(30); - DeviceMarkMappingEvent expectedEvent = eventFactory.createDeviceMarkMappingEvent( + RaceLogDeviceMarkMappingEvent expectedEvent = eventFactory.createDeviceMarkMappingEvent( expectedEventTime, author, expectedEventTime, expectedId, device, mappedTo, expectedPassId, from, to); DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent); - DeviceMarkMappingEvent actualEvent = loadEvent(dbObject); + RaceLogDeviceMarkMappingEvent actualEvent = loadEvent(dbObject); assertBaseFields(expectedEvent, actualEvent); assertEquals(device, actualEvent.getDevice()); @@ -214,12 +214,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { String raceName = "race"; BoatClass boatClass = DomainFactory.INSTANCE.getOrCreateBoatClass("49er"); UUID raceId = UUID.randomUUID(); - DenoteForTrackingEvent expectedEvent = eventFactory.createDenoteForTrackingEvent( + RaceLogDenoteForTrackingEvent expectedEvent = eventFactory.createDenoteForTrackingEvent( expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, raceName, boatClass, raceId); DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent); - DenoteForTrackingEvent actualEvent = loadEvent(dbObject); + RaceLogDenoteForTrackingEvent actualEvent = loadEvent(dbObject); assertBaseFields(expectedEvent, actualEvent); assertEquals(boatClass, actualEvent.getBoatClass()); @@ -249,12 +249,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { @Test public void testStoreAndLoadRegisterCompetitorEvent() { - RegisterCompetitorEvent expectedEvent = eventFactory.createRegisterCompetitorEvent( + RaceLogRegisterCompetitorEvent expectedEvent = eventFactory.createRegisterCompetitorEvent( expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, DomainFactory.INSTANCE.getOrCreateCompetitor("comp", "comp", null, null, null)); DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent); - RegisterCompetitorEvent actualEvent = loadEvent(dbObject); + RaceLogRegisterCompetitorEvent actualEvent = loadEvent(dbObject); assertBaseFields(expectedEvent, actualEvent); assertEquals(expectedEvent.getCompetitor(), actualEvent.getCompetitor()); @@ -262,12 +262,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { @Test public void testStoreAndLoadDefineMarkEvent() { - DefineMarkEvent expectedEvent = eventFactory.createDefineMarkEvent( + RaceLogDefineMarkEvent expectedEvent = eventFactory.createDefineMarkEvent( expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, DomainFactory.INSTANCE.getOrCreateMark("mytestmark")); DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent); - DefineMarkEvent actualEvent = loadEvent(dbObject); + RaceLogDefineMarkEvent actualEvent = loadEvent(dbObject); assertBaseFields(expectedEvent, actualEvent); assertEquals(expectedEvent.getMark(), actualEvent.getMark()); @@ -275,12 +275,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { @Test public void testStoreAndLoadCloseOpenDeviceMappingEvent() { - CloseOpenEndedDeviceMappingEvent expectedEvent = eventFactory.createCloseOpenEndedDeviceMappingEvent( + RaceLogCloseOpenEndedDeviceMappingEvent expectedEvent = eventFactory.createCloseOpenEndedDeviceMappingEvent( expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, UUID.randomUUID(), new MillisecondsTimePoint(49)); DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent); - CloseOpenEndedDeviceMappingEvent actualEvent = loadEvent(dbObject); + RaceLogCloseOpenEndedDeviceMappingEvent actualEvent = loadEvent(dbObject); assertBaseFields(expectedEvent, actualEvent); assertEquals(expectedEvent.getDeviceMappingEventId(), actualEvent.getDeviceMappingEventId()); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java index 835dba4f11d..4a7c7329db4 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java @@ -15,7 +15,6 @@ import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.Mark; @@ -33,6 +32,7 @@ import com.sap.sailing.domain.persistence.racelog.tracking.impl.MongoGPSFixStore import com.sap.sailing.domain.racelog.tracking.GPSFixStore; import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServiceFinderFactory; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceAndSessionIdentifierWithGPSFixesDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceAndSessionIdentifierWithGPSFixesDeserializer.java index 17dcbb1cf70..0099573f475 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceAndSessionIdentifierWithGPSFixesDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceAndSessionIdentifierWithGPSFixesDeserializer.java @@ -7,9 +7,9 @@ import java.util.List; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceIdentifierJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceIdentifierJsonDeserializer.java index da0021f0afe..691100adba1 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceIdentifierJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceIdentifierJsonDeserializer.java @@ -2,11 +2,11 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.SingleTypeBasedServiceFinderImpl; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.PlaceHolderDeviceIdentifier; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceCompetitorMappingEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceCompetitorMappingEventDeserializer.java index d1b3e0971d3..f7c196ab536 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceCompetitorMappingEventDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceCompetitorMappingEventDeserializer.java @@ -6,8 +6,8 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMappingEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMappingEventDeserializer.java index 77de59e76e9..d107823a514 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMappingEventDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMappingEventDeserializer.java @@ -7,8 +7,8 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.deserialization.impl.Helpers; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMarkMappingEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMarkMappingEventDeserializer.java index e9a680503fb..838df5965d6 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMarkMappingEventDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogDeviceMarkMappingEventDeserializer.java @@ -6,9 +6,9 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java index 23ee9a09f21..c32bc173a27 100755 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java @@ -3,10 +3,10 @@ package com.sap.sailing.server.gateway.deserialization.racelog.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.SmartphoneUUIDIdentifier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.SharedDomainFactory; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDIdentifier; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.deserialization.coursedata.impl.ControlPointDeserializer; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceAndSessionIdentifierWithGPSFixesSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceAndSessionIdentifierWithGPSFixesSerializer.java index da6ffc1ef3f..8b5b9646163 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceAndSessionIdentifierWithGPSFixesSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceAndSessionIdentifierWithGPSFixesSerializer.java @@ -6,7 +6,7 @@ import java.util.List; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.server.gateway.deserialization.impl.DeviceAndSessionIdentifierWithGPSFixesDeserializer; import com.sap.sailing.server.gateway.serialization.JsonSerializer; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceIdentifierJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceIdentifierJsonSerializer.java index 0feec354025..e65627fd392 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceIdentifierJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceIdentifierJsonSerializer.java @@ -5,11 +5,11 @@ import java.util.logging.Logger; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.SingleTypeBasedServiceFinderImpl; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.PlaceHolderDeviceIdentifier; import com.sap.sailing.server.gateway.deserialization.impl.DeviceIdentifierJsonDeserializer; import com.sap.sailing.server.gateway.serialization.JsonSerializer; import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceWithTimeRangeJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceWithTimeRangeJsonSerializer.java index 1a14d708392..d8bb9551303 100755 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceWithTimeRangeJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DeviceWithTimeRangeJsonSerializer.java @@ -2,7 +2,7 @@ package com.sap.sailing.server.gateway.serialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceWithTimeRange; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceWithTimeRange; import com.sap.sailing.server.gateway.serialization.JsonSerializer; public class DeviceWithTimeRangeJsonSerializer implements JsonSerializer { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogAdditionalScoringInformationSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogAdditionalScoringInformationSerializer.java index 61279130446..51895630668 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogAdditionalScoringInformationSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogAdditionalScoringInformationSerializer.java @@ -3,13 +3,13 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogAdditionalScoringInformationEventDeserializer; import com.sap.sailing.server.gateway.serialization.JsonSerializer; public class RaceLogAdditionalScoringInformationSerializer extends BaseRaceLogEventSerializer { - public static final String VALUE_CLASS = AdditionalScoringInformationEvent.class.getSimpleName(); + public static final String VALUE_CLASS = RaceLogAdditionalScoringInformationEvent.class.getSimpleName(); public RaceLogAdditionalScoringInformationSerializer(JsonSerializer competitorSerializer) { super(competitorSerializer); @@ -22,7 +22,7 @@ public class RaceLogAdditionalScoringInformationSerializer extends BaseRaceLogEv @Override public JSONObject serialize(RaceLogEvent object) { - AdditionalScoringInformationEvent event = (AdditionalScoringInformationEvent) object; + RaceLogAdditionalScoringInformationEvent event = (RaceLogAdditionalScoringInformationEvent) object; JSONObject result = super.serialize(event); result.put(RaceLogAdditionalScoringInformationEventDeserializer.FIELD_TYPE, event.getType().name()); return result; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCloseOpenEndedDeviceMappingEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCloseOpenEndedDeviceMappingEventSerializer.java index cda8ca68a87..dc7648ade71 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCloseOpenEndedDeviceMappingEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCloseOpenEndedDeviceMappingEventSerializer.java @@ -3,7 +3,8 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.CloseOpenEndedDeviceMappingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogCloseOpenEndedDeviceMappingEventDeserializer; import com.sap.sailing.server.gateway.serialization.JsonSerializer; @@ -22,7 +23,7 @@ public class RaceLogCloseOpenEndedDeviceMappingEventSerializer extends BaseRaceL @Override public JSONObject serialize(RaceLogEvent object) { - CloseOpenEndedDeviceMappingEvent event = (CloseOpenEndedDeviceMappingEvent) object; + RaceLogCloseOpenEndedDeviceMappingEvent event = (RaceLogCloseOpenEndedDeviceMappingEvent) object; JSONObject result = super.serialize(event); result.put(RaceLogCloseOpenEndedDeviceMappingEventDeserializer.FIELD_DEVICE_MAPPING_EVENT_ID, event.getDeviceMappingEventId()); diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDefineMarkEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDefineMarkEventSerializer.java index 3d6c7ffbefd..6085a0674b6 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDefineMarkEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDefineMarkEventSerializer.java @@ -3,13 +3,13 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.server.gateway.serialization.JsonSerializer; public class RaceLogDefineMarkEventSerializer extends BaseRaceLogEventSerializer { - public static final String VALUE_CLASS = DefineMarkEvent.class.getSimpleName(); + public static final String VALUE_CLASS = RaceLogDefineMarkEvent.class.getSimpleName(); public static final String FIELD_MARK = "mark"; private final JsonSerializer markSerializer; @@ -27,7 +27,7 @@ public class RaceLogDefineMarkEventSerializer extends BaseRaceLogEventSerializer @Override public JSONObject serialize(RaceLogEvent object) { - DefineMarkEvent event = (DefineMarkEvent) object; + RaceLogDefineMarkEvent event = (RaceLogDefineMarkEvent) object; JSONObject result = super.serialize(event); result.put(FIELD_MARK, markSerializer.serialize(event.getMark())); diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDenoteForTrackingEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDenoteForTrackingEventSerializer.java index e4161278c37..5abd0f43d73 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDenoteForTrackingEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDenoteForTrackingEventSerializer.java @@ -3,12 +3,12 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.server.gateway.serialization.JsonSerializer; public class RaceLogDenoteForTrackingEventSerializer extends BaseRaceLogEventSerializer { - public static final String VALUE_CLASS = DenoteForTrackingEvent.class.getSimpleName(); + public static final String VALUE_CLASS = RaceLogDenoteForTrackingEvent.class.getSimpleName(); public static final String FIELD_RACE_NAME = "raceName"; public static final String FIELD_BOAT_CLASS = "boatClass"; public static final String FIELD_RACE_ID = "raceId"; @@ -25,7 +25,7 @@ public class RaceLogDenoteForTrackingEventSerializer extends BaseRaceLogEventSer @Override public JSONObject serialize(RaceLogEvent object) { - DenoteForTrackingEvent event = (DenoteForTrackingEvent) object; + RaceLogDenoteForTrackingEvent event = (RaceLogDenoteForTrackingEvent) object; JSONObject result = super.serialize(event); result.put(FIELD_RACE_NAME, event.getRaceName()); diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceCompetitorMappingEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceCompetitorMappingEventSerializer.java index 9ec7ceb538c..424a12d1ff7 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceCompetitorMappingEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceCompetitorMappingEventSerializer.java @@ -2,9 +2,9 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceCompetitorMappingEvent; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.serialization.JsonSerializer; public class RaceLogDeviceCompetitorMappingEventSerializer extends RaceLogDeviceMappingEventSerializer { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMappingEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMappingEventSerializer.java index 41088d134ee..5629f84da5d 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMappingEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMappingEventSerializer.java @@ -3,9 +3,9 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMappingEvent; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.serialization.JsonSerializer; import com.sap.sse.common.WithID; @@ -27,8 +27,8 @@ public abstract class RaceLogDeviceMappingEventSerializer @Override public JSONObject serialize(RaceLogEvent object) { @SuppressWarnings("unchecked") - DeviceMappingEvent event = (DeviceMappingEvent) object; - JSONObject result = super.serialize(event); + DeviceMappingEvent event = (DeviceMappingEvent) object; + JSONObject result = super.serialize(object); result.put(FIELD_FROM_MILLIS, event.getFrom().asMillis()); result.put(FIELD_TO_MILLIS, event.getTo().asMillis()); result.put(FIELD_ITEM, serializeItem(event.getMappedTo())); diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMarkMappingEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMarkMappingEventSerializer.java index 30c19944782..aa5bbf0a571 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMarkMappingEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogDeviceMarkMappingEventSerializer.java @@ -2,11 +2,11 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceMarkMappingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Mark; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.server.gateway.serialization.JsonSerializer; public class RaceLogDeviceMarkMappingEventSerializer extends RaceLogDeviceMappingEventSerializer { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java index 89820bfbd6c..2eded9789ae 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java @@ -18,17 +18,17 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; -import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.SmartphoneUUIDIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.scoring.RaceLogAdditionalScoringInformationEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogCloseOpenEndedDeviceMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDefineMarkEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDenoteForTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceMarkMappingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogRegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDIdentifier; import com.sap.sailing.server.gateway.serialization.JsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.ControlPointJsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.CourseBaseJsonSerializer; @@ -236,21 +236,21 @@ public class RaceLogEventSerializer implements JsonSerializer, Rac } @Override - public void visit(DeviceCompetitorMappingEvent event) { + public void visit(RaceLogDeviceCompetitorMappingEvent event) { chosenSerializer = deviceCompetitorMappingSerializer; } @Override - public void visit(DeviceMarkMappingEvent event) { + public void visit(RaceLogDeviceMarkMappingEvent event) { chosenSerializer = deviceMarkMappingSerializer; } @Override - public void visit(DenoteForTrackingEvent event) { + public void visit(RaceLogDenoteForTrackingEvent event) { chosenSerializer = denoteForTrackingSerializer; } @Override - public void visit(StartTrackingEvent event) { + public void visit(RaceLogStartTrackingEvent event) { chosenSerializer = startTrackingSerializer; } @Override @@ -258,22 +258,22 @@ public class RaceLogEventSerializer implements JsonSerializer, Rac chosenSerializer = revokeSerializer; } @Override - public void visit(RegisterCompetitorEvent event) { + public void visit(RaceLogRegisterCompetitorEvent event) { chosenSerializer = registerCompetitorSerializer; } @Override - public void visit(DefineMarkEvent event) { + public void visit(RaceLogDefineMarkEvent event) { chosenSerializer = defineMarkSerializer; } @Override - public void visit(CloseOpenEndedDeviceMappingEvent event) { + public void visit(RaceLogCloseOpenEndedDeviceMappingEvent event) { chosenSerializer = closeOpenEndedDeviceMappingEventSerializer; } @Override - public void visit(AdditionalScoringInformationEvent additionalScoringInformation) { + public void visit(RaceLogAdditionalScoringInformationEvent additionalScoringInformation) { chosenSerializer = additionalScoringInformationSerializer; } } diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRegisterCompetitorEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRegisterCompetitorEventSerializer.java index e936cf980c2..66d90a0528d 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRegisterCompetitorEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRegisterCompetitorEventSerializer.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.RegisterCompetitorEvent; +import com.sap.sailing.domain.abstractlog.shared.events.RegisterCompetitorEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.server.gateway.serialization.JsonSerializer; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogStartTrackingEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogStartTrackingEventSerializer.java index c1d985e5655..ffbcbc1c7ba 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogStartTrackingEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogStartTrackingEventSerializer.java @@ -1,11 +1,11 @@ package com.sap.sailing.server.gateway.serialization.racelog.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.StartTrackingEvent; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogStartTrackingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.server.gateway.serialization.JsonSerializer; public class RaceLogStartTrackingEventSerializer extends BaseRaceLogEventSerializer { - public static final String VALUE_CLASS = StartTrackingEvent.class.getSimpleName(); + public static final String VALUE_CLASS = RaceLogStartTrackingEvent.class.getSimpleName(); public RaceLogStartTrackingEventSerializer( JsonSerializer competitorSerializer) { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/DeviceIdentifierJsonHandler.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/DeviceIdentifierJsonHandler.java index 9e315f2e05c..46e27ac6344 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/DeviceIdentifierJsonHandler.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/DeviceIdentifierJsonHandler.java @@ -1,6 +1,6 @@ package com.sap.sailing.server.gateway.serialization.racelog.tracking; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifierSerializationHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifierSerializationHandler; public interface DeviceIdentifierJsonHandler extends DeviceIdentifierSerializationHandler { } diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/PlaceHolderDeviceIdentifierJsonHandler.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/PlaceHolderDeviceIdentifierJsonHandler.java index b8d2499ef06..bb2df4f7eba 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/PlaceHolderDeviceIdentifierJsonHandler.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/PlaceHolderDeviceIdentifierJsonHandler.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.serialization.racelog.tracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.impl.PlaceHolderDeviceIdentifierSerializationHandler; import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler; public class PlaceHolderDeviceIdentifierJsonHandler extends PlaceHolderDeviceIdentifierSerializationHandler diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/SmartphoneUUIDJsonHandler.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/SmartphoneUUIDJsonHandler.java index 669d75d2939..c813d5f781f 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/SmartphoneUUIDJsonHandler.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/tracking/impl/SmartphoneUUIDJsonHandler.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.serialization.racelog.tracking.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.SmartphoneUUIDSerializationHandler; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDSerializationHandler; import com.sap.sailing.server.gateway.serialization.racelog.tracking.DeviceIdentifierJsonHandler; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/RaceLogSerializationTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/RaceLogSerializationTest.java index 2c874588969..4d38396d4db 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/RaceLogSerializationTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/RaceLogSerializationTest.java @@ -14,9 +14,8 @@ import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier; +import com.sap.sailing.domain.abstractlog.race.tracking.RaceLogDeviceCompetitorMappingEvent; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceCompetitorMappingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.impl.BoatClassImpl; @@ -29,6 +28,8 @@ import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder; import com.sap.sailing.domain.racelog.tracking.test.mock.MockEmptyServiceFinder; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiJsonHandler; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.PlaceHolderDeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifierImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; @@ -70,7 +71,7 @@ public class RaceLogSerializationTest { setup(DeviceIdentifierJsonDeserializer.create(new SmartphoneImeiJsonHandler(), SmartphoneImeiIdentifier.TYPE), DeviceIdentifierJsonSerializer.create(new SmartphoneImeiJsonHandler(), SmartphoneImeiIdentifier.TYPE)); DeviceIdentifier device = new SmartphoneImeiIdentifier("abc"); - DeviceCompetitorMappingEvent event = RaceLogEventFactory.INSTANCE.createDeviceCompetitorMappingEvent( + RaceLogDeviceCompetitorMappingEvent event = RaceLogEventFactory.INSTANCE.createDeviceCompetitorMappingEvent( t(), author, device, competitor, 0, t(), t()); JSONObject json = serializer.serialize(event); @@ -78,7 +79,7 @@ public class RaceLogSerializationTest { RaceLogEvent deserialized = deserializer.deserialize(json); assertTrue(deserialized instanceof DeviceCompetitorMappingEvent); - DeviceCompetitorMappingEvent deserializedMapping = (DeviceCompetitorMappingEvent) deserialized; + RaceLogDeviceCompetitorMappingEvent deserializedMapping = (RaceLogDeviceCompetitorMappingEvent) deserialized; assertEquals(event.getDevice(), deserializedMapping.getDevice()); } @@ -90,7 +91,7 @@ public class RaceLogSerializationTest { setup(new DeviceIdentifierJsonDeserializer(onlyFallback), DeviceIdentifierJsonSerializer.create(new SmartphoneImeiJsonHandler(), SmartphoneImeiIdentifier.TYPE)); DeviceIdentifier device = new SmartphoneImeiIdentifier("abc"); - DeviceCompetitorMappingEvent event = RaceLogEventFactory.INSTANCE.createDeviceCompetitorMappingEvent( + RaceLogDeviceCompetitorMappingEvent event = RaceLogEventFactory.INSTANCE.createDeviceCompetitorMappingEvent( t(), author, device, competitor, 0, t(), t()); JSONObject json = serializer.serialize(event); @@ -98,7 +99,7 @@ public class RaceLogSerializationTest { RaceLogEvent deserialized = deserializer.deserialize(json); assertTrue(deserialized instanceof DeviceCompetitorMappingEvent); - DeviceCompetitorMappingEvent deserializedMapping = (DeviceCompetitorMappingEvent) deserialized; + RaceLogDeviceCompetitorMappingEvent deserializedMapping = (RaceLogDeviceCompetitorMappingEvent) deserialized; assertTrue(deserializedMapping.getDevice() instanceof PlaceHolderDeviceIdentifier); assertEquals(event.getDevice().getStringRepresentation(), deserializedMapping.getDevice().getStringRepresentation()); assertEquals(event.getDevice().getIdentifierType(), deserializedMapping.getDevice().getIdentifierType()); @@ -113,15 +114,15 @@ public class RaceLogSerializationTest { new DeviceIdentifierJsonSerializer(onlyFallback)); //track file device id can't be restored from string rep DeviceIdentifier device = new TrackFileImportDeviceIdentifierImpl("file", "track"); - DeviceCompetitorMappingEvent event = RaceLogEventFactory.INSTANCE.createDeviceCompetitorMappingEvent( + RaceLogDeviceCompetitorMappingEvent event = RaceLogEventFactory.INSTANCE.createDeviceCompetitorMappingEvent( t(), author, device, competitor, 0, t(), t()); JSONObject json = serializer.serialize(event); RaceLogEvent deserialized = deserializer.deserialize(json); - assertTrue(deserialized instanceof DeviceCompetitorMappingEvent); - DeviceCompetitorMappingEvent deserializedMapping = (DeviceCompetitorMappingEvent) deserialized; + assertTrue(deserialized instanceof RaceLogDeviceCompetitorMappingEvent); + RaceLogDeviceCompetitorMappingEvent deserializedMapping = (RaceLogDeviceCompetitorMappingEvent) deserialized; assertTrue(deserializedMapping.getDevice() instanceof PlaceHolderDeviceIdentifier); assertEquals(event.getDevice().getStringRepresentation(), deserializedMapping.getDevice().getStringRepresentation()); assertEquals(event.getDevice().getIdentifierType(), deserializedMapping.getDevice().getIdentifierType()); diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java index f9e19ad0853..4aab5911f36 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/GPSFixesResourceTest.java @@ -11,11 +11,11 @@ import org.json.simple.parser.ParseException; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneUuidServiceFinderFactory; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.gateway.jaxrs.api.GPSFixesResource; import com.sap.sailing.server.impl.RacingEventServiceImpl; diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java index b785f4fd46c..4d97e133c06 100755 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java @@ -11,7 +11,7 @@ import java.util.Collection; import org.junit.Test; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.trackimport.GPSFixImporter; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.server.trackfiles.RouteConverterGPSFixImporterFactory; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/GPSFixesResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/GPSFixesResource.java index 3bf4b9c79e0..b8f5c198eff 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/GPSFixesResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/GPSFixesResource.java @@ -16,10 +16,10 @@ import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java index eec9a326bbb..8071ee92af1 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.gateway.trackfiles.impl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceWithTimeRange; +import com.sap.sailing.domain.abstractlog.shared.events.DeviceWithTimeRange; import com.sap.sailing.domain.common.TimeRange; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sse.common.TimePoint; public class DeviceWithTimeRangeImpl implements DeviceWithTimeRange { diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java index d50560d79a2..8b168801a9d 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java @@ -28,9 +28,9 @@ import org.osgi.framework.Filter; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.trackimport.FormatNotSupportedException; import com.sap.sailing.domain.trackimport.GPSFixImporter; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 81227d88207..a7753ad608b 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -48,7 +48,6 @@ import com.sap.sailing.domain.abstractlog.race.state.RaceState; import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState; import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateImpl; import com.sap.sailing.domain.abstractlog.race.state.impl.ReadonlyRaceStateImpl; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorStore; import com.sap.sailing.domain.base.CompetitorStore.CompetitorUpdateListener; @@ -118,6 +117,7 @@ import com.sap.sailing.domain.persistence.racelog.tracking.MongoGPSFixStoreFacto import com.sap.sailing.domain.racelog.RaceLogIdentifier; import com.sap.sailing.domain.racelog.RaceLogStore; import com.sap.sailing.domain.racelog.tracking.GPSFixStore; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; import com.sap.sailing.domain.tracking.GPSFix; diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java index 69bb5202614..9d35536c011 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java @@ -18,14 +18,14 @@ import com.sap.sailing.android.tracking.app.R; import com.sap.sailing.android.tracking.app.utils.AppPreferences; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; -import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; -import com.sap.sailing.domain.abstractlog.race.tracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.impl.CompetitorImpl; import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.common.racelog.RaceLogServletConstants; import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants; +import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; +import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl; import com.sap.sailing.server.gateway.serialization.JsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.CompetitorJsonSerializer; import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogEventSerializer;