mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
major refacoring and cleanup of RaceLog and RegattaLog events needed for the new way of registering boats and competitors as separate entities -> UI is still not ready for it.
This commit is contained in:
1 parent
20bc27a3da
commit
48162c73be
98 files changed
+1898
-1315
No files matched your search
+10
-12
@@ -8,11 +8,9 @@ import java.util.logging.Logger;
|
||||
|
||||
import org.json.simple.JSONObject;
|
||||
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.base.CompetitorFactory;
|
||||
import com.sap.sailing.domain.base.CompetitorWithBoat;
|
||||
import com.sap.sailing.domain.base.CompetitorWithBoatFactory;
|
||||
import com.sap.sailing.domain.base.SharedDomainFactory;
|
||||
import com.sap.sailing.domain.base.impl.CompetitorWithBoatImpl;
|
||||
import com.sap.sailing.domain.base.impl.DynamicBoat;
|
||||
import com.sap.sailing.domain.base.impl.DynamicTeam;
|
||||
import com.sap.sailing.domain.common.tracking.impl.CompetitorJsonConstants;
|
||||
@@ -24,7 +22,7 @@ import com.sap.sse.common.impl.MillisecondsDurationImpl;
|
||||
import com.sap.sse.common.impl.RGBColor;
|
||||
|
||||
public class CompetitorWithBoatJsonDeserializer implements JsonDeserializer<CompetitorWithBoat> {
|
||||
protected final CompetitorFactory competitorFactory;
|
||||
protected final CompetitorWithBoatFactory competitorWithBoatFactory;
|
||||
protected final JsonDeserializer<DynamicTeam> teamJsonDeserializer;
|
||||
protected final JsonDeserializer<DynamicBoat> boatJsonDeserializer;
|
||||
private static final Logger logger = Logger.getLogger(CompetitorWithBoatJsonDeserializer.class.getName());
|
||||
@@ -34,12 +32,12 @@ public class CompetitorWithBoatJsonDeserializer implements JsonDeserializer<Comp
|
||||
new NationalityJsonDeserializer(baseDomainFactory))), new BoatJsonDeserializer(baseDomainFactory, new BoatClassJsonDeserializer(baseDomainFactory)));
|
||||
}
|
||||
|
||||
public CompetitorWithBoatJsonDeserializer(CompetitorFactory competitorFactory) {
|
||||
this(competitorFactory, null, /* boatDeserializer */ null);
|
||||
public CompetitorWithBoatJsonDeserializer(CompetitorWithBoatFactory competitorWithBoatFactory) {
|
||||
this(competitorWithBoatFactory, null, /* boatDeserializer */ null);
|
||||
}
|
||||
|
||||
public CompetitorWithBoatJsonDeserializer(CompetitorFactory competitorFactory, JsonDeserializer<DynamicTeam> teamJsonDeserializer, JsonDeserializer<DynamicBoat> boatDeserializer) {
|
||||
this.competitorFactory = competitorFactory;
|
||||
public CompetitorWithBoatJsonDeserializer(CompetitorWithBoatFactory competitorWithBoatFactory, JsonDeserializer<DynamicTeam> teamJsonDeserializer, JsonDeserializer<DynamicBoat> boatDeserializer) {
|
||||
this.competitorWithBoatFactory = competitorWithBoatFactory;
|
||||
this.teamJsonDeserializer = teamJsonDeserializer;
|
||||
this.boatJsonDeserializer = boatDeserializer;
|
||||
}
|
||||
@@ -92,12 +90,12 @@ public class CompetitorWithBoatJsonDeserializer implements JsonDeserializer<Comp
|
||||
final Double timeOnTimeFactor = (Double) object.get(CompetitorJsonConstants.FIELD_TIME_ON_TIME_FACTOR);
|
||||
final Double timeOnDistanceAllowanceInSecondsPerNauticalMile = (Double) object
|
||||
.get(CompetitorJsonConstants.FIELD_TIME_ON_DISTANCE_ALLOWANCE_IN_SECONDS_PER_NAUTICAL_MILE);
|
||||
Competitor competitor = competitorFactory.getOrCreateCompetitor(competitorId, name, shortName, displayColor, email,
|
||||
CompetitorWithBoat competitorWithBoat = competitorWithBoatFactory.getOrCreateCompetitorWithBoat(competitorId, name, shortName, displayColor, email,
|
||||
flagImageURI, team, timeOnTimeFactor,
|
||||
timeOnDistanceAllowanceInSecondsPerNauticalMile == null ? null :
|
||||
new MillisecondsDurationImpl((long) (timeOnDistanceAllowanceInSecondsPerNauticalMile*1000)), searchTag);
|
||||
timeOnDistanceAllowanceInSecondsPerNauticalMile == null ? null :
|
||||
new MillisecondsDurationImpl((long) (timeOnDistanceAllowanceInSecondsPerNauticalMile*1000)), searchTag, boat);
|
||||
|
||||
return new CompetitorWithBoatImpl(competitor, boat);
|
||||
return competitorWithBoat;
|
||||
} catch (Exception e) {
|
||||
throw new JsonDeserializationException(e);
|
||||
}
|
||||
|
||||
+4
-1
@@ -4,6 +4,7 @@ import org.json.simple.JSONObject;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.base.CompetitorWithBoat;
|
||||
import com.sap.sailing.domain.base.SharedDomainFactory;
|
||||
import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
|
||||
import com.sap.sailing.domain.racelogtracking.SmartphoneUUIDIdentifier;
|
||||
@@ -16,6 +17,7 @@ import com.sap.sailing.server.gateway.deserialization.coursedata.impl.MarkDeseri
|
||||
import com.sap.sailing.server.gateway.deserialization.coursedata.impl.WaypointDeserializer;
|
||||
import com.sap.sailing.server.gateway.deserialization.impl.BoatJsonDeserializer;
|
||||
import com.sap.sailing.server.gateway.deserialization.impl.CompetitorJsonDeserializer;
|
||||
import com.sap.sailing.server.gateway.deserialization.impl.CompetitorWithBoatJsonDeserializer;
|
||||
import com.sap.sailing.server.gateway.deserialization.impl.DeviceIdentifierJsonDeserializer;
|
||||
import com.sap.sailing.server.gateway.deserialization.impl.PositionJsonDeserializer;
|
||||
import com.sap.sailing.server.gateway.deserialization.impl.WindJsonDeserializer;
|
||||
@@ -57,6 +59,7 @@ public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent>
|
||||
public static RaceLogEventDeserializer create(SharedDomainFactory domainFactory,
|
||||
JsonDeserializer<DeviceIdentifier> deviceDeserializer) {
|
||||
JsonDeserializer<Competitor> competitorDeserializer = CompetitorJsonDeserializer.create(domainFactory);
|
||||
JsonDeserializer<CompetitorWithBoat> competitorWithBoatDeserializer = CompetitorWithBoatJsonDeserializer.create(domainFactory);
|
||||
return new RaceLogEventDeserializer(
|
||||
new RaceLogFlagEventDeserializer(competitorDeserializer),
|
||||
new RaceLogStartTimeEventDeserializer(competitorDeserializer),
|
||||
@@ -81,7 +84,7 @@ public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent>
|
||||
new RaceLogDenoteForTrackingEventDeserializer(competitorDeserializer, domainFactory),
|
||||
new RaceLogStartTrackingEventDeserializer(competitorDeserializer),
|
||||
new RaceLogRevokeEventDeserializer(competitorDeserializer),
|
||||
new RaceLogRegisterCompetitorEventDeserializer(competitorDeserializer),
|
||||
new RaceLogRegisterCompetitorEventDeserializer(competitorDeserializer, competitorWithBoatDeserializer),
|
||||
new RaceLogRegisterCompetitorAndBoatEventDeserializer(competitorDeserializer, BoatJsonDeserializer.create(domainFactory)),
|
||||
new RaceLogAdditionalScoringInformationEventDeserializer(competitorDeserializer),
|
||||
new RaceLogFixedMarkPassingEventDeserializer(competitorDeserializer),
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ public class RaceLogRegisterCompetitorAndBoatEventDeserializer extends BaseRaceL
|
||||
|
||||
@Override
|
||||
protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint createdAt, AbstractLogEventAuthor author, TimePoint timePoint, int passId, List<Competitor> competitors) throws JsonDeserializationException {
|
||||
assert competitors.size() == 1 : "Expected exactly one competitor for RegisterCompetitorEvent";
|
||||
assert competitors.size() == 1 : "Expected exactly one competitor for RegisterCompetitorAndBoatEvent";
|
||||
Boat boat = boatDeserializer.deserialize(object);
|
||||
return new RaceLogRegisterCompetitorAndBoatEventImpl(createdAt, timePoint, author, id, passId, competitors.get(0), boat);
|
||||
}
|
||||
|
||||
+8
-3
@@ -9,19 +9,24 @@ import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogRegisterCompetitorEventImpl;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.base.CompetitorWithBoat;
|
||||
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
|
||||
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
public class RaceLogRegisterCompetitorEventDeserializer extends BaseRaceLogEventDeserializer {
|
||||
private final JsonDeserializer<CompetitorWithBoat> competitorWithBoatDeserializer;
|
||||
|
||||
public RaceLogRegisterCompetitorEventDeserializer(JsonDeserializer<Competitor> competitorDeserializer) {
|
||||
public RaceLogRegisterCompetitorEventDeserializer(JsonDeserializer<Competitor> competitorDeserializer, JsonDeserializer<CompetitorWithBoat> competitorWithBoatDeserializer) {
|
||||
super(competitorDeserializer);
|
||||
this.competitorWithBoatDeserializer = competitorWithBoatDeserializer;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint createdAt, AbstractLogEventAuthor author, TimePoint timePoint, int passId, List<Competitor> competitors) {
|
||||
protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint createdAt, AbstractLogEventAuthor author, TimePoint timePoint, int passId, List<Competitor> competitors) throws JsonDeserializationException {
|
||||
assert competitors.size() == 1 : "Expected exactly one competitor for RegisterCompetitorEvent";
|
||||
return new RaceLogRegisterCompetitorEventImpl(createdAt, timePoint, author, id, passId, competitors.get(0));
|
||||
CompetitorWithBoat competitorWithBoat = competitorWithBoatDeserializer.deserialize(object);
|
||||
return new RaceLogRegisterCompetitorEventImpl(createdAt, timePoint, author, id, passId, competitorWithBoat);
|
||||
}
|
||||
|
||||
}
|
||||
+11
-11
@@ -4,35 +4,35 @@ import org.json.simple.JSONObject;
|
||||
|
||||
import com.sap.sailing.domain.base.Boat;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.base.CompetitorAndBoat;
|
||||
import com.sap.sailing.domain.base.CompetitorWithBoat;
|
||||
import com.sap.sailing.domain.common.tracking.impl.CompetitorJsonConstants;
|
||||
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
|
||||
|
||||
public class CompetitorAndBoatJsonSerializer implements JsonSerializer<CompetitorAndBoat> {
|
||||
public class CompetitorWithBoatJsonSerializer implements JsonSerializer<CompetitorWithBoat> {
|
||||
private final JsonSerializer<Boat> boatJsonSerializer;
|
||||
private final JsonSerializer<Competitor> competitorJsonSerializer;
|
||||
|
||||
public static CompetitorAndBoatJsonSerializer create() {
|
||||
return new CompetitorAndBoatJsonSerializer(CompetitorJsonSerializer.create(), BoatJsonSerializer.create());
|
||||
public static CompetitorWithBoatJsonSerializer create() {
|
||||
return new CompetitorWithBoatJsonSerializer(CompetitorJsonSerializer.create(), BoatJsonSerializer.create());
|
||||
}
|
||||
|
||||
public CompetitorAndBoatJsonSerializer() {
|
||||
public CompetitorWithBoatJsonSerializer() {
|
||||
this(null, null);
|
||||
}
|
||||
|
||||
public CompetitorAndBoatJsonSerializer(JsonSerializer<Competitor> competitorJsonSerializer, JsonSerializer<Boat> boatJsonSerializer) {
|
||||
public CompetitorWithBoatJsonSerializer(JsonSerializer<Competitor> competitorJsonSerializer, JsonSerializer<Boat> boatJsonSerializer) {
|
||||
this.competitorJsonSerializer = competitorJsonSerializer;
|
||||
this.boatJsonSerializer = boatJsonSerializer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public JSONObject serialize(CompetitorAndBoat competitorAndBoat) {
|
||||
JSONObject serializedCompetitor = competitorJsonSerializer.serialize(competitorAndBoat.getCompetitor());
|
||||
public JSONObject serialize(CompetitorWithBoat competitor) {
|
||||
JSONObject serializedCompetitor = competitorJsonSerializer.serialize(competitor);
|
||||
|
||||
serializedCompetitor.put(CompetitorJsonConstants.FIELD_SAIL_ID, competitorAndBoat.getBoat() == null ? "" : competitorAndBoat.getBoat().getSailID());
|
||||
serializedCompetitor.put(CompetitorJsonConstants.FIELD_SAIL_ID, competitor.getBoat() == null ? "" : competitor.getBoat().getSailID());
|
||||
|
||||
if (boatJsonSerializer != null) {
|
||||
serializedCompetitor.put(CompetitorJsonConstants.FIELD_BOAT, boatJsonSerializer.serialize(competitorAndBoat.getBoat()));
|
||||
if (boatJsonSerializer != null && competitor.getBoat() != null) {
|
||||
serializedCompetitor.put(CompetitorJsonConstants.FIELD_BOAT, boatJsonSerializer.serialize(competitor.getBoat()));
|
||||
}
|
||||
return serializedCompetitor;
|
||||
}
|
||||
+1
-1
@@ -37,7 +37,7 @@ public abstract class BaseRaceLogEventSerializer implements JsonSerializer<RaceL
|
||||
result.put(FIELD_PASS_ID, object.getPassId());
|
||||
|
||||
JSONArray competitors = new JSONArray();
|
||||
for (Competitor competitor : object.getInvolvedBoats()) {
|
||||
for (Competitor competitor : object.getInvolvedCompetitors()) {
|
||||
if (competitor != null) {
|
||||
competitors.add(competitorSerializer.serialize(competitor));
|
||||
}
|
||||
|
||||
-2
@@ -76,7 +76,6 @@ public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent>, Rac
|
||||
new RaceLogDenoteForTrackingEventSerializer(competitorSerializer),
|
||||
new RaceLogStartTrackingEventSerializer(competitorSerializer),
|
||||
new RaceLogRevokeEventSerializer(competitorSerializer),
|
||||
new RaceLogRegisterBoatEventSerializer(competitorSerializer),
|
||||
new RaceLogRegisterCompetitorEventSerializer(competitorSerializer),
|
||||
new RaceLogRegisterCompetitorAndBoatEventSerializer(competitorSerializer),
|
||||
new RaceLogAdditionalScoringInformationSerializer(competitorSerializer),
|
||||
@@ -136,7 +135,6 @@ public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent>, Rac
|
||||
JsonSerializer<RaceLogEvent> denoteForTrackingSerializer,
|
||||
JsonSerializer<RaceLogEvent> createRaceSerializer,
|
||||
JsonSerializer<RaceLogEvent> revokeSerializer,
|
||||
JsonSerializer<RaceLogEvent> registerBoatSerializer,
|
||||
JsonSerializer<RaceLogEvent> registerCompetitorSerializer,
|
||||
JsonSerializer<RaceLogEvent> registerCompetitorAndBoatSerializer,
|
||||
JsonSerializer<RaceLogEvent> additionalScoringInformationSerializer,
|
||||
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
package com.sap.sailing.server.gateway.serialization.racelog.impl;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.shared.events.RegisterBoatEvent;
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
|
||||
|
||||
public class RaceLogRegisterBoatEventSerializer extends BaseRaceLogEventSerializer {
|
||||
|
||||
public static final String VALUE_CLASS = RegisterBoatEvent.class.getSimpleName();
|
||||
|
||||
public RaceLogRegisterBoatEventSerializer(
|
||||
JsonSerializer<Competitor> competitorSerializer) {
|
||||
super(competitorSerializer);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getClassFieldValue() {
|
||||
return VALUE_CLASS;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user