8327f128eaaaf7fc427069ae3f53eb1539822c31
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
| ... | ... | @@ -80,12 +80,15 @@ public class RaceCourseReceiver extends AbstractReceiverWithQueue<IControlRoute, |
| 80 | 80 | |
| 81 | 81 | public RaceCourseReceiver(DomainFactory domainFactory, DynamicTrackedRegatta trackedRegatta, IEvent tractracEvent, |
| 82 | 82 | IRace tractracRace, WindStore windStore, DynamicRaceDefinitionSet raceDefinitionSetToUpdate, |
| 83 | - long delayToLiveInMillis, long millisecondsOverWhichToAverageWind, Simulator simulator, |
|
| 84 | - URI updateURI, String tracTracApiToken, |
|
| 85 | - IEventSubscriber eventSubscriber, IRaceSubscriber raceSubscriber, boolean useInternalMarkPassingAlgorithm, |
|
| 86 | - RaceLogAndTrackedRaceResolver raceLogResolver, LeaderboardGroupResolver leaderboardGroupResolver, long timeoutInMilliseconds, |
|
| 87 | - RaceTrackingHandler raceTrackingHandler, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 88 | - super(domainFactory, tractracEvent, trackedRegatta, simulator, eventSubscriber, raceSubscriber, timeoutInMilliseconds); |
|
| 83 | + long delayToLiveInMillis, long millisecondsOverWhichToAverageWind, Simulator simulator, URI updateURI, |
|
| 84 | + String tracTracApiToken, IEventSubscriber eventSubscriber, IRaceSubscriber raceSubscriber, |
|
| 85 | + boolean useInternalMarkPassingAlgorithm, RaceLogAndTrackedRaceResolver raceLogResolver, |
|
| 86 | + LeaderboardGroupResolver leaderboardGroupResolver, long timeoutInMilliseconds, |
|
| 87 | + RaceTrackingHandler raceTrackingHandler, |
|
| 88 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 89 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 90 | + super(domainFactory, tractracEvent, trackedRegatta, simulator, eventSubscriber, |
|
| 91 | + raceSubscriber, timeoutInMilliseconds); |
|
| 89 | 92 | this.tractracRace = tractracRace; |
| 90 | 93 | this.raceLogResolver = raceLogResolver; |
| 91 | 94 | this.markPassingRaceFingerprintRegistry = markPassingRaceFingerprintRegistry; |
| ... | ... | @@ -265,7 +268,7 @@ public class RaceCourseReceiver extends AbstractReceiverWithQueue<IControlRoute, |
| 265 | 268 | /* ThreadLocalTransporter not needed because the RaceTracker is not active on a replica */ Optional |
| 266 | 269 | .empty(), |
| 267 | 270 | new TrackingConnectorInfoImpl(TracTracAdapter.NAME, TracTracAdapter.DEFAULT_URL, |
| 268 | - webUrlString), markPassingRaceFingerprintRegistry, /* maneuverRaceFingerprintRegistry */ null); |
|
| 271 | + webUrlString), markPassingRaceFingerprintRegistry, maneuverRaceFingerprintRegistry); |
|
| 269 | 272 | if (runAfterCreatingTrackedRace != null) { |
| 270 | 273 | runAfterCreatingTrackedRace.accept(trackedRace); |
| 271 | 274 | } |
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
| ... | ... | @@ -132,8 +132,10 @@ public class RaceTrackingConnectivityParametersImpl extends AbstractRaceTracking |
| 132 | 132 | @Override |
| 133 | 133 | public RaceTracker createRaceTracker(TrackedRegattaRegistry trackedRegattaRegistry, WindStore windStore, |
| 134 | 134 | RaceLogAndTrackedRaceResolver raceLogResolver, LeaderboardGroupResolver leaderboardGroupResolver, |
| 135 | - long timeoutInMilliseconds, RaceTrackingHandler raceTrackingHandler, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws URISyntaxException, |
|
| 136 | - CreateModelException, SubscriberInitializationException, IOException, InterruptedException, TimeOutException { |
|
| 135 | + long timeoutInMilliseconds, RaceTrackingHandler raceTrackingHandler, |
|
| 136 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 137 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) |
|
| 138 | + throws URISyntaxException, CreateModelException, SubscriberInitializationException, IOException, InterruptedException, TimeOutException { |
|
| 137 | 139 | RaceTracker tracker = domainFactory.createRaceTracker(raceLogStore, regattaLogStore, windStore, |
| 138 | 140 | trackedRegattaRegistry, raceLogResolver, leaderboardGroupResolver, this, timeoutInMilliseconds, |
| 139 | 141 | raceTrackingHandler, markPassingRaceFingerprintRegistry, maneuverRaceFingerprintRegistry); |
| ... | ... | @@ -142,8 +144,11 @@ public class RaceTrackingConnectivityParametersImpl extends AbstractRaceTracking |
| 142 | 144 | |
| 143 | 145 | @Override |
| 144 | 146 | public RaceTracker createRaceTracker(Regatta regatta, TrackedRegattaRegistry trackedRegattaRegistry, |
| 145 | - WindStore windStore, RaceLogAndTrackedRaceResolver raceLogResolver, LeaderboardGroupResolver leaderboardGroupResolver, |
|
| 146 | - long timeoutInMilliseconds, RaceTrackingHandler raceTrackingHandler, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws Exception { |
|
| 147 | + WindStore windStore, RaceLogAndTrackedRaceResolver raceLogResolver, |
|
| 148 | + LeaderboardGroupResolver leaderboardGroupResolver, long timeoutInMilliseconds, |
|
| 149 | + RaceTrackingHandler raceTrackingHandler, |
|
| 150 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 151 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws Exception { |
|
| 147 | 152 | RaceTracker tracker = domainFactory.createRaceTracker(regatta, raceLogStore, regattaLogStore, windStore, |
| 148 | 153 | trackedRegattaRegistry, raceLogResolver, leaderboardGroupResolver, this, timeoutInMilliseconds, |
| 149 | 154 | raceTrackingHandler, markPassingRaceFingerprintRegistry, maneuverRaceFingerprintRegistry); |
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
| ... | ... | @@ -277,8 +277,11 @@ public class TracTracRaceTrackerImpl extends AbstractRaceTrackerImpl<RaceTrackin |
| 277 | 277 | WindStore windStore, TrackedRegattaRegistry trackedRegattaRegistry, |
| 278 | 278 | RaceLogAndTrackedRaceResolver raceLogResolver, LeaderboardGroupResolver leaderboardGroupResolver, |
| 279 | 279 | RaceTrackingConnectivityParametersImpl connectivityParams, long timeoutInMilliseconds, |
| 280 | - RaceTrackingHandler raceTrackingHandler, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws URISyntaxException, SubscriberInitializationException, |
|
| 281 | - IOException, InterruptedException, CreateModelException, TimeOutException { |
|
| 280 | + RaceTrackingHandler raceTrackingHandler, |
|
| 281 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 282 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) |
|
| 283 | + throws URISyntaxException, SubscriberInitializationException, IOException, InterruptedException, |
|
| 284 | + CreateModelException, TimeOutException { |
|
| 282 | 285 | this(/* regatta */ null, domainFactory, raceLogStore, regattaLogStore, windStore, trackedRegattaRegistry, |
| 283 | 286 | raceLogResolver, leaderboardGroupResolver, connectivityParams, timeoutInMilliseconds, |
| 284 | 287 | raceTrackingHandler, markPassingRaceFingerprintRegistry, maneuverRaceFingerprintRegistry); |
| ... | ... | @@ -302,8 +305,11 @@ public class TracTracRaceTrackerImpl extends AbstractRaceTrackerImpl<RaceTrackin |
| 302 | 305 | RegattaLogStore regattaLogStore, WindStore windStore, TrackedRegattaRegistry trackedRegattaRegistry, |
| 303 | 306 | RaceLogAndTrackedRaceResolver raceLogResolver, LeaderboardGroupResolver leaderboardGroupResolver, |
| 304 | 307 | RaceTrackingConnectivityParametersImpl connectivityParams, long timeoutInMilliseconds, |
| 305 | - RaceTrackingHandler raceTrackingHandler, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) |
|
| 306 | - throws URISyntaxException, SubscriberInitializationException, IOException, InterruptedException, CreateModelException, TimeOutException { |
|
| 308 | + RaceTrackingHandler raceTrackingHandler, |
|
| 309 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 310 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) |
|
| 311 | + throws URISyntaxException, SubscriberInitializationException, |
|
| 312 | + IOException, InterruptedException, CreateModelException, TimeOutException { |
|
| 307 | 313 | super(connectivityParams); |
| 308 | 314 | final URL paramURL = connectivityParams.getParamURL(); |
| 309 | 315 | final URI liveURI = connectivityParams.getLiveURI(); |
java/com.sap.sailing.domain.yellowbrickadapter/src/com/sap/sailing/domain/yellowbrickadapter/YellowBrickRaceTrackingConnectivityParams.java
| ... | ... | @@ -47,7 +47,9 @@ public class YellowBrickRaceTrackingConnectivityParams extends AbstractRaceTrack |
| 47 | 47 | @Override |
| 48 | 48 | public RaceTracker createRaceTracker(TrackedRegattaRegistry trackedRegattaRegistry, WindStore windStore, |
| 49 | 49 | RaceLogAndTrackedRaceResolver raceLogResolver, LeaderboardGroupResolver leaderboardGroupResolver, |
| 50 | - long timeoutInMilliseconds, RaceTrackingHandler raceTrackingHandler, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws Exception { |
|
| 50 | + long timeoutInMilliseconds, RaceTrackingHandler raceTrackingHandler, |
|
| 51 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 52 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws Exception { |
|
| 51 | 53 | return new YellowBrickRaceTrackerImpl(this, /* regatta */ null, trackedRegattaRegistry, windStore, |
| 52 | 54 | raceLogResolver, leaderboardGroupResolver, timeoutInMilliseconds, raceTrackingHandler, raceLogStore, |
| 53 | 55 | regattaLogStore, baseDomainFactory, yellowBrickTrackingAdapter); |
| ... | ... | @@ -57,8 +59,11 @@ public class YellowBrickRaceTrackingConnectivityParams extends AbstractRaceTrack |
| 57 | 59 | public RaceTracker createRaceTracker(Regatta regatta, TrackedRegattaRegistry trackedRegattaRegistry, |
| 58 | 60 | WindStore windStore, RaceLogAndTrackedRaceResolver raceLogResolver, |
| 59 | 61 | LeaderboardGroupResolver leaderboardGroupResolver, long timeoutInMilliseconds, |
| 60 | - RaceTrackingHandler raceTrackingHandler, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws Exception { |
|
| 61 | - return new YellowBrickRaceTrackerImpl(this, regatta, trackedRegattaRegistry, windStore, raceLogResolver, |
|
| 62 | + RaceTrackingHandler raceTrackingHandler, |
|
| 63 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 64 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) throws Exception { |
|
| 65 | + return new YellowBrickRaceTrackerImpl(this, regatta, trackedRegattaRegistry, |
|
| 66 | + windStore, raceLogResolver, |
|
| 62 | 67 | leaderboardGroupResolver, timeoutInMilliseconds, raceTrackingHandler, raceLogStore, regattaLogStore, |
| 63 | 68 | baseDomainFactory, yellowBrickTrackingAdapter); |
| 64 | 69 | } |
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingHandler.java
| ... | ... | @@ -39,7 +39,9 @@ public interface RaceTrackingHandler { |
| 39 | 39 | long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed, |
| 40 | 40 | DynamicRaceDefinitionSet raceDefinitionSetToUpdate, boolean useMarkPassingCalculator, |
| 41 | 41 | RaceLogAndTrackedRaceResolver raceLogResolver, Optional<ThreadLocalTransporter> threadLocalTransporter, |
| 42 | - TrackingConnectorInfo trackingConnectorInfo, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry); |
|
| 42 | + TrackingConnectorInfo trackingConnectorInfo, |
|
| 43 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 44 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry); |
|
| 43 | 45 | |
| 44 | 46 | DynamicCompetitor getOrCreateCompetitor(CompetitorAndBoatStore competitorAndBoatStore, Serializable competitorId, |
| 45 | 47 | String name, String shortName, Color displayColor, String email, URI flagImageURI, DynamicTeam team, |
| ... | ... | @@ -63,10 +65,14 @@ public interface RaceTrackingHandler { |
| 63 | 65 | long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed, |
| 64 | 66 | DynamicRaceDefinitionSet raceDefinitionSetToUpdate, boolean useMarkPassingCalculator, |
| 65 | 67 | RaceLogAndTrackedRaceResolver raceLogResolver, Optional<ThreadLocalTransporter> threadLocalTransporter, |
| 66 | - TrackingConnectorInfo trackingConnectorInfo, MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 67 | - return trackedRegatta.createTrackedRace(raceDefinition, sidelines, windStore, delayToLiveInMillis, |
|
| 68 | + TrackingConnectorInfo trackingConnectorInfo, |
|
| 69 | + MarkPassingRaceFingerprintRegistry markPassingRaceFingerprintRegistry, |
|
| 70 | + ManeuverRaceFingerprintRegistry maneuverRaceFingerprintRegistry) { |
|
| 71 | + return trackedRegatta.createTrackedRace(raceDefinition, sidelines, |
|
| 72 | + windStore, delayToLiveInMillis, |
|
| 68 | 73 | millisecondsOverWhichToAverageWind, millisecondsOverWhichToAverageSpeed, raceDefinitionSetToUpdate, |
| 69 | - useMarkPassingCalculator, raceLogResolver, threadLocalTransporter, trackingConnectorInfo, markPassingRaceFingerprintRegistry, maneuverRaceFingerprintRegistry); |
|
| 74 | + useMarkPassingCalculator, raceLogResolver, threadLocalTransporter, trackingConnectorInfo, |
|
| 75 | + markPassingRaceFingerprintRegistry, maneuverRaceFingerprintRegistry); |
|
| 70 | 76 | } |
| 71 | 77 | |
| 72 | 78 | @Override |