diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java index b5cf354b6fd..7e859ac6ea0 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java @@ -33,7 +33,7 @@ import com.sap.sailing.server.gateway.deserialization.coursedata.impl.GateDeseri import com.sap.sailing.server.gateway.deserialization.coursedata.impl.MarkDeserializer; import com.sap.sailing.server.gateway.deserialization.coursedata.impl.WaypointDeserializer; import com.sap.sailing.server.gateway.deserialization.impl.CompetitorDeserializer; -import com.sap.sailing.server.gateway.deserialization.impl.RaceLogCourseDesignChangedEventDeserializer; +import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogCourseDesignChangedEventDeserializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.ControlPointJsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.CourseBaseJsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.GateJsonSerializer; diff --git a/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF index 84097f1c72f..51e15aa0e10 100644 --- a/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Require-Bundle: com.sap.sailing.domain.common;bundle-version="1.0.0", Export-Package: com.sap.sailing.server.gateway.deserialization, com.sap.sailing.server.gateway.deserialization.coursedata.impl, com.sap.sailing.server.gateway.deserialization.impl, + com.sap.sailing.server.gateway.deserialization.racelog.impl, com.sap.sailing.server.gateway.serialization, com.sap.sailing.server.gateway.serialization.coursedata.impl, com.sap.sailing.server.gateway.serialization.impl, diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java deleted file mode 100644 index f452b1aa676..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.domain.racelog.RaceLogEventFactory; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.BaseRaceLogEventSerializer; - -public abstract class BaseRaceLogEventDeserializer implements JsonDeserializer { - - protected RaceLogEventFactory factory; - protected JsonDeserializer competitorDeserializer; - - public BaseRaceLogEventDeserializer(JsonDeserializer competitorDeserializer) { - this.factory = RaceLogEventFactory.INSTANCE; - this.competitorDeserializer = competitorDeserializer; - } - - protected abstract RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) - throws JsonDeserializationException; - - @Override - public RaceLogEvent deserialize(JSONObject object) throws JsonDeserializationException { - // Factory handles class field and subclassing... - Serializable id = (Serializable) object.get(BaseRaceLogEventSerializer.FIELD_ID); - Number timeStamp = (Number) object.get(BaseRaceLogEventSerializer.FIELD_TIMESTAMP); - Number passId = (Number) object.get(BaseRaceLogEventSerializer.FIELD_PASS_ID); - - JSONArray jsonCompetitors = Helpers.getNestedArraySafe(object, BaseRaceLogEventSerializer.FIELD_COMPETITORS); - List competitors = new ArrayList(); - - for (Object competitorObject : jsonCompetitors) { - JSONObject jsonCompetitor = (JSONObject) competitorObject; - Competitor competitor = competitorDeserializer.deserialize(jsonCompetitor); - competitors.add(competitor); - } - - return deserialize( - object, - Helpers.tryUuidConversion(id), - new MillisecondsTimePoint(timeStamp.longValue()), - passId.intValue(), - competitors); - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogCourseAreaChangedEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogCourseAreaChangedEventDeserializer.java deleted file mode 100644 index f9bcd53356f..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogCourseAreaChangedEventDeserializer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.List; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseAreaChangedEventSerializer; - -public class RaceLogCourseAreaChangedEventDeserializer extends BaseRaceLogEventDeserializer { - - public RaceLogCourseAreaChangedEventDeserializer(JsonDeserializer competitorDeserializer) { - super(competitorDeserializer); - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) - throws JsonDeserializationException { - - Serializable courseAreaId = (Serializable) object.get(RaceLogCourseAreaChangedEventSerializer.FIELD_COURSE_AREA_ID); - - return factory.createCourseAreaChangedEvent(timePoint, id, competitors, passId, - Helpers.tryUuidConversion(courseAreaId)); - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogCourseDesignChangedEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogCourseDesignChangedEventDeserializer.java deleted file mode 100644 index dfb4b74bfbc..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogCourseDesignChangedEventDeserializer.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.List; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CourseBase; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.racelog.RaceLogEvent; -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.CourseDataDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseDesignChangedEventSerializer; - -public class RaceLogCourseDesignChangedEventDeserializer extends BaseRaceLogEventDeserializer { - - private final CourseDataDeserializer courseDataDeserializer; - - public RaceLogCourseDesignChangedEventDeserializer(JsonDeserializer competitorDeserializer, CourseDataDeserializer courseDataDeserializer) { - super(competitorDeserializer); - this.courseDataDeserializer = courseDataDeserializer; - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) - throws JsonDeserializationException { - - JSONObject jsonCourseDesign = (JSONObject) object.get(RaceLogCourseDesignChangedEventSerializer.FIELD_COURSE_DESIGN); - CourseBase courseData = courseDataDeserializer.deserialize(jsonCourseDesign); - - return factory.createCourseDesignChangedEvent(timePoint, id, competitors, passId, courseData); - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogEventDeserializer.java deleted file mode 100644 index f892beec0de..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogEventDeserializer.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.SharedDomainFactory; -import com.sap.sailing.domain.racelog.RaceLogEvent; -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; -import com.sap.sailing.server.gateway.deserialization.coursedata.impl.CourseDataDeserializer; -import com.sap.sailing.server.gateway.deserialization.coursedata.impl.GateDeserializer; -import com.sap.sailing.server.gateway.deserialization.coursedata.impl.MarkDeserializer; -import com.sap.sailing.server.gateway.deserialization.coursedata.impl.WaypointDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.BaseRaceLogEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseAreaChangedEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseDesignChangedEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFinishPositioningConfirmedEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFinishPositioningListChangedEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFlagEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogPassChangeEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogRaceStatusEventSerializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogStartTimeEventSerializer; - -public class RaceLogEventDeserializer implements JsonDeserializer { - - public static RaceLogEventDeserializer create(SharedDomainFactory domainFactory) { - JsonDeserializer competitorDeserializer = new CompetitorDeserializer(domainFactory); - - return new RaceLogEventDeserializer( - new RaceLogFlagEventDeserializer(competitorDeserializer), - new RaceLogStartTimeEventDeserializer(competitorDeserializer), - new RaceLogRaceStatusEventDeserializer(competitorDeserializer), - new RaceLogCourseAreaChangedEventDeserializer(competitorDeserializer), - new RaceLogCourseDesignChangedEventDeserializer(competitorDeserializer, - new CourseDataDeserializer( - new WaypointDeserializer( - new ControlPointDeserializer( - new MarkDeserializer(domainFactory), new GateDeserializer(domainFactory, new MarkDeserializer(domainFactory)))))), - new RaceLogFinishPositioningListChangedEventDeserializer(competitorDeserializer), - new RaceLogFinishPositioningConfirmedEventDeserializer(competitorDeserializer), - new RaceLogPassChangeEventDeserializer(competitorDeserializer)); - } - - protected JsonDeserializer flagEventDeserializer; - protected JsonDeserializer startTimeEventDeserializer; - protected JsonDeserializer raceStatusEventDeserializer; - protected JsonDeserializer courseAreaChangedEventDeserializer; - protected JsonDeserializer courseDesignChangedEventDeserializer; - protected JsonDeserializer finishPositioningListChangedEventDeserializer; - protected JsonDeserializer finishPositioningConfirmedEventDeserializer; - protected JsonDeserializer passChangeEventDeserializer; - - public RaceLogEventDeserializer(JsonDeserializer flagEventDeserializer, - JsonDeserializer startTimeEventDeserializer, - JsonDeserializer raceStatusEventDeserializer, - JsonDeserializer courseAreaChangedEventDeserializer, - JsonDeserializer courseDesignChangedEventDeserializer, - JsonDeserializer finishPositioningListChangedEventDeserializer, - JsonDeserializer finishPositioningConfirmedEventDeserializer, - JsonDeserializer passChangeEventDeserializer) { - this.flagEventDeserializer = flagEventDeserializer; - this.startTimeEventDeserializer = startTimeEventDeserializer; - this.raceStatusEventDeserializer = raceStatusEventDeserializer; - this.courseAreaChangedEventDeserializer = courseAreaChangedEventDeserializer; - this.courseDesignChangedEventDeserializer = courseDesignChangedEventDeserializer; - this.finishPositioningListChangedEventDeserializer = finishPositioningListChangedEventDeserializer; - this.finishPositioningConfirmedEventDeserializer = finishPositioningConfirmedEventDeserializer; - this.passChangeEventDeserializer = passChangeEventDeserializer; - } - - protected JsonDeserializer getDeserializer(JSONObject object) throws JsonDeserializationException { - Object type = object.get(BaseRaceLogEventSerializer.FIELD_CLASS); - - if (type.equals(RaceLogFlagEventSerializer.VALUE_CLASS)) { - return flagEventDeserializer; - } else if (type.equals(RaceLogStartTimeEventSerializer.VALUE_CLASS)) { - return startTimeEventDeserializer; - } else if (type.equals(RaceLogRaceStatusEventSerializer.VALUE_CLASS)) { - return raceStatusEventDeserializer; - } else if (type.equals(RaceLogCourseAreaChangedEventSerializer.VALUE_CLASS)) { - return courseAreaChangedEventDeserializer; - } else if (type.equals(RaceLogCourseDesignChangedEventSerializer.VALUE_CLASS)) { - return courseDesignChangedEventDeserializer; - } else if (type.equals(RaceLogFinishPositioningListChangedEventSerializer.VALUE_CLASS)) { - return finishPositioningListChangedEventDeserializer; - } else if (type.equals(RaceLogFinishPositioningConfirmedEventSerializer.VALUE_CLASS)) { - return finishPositioningConfirmedEventDeserializer; - } else if (type.equals(RaceLogPassChangeEventSerializer.VALUE_CLASS)) { - return passChangeEventDeserializer; - } - - throw new JsonDeserializationException(String.format("There is no deserializer defined for event type %s.", - type)); - } - - @Override - public RaceLogEvent deserialize(JSONObject object) throws JsonDeserializationException { - return getDeserializer(object).deserialize(object); - } -} \ No newline at end of file diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFinishPositioningConfirmedEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFinishPositioningConfirmedEventDeserializer.java deleted file mode 100644 index b938ab9fed1..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFinishPositioningConfirmedEventDeserializer.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.List; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; - -public class RaceLogFinishPositioningConfirmedEventDeserializer extends BaseRaceLogEventDeserializer { - - public RaceLogFinishPositioningConfirmedEventDeserializer(JsonDeserializer competitorDeserializer) { - super(competitorDeserializer); - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) - throws JsonDeserializationException { - - return factory.createFinishPositioningConfirmedEvent(timePoint, id, competitors, passId); - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFinishPositioningListChangedEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFinishPositioningListChangedEventDeserializer.java deleted file mode 100644 index aec06609038..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFinishPositioningListChangedEventDeserializer.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.MaxPointsReason; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.common.impl.Util.Triple; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFinishPositioningListChangedEventSerializer; - -public class RaceLogFinishPositioningListChangedEventDeserializer extends BaseRaceLogEventDeserializer { - - public RaceLogFinishPositioningListChangedEventDeserializer(JsonDeserializer competitorDeserializer) { - super(competitorDeserializer); - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) - throws JsonDeserializationException { - - JSONArray jsonPositionedCompetitors = Helpers.getNestedArraySafe(object, RaceLogFinishPositioningListChangedEventSerializer.FIELD_POSITIONED_COMPETITORS); - List> positionedCompetitors = deserializePositionedCompetitors(jsonPositionedCompetitors); - - return factory.createFinishPositioningListChangedEvent(timePoint, id, competitors, passId, positionedCompetitors); - } - - private List> deserializePositionedCompetitors(JSONArray jsonPositionedCompetitors) throws JsonDeserializationException { - List> positionedCompetitors = new ArrayList>(); - - for (Object object : jsonPositionedCompetitors) { - JSONObject jsonPositionedCompetitor = Helpers.toJSONObjectSafe(object); - - Serializable competitorId = (Serializable) jsonPositionedCompetitor.get(RaceLogFinishPositioningListChangedEventSerializer.FIELD_COMPETITOR_ID); - competitorId = Helpers.tryUuidConversion(competitorId); - String competitorName = (String) jsonPositionedCompetitor.get(RaceLogFinishPositioningListChangedEventSerializer.FIELD_COMPETITOR_NAME); - - String maxPointsReasonName = (String) jsonPositionedCompetitor.get(RaceLogFinishPositioningListChangedEventSerializer.FIELD_SCORE_CORRECTIONS_MAX_POINTS_REASON); - MaxPointsReason maxPointsReason = MaxPointsReason.valueOf(maxPointsReasonName); - - Triple positionedCompetitor = new Triple(competitorId, competitorName, maxPointsReason); - positionedCompetitors.add(positionedCompetitor); - } - - return positionedCompetitors; - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFlagEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFlagEventDeserializer.java deleted file mode 100644 index c3eff145099..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFlagEventDeserializer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.List; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.common.racelog.Flags; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFlagEventSerializer; - -public class RaceLogFlagEventDeserializer extends BaseRaceLogEventDeserializer { - - public RaceLogFlagEventDeserializer(JsonDeserializer competitorDeserializer) { - super(competitorDeserializer); - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) { - - Flags upperFlag = Flags.valueOf(object.get(RaceLogFlagEventSerializer.FIELD_UPPER_FLAG).toString()); - Flags lowerFlag = Flags.valueOf(object.get(RaceLogFlagEventSerializer.FIELD_LOWER_FLAG).toString()); - boolean isDisplayed = (Boolean) object.get(RaceLogFlagEventSerializer.FIELD_DISPLAYED); - - return factory.createFlagEvent(timePoint, id, competitors, passId, upperFlag, lowerFlag, isDisplayed); - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogPassChangeEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogPassChangeEventDeserializer.java deleted file mode 100644 index 5bf37d6adb5..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogPassChangeEventDeserializer.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.List; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; - -public class RaceLogPassChangeEventDeserializer extends BaseRaceLogEventDeserializer { - - public RaceLogPassChangeEventDeserializer(JsonDeserializer competitorDeserializer) { - super(competitorDeserializer); - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) { - - return factory.createPassChangeEvent(timePoint, id, competitors, passId); - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogRaceStatusEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogRaceStatusEventDeserializer.java deleted file mode 100644 index f1282f5eff5..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogRaceStatusEventDeserializer.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.List; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogRaceStatusEventSerializer; - -public class RaceLogRaceStatusEventDeserializer extends BaseRaceLogEventDeserializer { - - public RaceLogRaceStatusEventDeserializer(JsonDeserializer competitorDeserializer) { - super(competitorDeserializer); - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) - throws JsonDeserializationException { - - String statusValue = object.get(RaceLogRaceStatusEventSerializer.FIELD_NEXT_STATUS).toString(); - RaceLogRaceStatus nextStatus = RaceLogRaceStatus.valueOf(statusValue); - - return factory.createRaceStatusEvent(timePoint, id, competitors, passId, nextStatus); - } - -} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogStartTimeEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogStartTimeEventDeserializer.java deleted file mode 100644 index f5c3115358e..00000000000 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogStartTimeEventDeserializer.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.sap.sailing.server.gateway.deserialization.impl; - -import java.io.Serializable; -import java.util.List; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; -import com.sap.sailing.domain.common.TimePoint; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; -import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogStartTimeEventSerializer; - -public class RaceLogStartTimeEventDeserializer extends RaceLogRaceStatusEventDeserializer { - - public RaceLogStartTimeEventDeserializer(JsonDeserializer competitorDeserializer) { - super(competitorDeserializer); - } - - @Override - protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId, List competitors) - throws JsonDeserializationException { - - long startTime = (Long) object.get(RaceLogStartTimeEventSerializer.FIELD_START_TIME); - - RaceLogRaceStatusEvent event = (RaceLogRaceStatusEvent) super.deserialize(object, id, timePoint, passId, competitors); - - return factory.createStartTimeEvent(event.getTimePoint(), event.getId(), event.getInvolvedBoats(), event.getPassId(), - new MillisecondsTimePoint(startTime)); - } - -} diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddEntryToRaceLogJsonPostServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddEntryToRaceLogJsonPostServlet.java index bec1be5f418..2b9f3a563e4 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddEntryToRaceLogJsonPostServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddEntryToRaceLogJsonPostServlet.java @@ -19,7 +19,7 @@ import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.gateway.AbstractJsonHttpServlet; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.deserialization.impl.Helpers; -import com.sap.sailing.server.gateway.deserialization.impl.RaceLogEventDeserializer; +import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogEventDeserializer; public class AddEntryToRaceLogJsonPostServlet extends AbstractJsonHttpServlet { private static final long serialVersionUID = 7704668926551060433L; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java index e5789be32e8..8873c88e423 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java @@ -42,7 +42,7 @@ import com.sap.sailing.racecommittee.app.domain.impl.DomainFactoryImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.deserialization.coursedata.impl.MarkDeserializer; import com.sap.sailing.server.gateway.deserialization.impl.CompetitorDeserializer; -import com.sap.sailing.server.gateway.deserialization.impl.RaceLogEventDeserializer; +import com.sap.sailing.server.gateway.deserialization.racelog.impl.RaceLogEventDeserializer; /** * Enables accessing of data.