diff --git a/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF index a7be07d0a42..12aa0d3005e 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF @@ -14,5 +14,4 @@ Require-Bundle: com.sap.sailing.server.gateway.serialization;bundle-version="1.0 org.mockito.mockito-core;bundle-version="1.9.5", org.objenesis;bundle-version="1.3.0" Import-Package: org.json.simple -Bundle-ClassPath: libs/mockito-all-1.9.5.jar, - . +Bundle-ClassPath: . diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java index e84e0603794..75950815d5c 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java @@ -17,7 +17,7 @@ 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.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.BaseRaceLogEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.BaseRaceLogEventSerializer; public abstract class AbstractEventSerializerTest { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/BaseEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/BaseEventSerializerTest.java index 466e00d0caa..09b22b687dd 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/BaseEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/BaseEventSerializerTest.java @@ -9,8 +9,8 @@ import org.junit.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.BaseRaceLogEventSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogFlagEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.BaseRaceLogEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFlagEventSerializer; public class BaseEventSerializerTest extends AbstractEventSerializerTest { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/CourseAreaChangedEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/CourseAreaChangedEventSerializerTest.java index f177cbe2eb1..bf714a94cf9 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/CourseAreaChangedEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/CourseAreaChangedEventSerializerTest.java @@ -15,7 +15,7 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.racelog.RaceLogCourseAreaChangedEvent; import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogCourseAreaChangedEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseAreaChangedEventSerializer; public class CourseAreaChangedEventSerializerTest extends AbstractEventSerializerTest { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/FlagEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/FlagEventSerializerTest.java index bdb95d28ab0..1646b53ccb0 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/FlagEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/FlagEventSerializerTest.java @@ -12,7 +12,7 @@ import com.sap.sailing.domain.racelog.Flags; import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.RaceLogFlagEvent; import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogFlagEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFlagEventSerializer; public class FlagEventSerializerTest extends AbstractEventSerializerTest { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerChooserTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerChooserTest.java index b4b8a5539a2..a428743df7b 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerChooserTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerChooserTest.java @@ -10,7 +10,8 @@ import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.RaceLogEventFactory; import com.sap.sailing.domain.racelog.RaceLogRaceStatus; import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogEventSerializerChooser; +import com.sap.sailing.server.gateway.serialization.racelog.RaceLogEventSerializerChooser; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogEventSerializerChooserImpl; public class RaceLogEventSerializerChooserTest { @@ -31,11 +32,12 @@ public class RaceLogEventSerializerChooserTest { courseAreaChangedEventSerializer = mock(JsonSerializer.class); passChangedSerializer = mock(JsonSerializer.class); - chooser = new RaceLogEventSerializerChooser( + chooser = new RaceLogEventSerializerChooserImpl( flagEventSerializer, startTimeSerializer, raceStatusSerializer, - courseAreaChangedEventSerializer); + courseAreaChangedEventSerializer, + passChangedSerializer); } @Test diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogPassChangeEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogPassChangeEventSerializerTest.java index 1713720bbe2..ef34f6151b1 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogPassChangeEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogPassChangeEventSerializerTest.java @@ -6,7 +6,7 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.RaceLogPassChangeEvent; import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogPassChangeEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogPassChangeEventSerializer; public class RaceLogPassChangeEventSerializerTest extends AbstractEventSerializerTest { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceStatusEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceStatusEventSerializerTest.java index e79d637a90b..b3cbe59b701 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceStatusEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceStatusEventSerializerTest.java @@ -8,7 +8,7 @@ import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.RaceLogRaceStatus; import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent; import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogRaceStatusEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogRaceStatusEventSerializer; public class RaceStatusEventSerializerTest extends AbstractEventSerializerTest { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java index 58fd3d5ddbe..e6421bea34d 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/StartTimeEventSerializerTest.java @@ -12,7 +12,7 @@ import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.RaceLogStartTimeEvent; import com.sap.sailing.server.gateway.serialization.JsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogStartTimeEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogStartTimeEventSerializer; public class StartTimeEventSerializerTest extends RaceStatusEventSerializerTest { 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 62966356caa..81e728aa3e3 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,7 +11,8 @@ 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.impl, com.sap.sailing.server.gateway.serialization, + com.sap.sailing.server.gateway.serialization.racelog, com.sap.sailing.server.gateway.serialization.impl, - com.sap.sailing.server.gateway.serialization.impl.coursedata, - com.sap.sailing.server.gateway.serialization.impl.racegroup, - com.sap.sailing.server.gateway.serialization.impl.racelog + com.sap.sailing.server.gateway.serialization.coursedata.impl, + com.sap.sailing.server.gateway.serialization.racegroup.impl, + com.sap.sailing.server.gateway.serialization.racelog.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 index e78d491f310..65688e111ca 100644 --- 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 @@ -9,7 +9,7 @@ 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.impl.racelog.BaseRaceLogEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.BaseRaceLogEventSerializer; /// TODO deserialize involved boats public abstract class BaseRaceLogEventDeserializer implements JsonDeserializer { 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 index 110ca6e1a6a..54161e3c599 100644 --- 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 @@ -10,7 +10,7 @@ import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.impl.RaceLogCourseAreaChangeEventImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogCourseAreaChangedEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogCourseAreaChangedEventSerializer; public class RaceLogCourseAreaChangedEventDeserializer extends BaseRaceLogEventDeserializer { 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 index 1ea15a39543..6c388cb7b75 100644 --- 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 @@ -5,11 +5,11 @@ import org.json.simple.JSONObject; 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.impl.racelog.BaseRaceLogEventSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogCourseAreaChangedEventSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogFlagEventSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogRaceStatusEventSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogStartTimeEventSerializer; +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.RaceLogFlagEventSerializer; +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 { 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 index 096dfd06c0c..ac5a14e7479 100644 --- 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 @@ -10,7 +10,7 @@ import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.racelog.Flags; import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.impl.RaceLogFlagEventImpl; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogFlagEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogFlagEventSerializer; public class RaceLogFlagEventDeserializer extends BaseRaceLogEventDeserializer { 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 index 609c5613474..e0019ad3c04 100644 --- 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 @@ -11,7 +11,7 @@ import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.RaceLogRaceStatus; import com.sap.sailing.domain.racelog.impl.RaceLogRaceStatusEventImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogRaceStatusEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogRaceStatusEventSerializer; public class RaceLogRaceStatusEventDeserializer extends BaseRaceLogEventDeserializer { 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 index a5472e3d4ac..1812fcc63c1 100644 --- 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 @@ -10,7 +10,7 @@ import com.sap.sailing.domain.racelog.RaceLogEvent; import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent; import com.sap.sailing.domain.racelog.impl.RaceLogStartTimeEventImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogStartTimeEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogStartTimeEventSerializer; public class RaceLogStartTimeEventDeserializer extends RaceLogRaceStatusEventDeserializer { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/BaseControlPointJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/BaseControlPointJsonSerializer.java similarity index 87% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/BaseControlPointJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/BaseControlPointJsonSerializer.java index 25db8416c71..4cb5130b4de 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/BaseControlPointJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/BaseControlPointJsonSerializer.java @@ -1,24 +1,24 @@ -package com.sap.sailing.server.gateway.serialization.impl.coursedata; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.ControlPoint; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public abstract class BaseControlPointJsonSerializer implements JsonSerializer { - public static final String FIELD_CLASS = "@class"; - public static final String FIELD_NAME = "name"; - - protected abstract String getClassFieldValue(); - - @Override - public JSONObject serialize(ControlPoint object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_CLASS, getClassFieldValue()); - result.put(FIELD_NAME, object.getName()); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.coursedata.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.ControlPoint; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public abstract class BaseControlPointJsonSerializer implements JsonSerializer { + public static final String FIELD_CLASS = "@class"; + public static final String FIELD_NAME = "name"; + + protected abstract String getClassFieldValue(); + + @Override + public JSONObject serialize(ControlPoint object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_CLASS, getClassFieldValue()); + result.put(FIELD_NAME, object.getName()); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/ControlPointJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/ControlPointJsonSerializer.java similarity index 92% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/ControlPointJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/ControlPointJsonSerializer.java index 15133da4718..98ac200890b 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/ControlPointJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/ControlPointJsonSerializer.java @@ -1,40 +1,40 @@ -package com.sap.sailing.server.gateway.serialization.impl.coursedata; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.ControlPoint; -import com.sap.sailing.domain.base.Gate; -import com.sap.sailing.domain.base.Mark; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class ControlPointJsonSerializer implements JsonSerializer { - - private JsonSerializer markSerializer; - private JsonSerializer gateSerializer; - - public ControlPointJsonSerializer( - JsonSerializer markSerializer, - JsonSerializer gateSerializer) { - this.markSerializer = markSerializer; - this.gateSerializer = gateSerializer; - } - - protected JsonSerializer getSerializer( - ControlPoint controlPoint) { - if (controlPoint instanceof Mark) { - return markSerializer; - } else if (controlPoint instanceof Gate) { - return gateSerializer; - } - - throw new UnsupportedOperationException(String.format( - "There is no serializer defined for control point type %s", controlPoint - .getClass().getName())); - } - - @Override - public JSONObject serialize(ControlPoint object) { - return getSerializer(object).serialize(object); - } - -} +package com.sap.sailing.server.gateway.serialization.coursedata.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.ControlPoint; +import com.sap.sailing.domain.base.Gate; +import com.sap.sailing.domain.base.Mark; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class ControlPointJsonSerializer implements JsonSerializer { + + private JsonSerializer markSerializer; + private JsonSerializer gateSerializer; + + public ControlPointJsonSerializer( + JsonSerializer markSerializer, + JsonSerializer gateSerializer) { + this.markSerializer = markSerializer; + this.gateSerializer = gateSerializer; + } + + protected JsonSerializer getSerializer( + ControlPoint controlPoint) { + if (controlPoint instanceof Mark) { + return markSerializer; + } else if (controlPoint instanceof Gate) { + return gateSerializer; + } + + throw new UnsupportedOperationException(String.format( + "There is no serializer defined for control point type %s", controlPoint + .getClass().getName())); + } + + @Override + public JSONObject serialize(ControlPoint object) { + return getSerializer(object).serialize(object); + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseDataJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/CourseDataJsonSerializer.java similarity index 90% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseDataJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/CourseDataJsonSerializer.java index a7c4c68e402..bd11cad3aeb 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseDataJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/CourseDataJsonSerializer.java @@ -1,35 +1,35 @@ -package com.sap.sailing.server.gateway.serialization.impl.coursedata; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.CourseData; -import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class CourseDataJsonSerializer implements JsonSerializer { - public static final String FIELD_NAME = "name"; - public static final String FIELD_WAYPOINTS = "waypoints"; - - private final JsonSerializer waypointSerializer; - - public CourseDataJsonSerializer(JsonSerializer waypointSerializer) { - this.waypointSerializer = waypointSerializer; - } - - @Override - public JSONObject serialize(CourseData object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_NAME, object.getName()); - - JSONArray waypoints = new JSONArray(); - for (Waypoint waypoint : object.getWaypoints()) { - waypoints.add(waypointSerializer.serialize(waypoint)); - } - result.put(FIELD_WAYPOINTS, waypoints); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.coursedata.impl; + +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.CourseData; +import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class CourseDataJsonSerializer implements JsonSerializer { + public static final String FIELD_NAME = "name"; + public static final String FIELD_WAYPOINTS = "waypoints"; + + private final JsonSerializer waypointSerializer; + + public CourseDataJsonSerializer(JsonSerializer waypointSerializer) { + this.waypointSerializer = waypointSerializer; + } + + @Override + public JSONObject serialize(CourseData object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_NAME, object.getName()); + + JSONArray waypoints = new JSONArray(); + for (Waypoint waypoint : object.getWaypoints()) { + waypoints.add(waypointSerializer.serialize(waypoint)); + } + result.put(FIELD_WAYPOINTS, waypoints); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/GateJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/GateJsonSerializer.java similarity index 91% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/GateJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/GateJsonSerializer.java index f84ba11cb9a..54d2237c767 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/GateJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/GateJsonSerializer.java @@ -1,37 +1,37 @@ -package com.sap.sailing.server.gateway.serialization.impl.coursedata; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.ControlPoint; -import com.sap.sailing.domain.base.Gate; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class GateJsonSerializer extends BaseControlPointJsonSerializer implements JsonSerializer { - public static final String VALUE_CLASS = Gate.class.getSimpleName(); - - public static final String FIELD_LEFT = "left"; - public static final String FIELD_RIGHT = "right"; - - private final JsonSerializer markSerializer; - - public GateJsonSerializer(JsonSerializer markSerializer) { - this.markSerializer = markSerializer; - } - - @Override - protected String getClassFieldValue() { - return VALUE_CLASS; - } - - @Override - public JSONObject serialize(ControlPoint object) { - Gate gate = (Gate) object; - JSONObject result = super.serialize(gate); - - result.put(FIELD_LEFT, markSerializer.serialize(gate.getLeft())); - result.put(FIELD_RIGHT, markSerializer.serialize(gate.getRight())); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.coursedata.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.ControlPoint; +import com.sap.sailing.domain.base.Gate; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class GateJsonSerializer extends BaseControlPointJsonSerializer implements JsonSerializer { + public static final String VALUE_CLASS = Gate.class.getSimpleName(); + + public static final String FIELD_LEFT = "left"; + public static final String FIELD_RIGHT = "right"; + + private final JsonSerializer markSerializer; + + public GateJsonSerializer(JsonSerializer markSerializer) { + this.markSerializer = markSerializer; + } + + @Override + protected String getClassFieldValue() { + return VALUE_CLASS; + } + + @Override + public JSONObject serialize(ControlPoint object) { + Gate gate = (Gate) object; + JSONObject result = super.serialize(gate); + + result.put(FIELD_LEFT, markSerializer.serialize(gate.getLeft())); + result.put(FIELD_RIGHT, markSerializer.serialize(gate.getRight())); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/MarkJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/MarkJsonSerializer.java similarity index 92% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/MarkJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/MarkJsonSerializer.java index a9bbbc2f433..16f2e0beb2c 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/MarkJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/MarkJsonSerializer.java @@ -1,45 +1,45 @@ -package com.sap.sailing.server.gateway.serialization.impl.coursedata; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.ControlPoint; -import com.sap.sailing.domain.base.Mark; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class MarkJsonSerializer extends BaseControlPointJsonSerializer implements JsonSerializer { - public static final String VALUE_CLASS = Mark.class.getSimpleName(); - - public static final String FIELD_ID = "id"; - public static final String FIELD_COLOR = "color"; - public static final String FIELD_PATTERN = "pattern"; - public static final String FIELD_SHAPE = "shape"; - public static final String FIELD_TYPE = "type"; - - @Override - protected String getClassFieldValue() { - return VALUE_CLASS; - } - - @Override - public JSONObject serialize(ControlPoint object) { - Mark mark = (Mark) object; - JSONObject result = super.serialize(mark); - - result.put(FIELD_ID, mark.getId().toString()); - if (mark.getColor() != null) { - result.put(FIELD_COLOR, mark.getColor()); - } - if (mark.getPattern() != null) { - result.put(FIELD_PATTERN, mark.getPattern()); - } - if (mark.getShape() != null) { - result.put(FIELD_SHAPE, mark.getShape()); - } - if (mark.getType() != null) { - result.put(FIELD_TYPE, mark.getType()); - } - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.coursedata.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.ControlPoint; +import com.sap.sailing.domain.base.Mark; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class MarkJsonSerializer extends BaseControlPointJsonSerializer implements JsonSerializer { + public static final String VALUE_CLASS = Mark.class.getSimpleName(); + + public static final String FIELD_ID = "id"; + public static final String FIELD_COLOR = "color"; + public static final String FIELD_PATTERN = "pattern"; + public static final String FIELD_SHAPE = "shape"; + public static final String FIELD_TYPE = "type"; + + @Override + protected String getClassFieldValue() { + return VALUE_CLASS; + } + + @Override + public JSONObject serialize(ControlPoint object) { + Mark mark = (Mark) object; + JSONObject result = super.serialize(mark); + + result.put(FIELD_ID, mark.getId().toString()); + if (mark.getColor() != null) { + result.put(FIELD_COLOR, mark.getColor()); + } + if (mark.getPattern() != null) { + result.put(FIELD_PATTERN, mark.getPattern()); + } + if (mark.getShape() != null) { + result.put(FIELD_SHAPE, mark.getShape()); + } + if (mark.getType() != null) { + result.put(FIELD_TYPE, mark.getType()); + } + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/WaypointJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/WaypointJsonSerializer.java similarity index 92% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/WaypointJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/WaypointJsonSerializer.java index f2af8fb34ce..9971ee62649 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/WaypointJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/WaypointJsonSerializer.java @@ -1,36 +1,36 @@ -package com.sap.sailing.server.gateway.serialization.impl.coursedata; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.ControlPoint; -import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class WaypointJsonSerializer implements JsonSerializer { - public static final String FIELD_ID = "id"; - public static final String FIELD_NAME = "name"; - public static final String FIELD_PASSING_SIDE = "passingSide"; - public static final String FIELD_CONTROL_POINT = "controlPoint"; - - private final JsonSerializer controlPointSerializer; - - public WaypointJsonSerializer(JsonSerializer controlPointSerializer) { - this.controlPointSerializer = controlPointSerializer; - } - - @Override - public JSONObject serialize(Waypoint object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_ID, object.getId().toString()); - result.put(FIELD_NAME, object.getName()); - if (object.getPassingSide() != null) { - result.put(FIELD_PASSING_SIDE, object.getPassingSide()); - } - result.put(FIELD_CONTROL_POINT, - controlPointSerializer.serialize(object.getControlPoint())); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.coursedata.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.ControlPoint; +import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class WaypointJsonSerializer implements JsonSerializer { + public static final String FIELD_ID = "id"; + public static final String FIELD_NAME = "name"; + public static final String FIELD_PASSING_SIDE = "passingSide"; + public static final String FIELD_CONTROL_POINT = "controlPoint"; + + private final JsonSerializer controlPointSerializer; + + public WaypointJsonSerializer(JsonSerializer controlPointSerializer) { + this.controlPointSerializer = controlPointSerializer; + } + + @Override + public JSONObject serialize(Waypoint object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_ID, object.getId().toString()); + result.put(FIELD_NAME, object.getName()); + if (object.getPassingSide() != null) { + result.put(FIELD_PASSING_SIDE, object.getPassingSide()); + } + result.put(FIELD_CONTROL_POINT, + controlPointSerializer.serialize(object.getControlPoint())); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/FleetJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/FleetJsonSerializer.java similarity index 90% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/FleetJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/FleetJsonSerializer.java index 28e5809b00d..0c4d936d41d 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/FleetJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/FleetJsonSerializer.java @@ -1,34 +1,34 @@ -package com.sap.sailing.server.gateway.serialization.impl.racegroup; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Fleet; -import com.sap.sailing.domain.common.Color; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class FleetJsonSerializer implements JsonSerializer { - public static final String FIELD_NAME = "name"; - public static final String FIELD_ORDERING = "ordering"; - public static final String FIELD_COLOR = "color"; - - private final JsonSerializer colorSerializer; - - public FleetJsonSerializer(JsonSerializer colorSerializer) { - this.colorSerializer = colorSerializer; - } - - @Override - public JSONObject serialize(Fleet object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_NAME, object.getName()); - result.put(FIELD_ORDERING, object.getOrdering()); - if (object.getColor() != null) { - result.put(FIELD_COLOR, colorSerializer.serialize(object.getColor())); - } - - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racegroup.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Fleet; +import com.sap.sailing.domain.common.Color; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class FleetJsonSerializer implements JsonSerializer { + public static final String FIELD_NAME = "name"; + public static final String FIELD_ORDERING = "ordering"; + public static final String FIELD_COLOR = "color"; + + private final JsonSerializer colorSerializer; + + public FleetJsonSerializer(JsonSerializer colorSerializer) { + this.colorSerializer = colorSerializer; + } + + @Override + public JSONObject serialize(Fleet object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_NAME, object.getName()); + result.put(FIELD_ORDERING, object.getOrdering()); + if (object.getColor() != null) { + result.put(FIELD_COLOR, colorSerializer.serialize(object.getColor())); + } + + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceCellJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceCellJsonSerializer.java similarity index 89% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceCellJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceCellJsonSerializer.java index ef979d3d15d..1738c81181c 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceCellJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceCellJsonSerializer.java @@ -1,29 +1,29 @@ -package com.sap.sailing.server.gateway.serialization.impl.racegroup; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.racegroup.RaceCell; -import com.sap.sailing.domain.racelog.RaceLog; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceCellJsonSerializer implements JsonSerializer { - public static final String FIELD_NAME = "name"; - public static final String FIELD_RACE_LOG = "raceLog"; - - private JsonSerializer logSerializer; - - public RaceCellJsonSerializer(JsonSerializer logSerializer) { - this.logSerializer = logSerializer; - } - - @Override - public JSONObject serialize(RaceCell object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_NAME, object.getName()); - result.put(FIELD_RACE_LOG, logSerializer.serialize(object.getRaceLog())); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racegroup.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.racegroup.RaceCell; +import com.sap.sailing.domain.racelog.RaceLog; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceCellJsonSerializer implements JsonSerializer { + public static final String FIELD_NAME = "name"; + public static final String FIELD_RACE_LOG = "raceLog"; + + private JsonSerializer logSerializer; + + public RaceCellJsonSerializer(JsonSerializer logSerializer) { + this.logSerializer = logSerializer; + } + + @Override + public JSONObject serialize(RaceCell object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_NAME, object.getName()); + result.put(FIELD_RACE_LOG, logSerializer.serialize(object.getRaceLog())); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceGroupJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceGroupJsonSerializer.java similarity index 93% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceGroupJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceGroupJsonSerializer.java index 15d45dba2ea..3e09e698ed3 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceGroupJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceGroupJsonSerializer.java @@ -1,47 +1,47 @@ -package com.sap.sailing.server.gateway.serialization.impl.racegroup; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.base.CourseArea; -import com.sap.sailing.domain.base.racegroup.RaceGroup; -import com.sap.sailing.server.gateway.serialization.ExtendableJsonSerializer; -import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceGroupJsonSerializer extends ExtendableJsonSerializer { - public static final String FIELD_NAME = "name"; - public static final String FIELD_COURSE_AREA = "courseArea"; - public static final String FIELD_BOAT_CLASS = "boatClass"; - - private JsonSerializer boatClassSerializer; - private JsonSerializer courseAreaSerializer; - - public RaceGroupJsonSerializer( - JsonSerializer boatClassSerializer, - JsonSerializer courseAreaSerializer, - ExtensionJsonSerializer extensionSerializer) { - super(extensionSerializer); - this.courseAreaSerializer = courseAreaSerializer; - this.boatClassSerializer = boatClassSerializer; - } - - @Override - protected JSONObject serializeFields(RaceGroup object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_NAME, object.getName()); - - if (object.getDefaultCourseArea() != null) { - result.put(FIELD_COURSE_AREA, courseAreaSerializer.serialize(object.getDefaultCourseArea())); - } - - if (object.getBoatClass() != null) { - result.put(FIELD_BOAT_CLASS, boatClassSerializer.serialize(object.getBoatClass())); - } - - return result; - } - - -} +package com.sap.sailing.server.gateway.serialization.racegroup.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.BoatClass; +import com.sap.sailing.domain.base.CourseArea; +import com.sap.sailing.domain.base.racegroup.RaceGroup; +import com.sap.sailing.server.gateway.serialization.ExtendableJsonSerializer; +import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceGroupJsonSerializer extends ExtendableJsonSerializer { + public static final String FIELD_NAME = "name"; + public static final String FIELD_COURSE_AREA = "courseArea"; + public static final String FIELD_BOAT_CLASS = "boatClass"; + + private JsonSerializer boatClassSerializer; + private JsonSerializer courseAreaSerializer; + + public RaceGroupJsonSerializer( + JsonSerializer boatClassSerializer, + JsonSerializer courseAreaSerializer, + ExtensionJsonSerializer extensionSerializer) { + super(extensionSerializer); + this.courseAreaSerializer = courseAreaSerializer; + this.boatClassSerializer = boatClassSerializer; + } + + @Override + protected JSONObject serializeFields(RaceGroup object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_NAME, object.getName()); + + if (object.getDefaultCourseArea() != null) { + result.put(FIELD_COURSE_AREA, courseAreaSerializer.serialize(object.getDefaultCourseArea())); + } + + if (object.getBoatClass() != null) { + result.put(FIELD_BOAT_CLASS, boatClassSerializer.serialize(object.getBoatClass())); + } + + return result; + } + + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceRowJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceRowJsonSerializer.java similarity index 92% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceRowJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceRowJsonSerializer.java index e54cb8eb425..2a816400d01 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceRowJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceRowJsonSerializer.java @@ -1,39 +1,39 @@ -package com.sap.sailing.server.gateway.serialization.impl.racegroup; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Fleet; -import com.sap.sailing.domain.base.racegroup.RaceCell; -import com.sap.sailing.domain.base.racegroup.RaceRow; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceRowJsonSerializer implements JsonSerializer { - public static final String FIELD_FLEET = "fleet"; - public static final String FIELD_RACE_CELLS = "races"; - - private JsonSerializer fleetSerializer; - private JsonSerializer cellSerializer; - - public RaceRowJsonSerializer( - JsonSerializer fleetSerializer, - JsonSerializer cellSerializer) { - this.fleetSerializer = fleetSerializer; - this.cellSerializer = cellSerializer; - } - - @Override - public JSONObject serialize(RaceRow object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_FLEET, fleetSerializer.serialize(object.getFleet())); - JSONArray cells = new JSONArray(); - for (RaceCell cell : object.getCells()) { - cells.add(cellSerializer.serialize(cell)); - } - result.put(FIELD_RACE_CELLS, cells); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racegroup.impl; + +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Fleet; +import com.sap.sailing.domain.base.racegroup.RaceCell; +import com.sap.sailing.domain.base.racegroup.RaceRow; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceRowJsonSerializer implements JsonSerializer { + public static final String FIELD_FLEET = "fleet"; + public static final String FIELD_RACE_CELLS = "races"; + + private JsonSerializer fleetSerializer; + private JsonSerializer cellSerializer; + + public RaceRowJsonSerializer( + JsonSerializer fleetSerializer, + JsonSerializer cellSerializer) { + this.fleetSerializer = fleetSerializer; + this.cellSerializer = cellSerializer; + } + + @Override + public JSONObject serialize(RaceRow object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_FLEET, fleetSerializer.serialize(object.getFleet())); + JSONArray cells = new JSONArray(); + for (RaceCell cell : object.getCells()) { + cells.add(cellSerializer.serialize(cell)); + } + result.put(FIELD_RACE_CELLS, cells); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceRowsOfSeriesWithRowsSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceRowsOfSeriesWithRowsSerializer.java similarity index 90% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceRowsOfSeriesWithRowsSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceRowsOfSeriesWithRowsSerializer.java index 8fd47aea268..80d9628f1ed 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/RaceRowsOfSeriesWithRowsSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/RaceRowsOfSeriesWithRowsSerializer.java @@ -1,31 +1,31 @@ -package com.sap.sailing.server.gateway.serialization.impl.racegroup; - -import org.json.simple.JSONArray; - -import com.sap.sailing.domain.base.racegroup.RaceRow; -import com.sap.sailing.domain.base.racegroup.SeriesWithRows; -import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceRowsOfSeriesWithRowsSerializer extends ExtensionJsonSerializer { - public static final String FIELD_FLEETS = "fleets"; - - public RaceRowsOfSeriesWithRowsSerializer(JsonSerializer extensionSerializer) { - super(extensionSerializer); - } - - @Override - public String getExtensionFieldName() { - return FIELD_FLEETS; - } - - @Override - public Object serializeExtension(SeriesWithRows parent) { - JSONArray result = new JSONArray(); - for (RaceRow row : parent.getRaceRows()) { - result.add(serialize(row)); - } - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racegroup.impl; + +import org.json.simple.JSONArray; + +import com.sap.sailing.domain.base.racegroup.RaceRow; +import com.sap.sailing.domain.base.racegroup.SeriesWithRows; +import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceRowsOfSeriesWithRowsSerializer extends ExtensionJsonSerializer { + public static final String FIELD_FLEETS = "fleets"; + + public RaceRowsOfSeriesWithRowsSerializer(JsonSerializer extensionSerializer) { + super(extensionSerializer); + } + + @Override + public String getExtensionFieldName() { + return FIELD_FLEETS; + } + + @Override + public Object serializeExtension(SeriesWithRows parent) { + JSONArray result = new JSONArray(); + for (RaceRow row : parent.getRaceRows()) { + result.add(serialize(row)); + } + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/SeriesWithRowsJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/SeriesWithRowsJsonSerializer.java similarity index 90% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/SeriesWithRowsJsonSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/SeriesWithRowsJsonSerializer.java index a51f7500d97..1c964eaccf8 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/SeriesWithRowsJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/SeriesWithRowsJsonSerializer.java @@ -1,27 +1,27 @@ -package com.sap.sailing.server.gateway.serialization.impl.racegroup; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.racegroup.SeriesWithRows; -import com.sap.sailing.server.gateway.serialization.ExtendableJsonSerializer; -import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; - -public class SeriesWithRowsJsonSerializer extends ExtendableJsonSerializer { - public static final String FIELD_NAME = "name"; - public static final String FIELD_IS_MEDAL = "isMedal"; - - public SeriesWithRowsJsonSerializer(ExtensionJsonSerializer extensionSerializer) { - super(extensionSerializer); - } - - @Override - protected JSONObject serializeFields(SeriesWithRows object) { - JSONObject result = new JSONObject(); - - result.put(FIELD_NAME, object.getName()); - result.put(FIELD_IS_MEDAL, object.isMedal()); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racegroup.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.racegroup.SeriesWithRows; +import com.sap.sailing.server.gateway.serialization.ExtendableJsonSerializer; +import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; + +public class SeriesWithRowsJsonSerializer extends ExtendableJsonSerializer { + public static final String FIELD_NAME = "name"; + public static final String FIELD_IS_MEDAL = "isMedal"; + + public SeriesWithRowsJsonSerializer(ExtensionJsonSerializer extensionSerializer) { + super(extensionSerializer); + } + + @Override + protected JSONObject serializeFields(SeriesWithRows object) { + JSONObject result = new JSONObject(); + + result.put(FIELD_NAME, object.getName()); + result.put(FIELD_IS_MEDAL, object.isMedal()); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/SeriesWithRowsOfRaceGroupSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/SeriesWithRowsOfRaceGroupSerializer.java similarity index 90% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/SeriesWithRowsOfRaceGroupSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/SeriesWithRowsOfRaceGroupSerializer.java index 4c05bd2ce42..f479a33a64f 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racegroup/SeriesWithRowsOfRaceGroupSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racegroup/impl/SeriesWithRowsOfRaceGroupSerializer.java @@ -1,32 +1,32 @@ -package com.sap.sailing.server.gateway.serialization.impl.racegroup; - -import org.json.simple.JSONArray; - -import com.sap.sailing.domain.base.racegroup.RaceGroup; -import com.sap.sailing.domain.base.racegroup.SeriesWithRows; -import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class SeriesWithRowsOfRaceGroupSerializer extends ExtensionJsonSerializer { - public static final String FIELD_SERIES = "series"; - - - public SeriesWithRowsOfRaceGroupSerializer(JsonSerializer extensionSerializer) { - super(extensionSerializer); - } - - @Override - public String getExtensionFieldName() { - return FIELD_SERIES; - } - - @Override - public Object serializeExtension(RaceGroup parent) { - JSONArray result = new JSONArray(); - for (SeriesWithRows series : parent.getSeries()) { - result.add(serialize(series)); - } - - return result; - } -} +package com.sap.sailing.server.gateway.serialization.racegroup.impl; + +import org.json.simple.JSONArray; + +import com.sap.sailing.domain.base.racegroup.RaceGroup; +import com.sap.sailing.domain.base.racegroup.SeriesWithRows; +import com.sap.sailing.server.gateway.serialization.ExtensionJsonSerializer; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class SeriesWithRowsOfRaceGroupSerializer extends ExtensionJsonSerializer { + public static final String FIELD_SERIES = "series"; + + + public SeriesWithRowsOfRaceGroupSerializer(JsonSerializer extensionSerializer) { + super(extensionSerializer); + } + + @Override + public String getExtensionFieldName() { + return FIELD_SERIES; + } + + @Override + public Object serializeExtension(RaceGroup parent) { + JSONArray result = new JSONArray(); + for (SeriesWithRows series : parent.getSeries()) { + result.add(serialize(series)); + } + + return result; + } +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/RaceLogEventSerializerChooser.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/RaceLogEventSerializerChooser.java new file mode 100644 index 00000000000..36a680c8104 --- /dev/null +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/RaceLogEventSerializerChooser.java @@ -0,0 +1,8 @@ +package com.sap.sailing.server.gateway.serialization.racelog; + +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public interface RaceLogEventSerializerChooser { + JsonSerializer getSerializer(RaceLogEvent event); +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/BaseRaceLogEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/BaseRaceLogEventSerializer.java similarity index 93% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/BaseRaceLogEventSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/BaseRaceLogEventSerializer.java index 5651b04d6e9..2f96d42b15a 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/BaseRaceLogEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/BaseRaceLogEventSerializer.java @@ -1,42 +1,42 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public abstract class BaseRaceLogEventSerializer implements JsonSerializer { - public static final String FIELD_CLASS = "@class"; - public static final String FIELD_ID = "id"; - public static final String FIELD_TIMESTAMP = "timestamp"; - public static final String FIELD_PASS_ID = "passId"; - public static final String FIELD_COMPETITORS = "competitors"; - - protected abstract String getClassFieldValue(); - - protected JsonSerializer competitorSerializer; - - public BaseRaceLogEventSerializer(JsonSerializer competitorSerializer) { - this.competitorSerializer = competitorSerializer; - } - - @Override - public JSONObject serialize(RaceLogEvent object) { - JSONObject result = new JSONObject(); - result.put(FIELD_CLASS, getClassFieldValue()); - result.put(FIELD_ID, object.getId().toString()); - result.put(FIELD_TIMESTAMP, object.getTimePoint().asMillis()); - result.put(FIELD_PASS_ID, object.getPassId()); - - JSONArray competitors = new JSONArray(); - for (Competitor competitor : object.getInvolvedBoats()) { - competitors.add(competitorSerializer.serialize(competitor)); - } - result.put(FIELD_COMPETITORS, competitors); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racelog.impl; + +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public abstract class BaseRaceLogEventSerializer implements JsonSerializer { + public static final String FIELD_CLASS = "@class"; + public static final String FIELD_ID = "id"; + public static final String FIELD_TIMESTAMP = "timestamp"; + public static final String FIELD_PASS_ID = "passId"; + public static final String FIELD_COMPETITORS = "competitors"; + + protected abstract String getClassFieldValue(); + + protected JsonSerializer competitorSerializer; + + public BaseRaceLogEventSerializer(JsonSerializer competitorSerializer) { + this.competitorSerializer = competitorSerializer; + } + + @Override + public JSONObject serialize(RaceLogEvent object) { + JSONObject result = new JSONObject(); + result.put(FIELD_CLASS, getClassFieldValue()); + result.put(FIELD_ID, object.getId().toString()); + result.put(FIELD_TIMESTAMP, object.getTimePoint().asMillis()); + result.put(FIELD_PASS_ID, object.getPassId()); + + JSONArray competitors = new JSONArray(); + for (Competitor competitor : object.getInvolvedBoats()) { + competitors.add(competitorSerializer.serialize(competitor)); + } + result.put(FIELD_COMPETITORS, competitors); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogCourseAreaChangedEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCourseAreaChangedEventSerializer.java similarity index 91% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogCourseAreaChangedEventSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCourseAreaChangedEventSerializer.java index ca7ca0dafa4..0a45c23d047 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogCourseAreaChangedEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogCourseAreaChangedEventSerializer.java @@ -1,35 +1,35 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.racelog.RaceLogCourseAreaChangedEvent; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceLogCourseAreaChangedEventSerializer extends BaseRaceLogEventSerializer { - - public static final String VALUE_CLASS = RaceLogCourseAreaChangedEvent.class.getSimpleName(); - public static final String FIELD_COURSE_AREA_ID = "courseAreaId"; - - public RaceLogCourseAreaChangedEventSerializer( - JsonSerializer competitorSerializer) { - super(competitorSerializer); - } - - @Override - protected String getClassFieldValue() { - return VALUE_CLASS; - } - - @Override - public JSONObject serialize(RaceLogEvent object) { - RaceLogCourseAreaChangedEvent caChangedEvent = (RaceLogCourseAreaChangedEvent) object; - - JSONObject result = super.serialize(caChangedEvent); - result.put(FIELD_COURSE_AREA_ID, caChangedEvent.getCourseAreaId().toString()); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racelog.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelog.RaceLogCourseAreaChangedEvent; +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceLogCourseAreaChangedEventSerializer extends BaseRaceLogEventSerializer { + + public static final String VALUE_CLASS = RaceLogCourseAreaChangedEvent.class.getSimpleName(); + public static final String FIELD_COURSE_AREA_ID = "courseAreaId"; + + public RaceLogCourseAreaChangedEventSerializer( + JsonSerializer competitorSerializer) { + super(competitorSerializer); + } + + @Override + protected String getClassFieldValue() { + return VALUE_CLASS; + } + + @Override + public JSONObject serialize(RaceLogEvent object) { + RaceLogCourseAreaChangedEvent caChangedEvent = (RaceLogCourseAreaChangedEvent) object; + + JSONObject result = super.serialize(caChangedEvent); + result.put(FIELD_COURSE_AREA_ID, caChangedEvent.getCourseAreaId().toString()); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java similarity index 81% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogEventSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java index 1357951899f..6021f22bf94 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java @@ -1,34 +1,36 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceLogEventSerializer implements JsonSerializer { - - public static JsonSerializer create(JsonSerializer competitorSerializer) { - return new RaceLogEventSerializer(new RaceLogEventSerializerChooser( - new RaceLogFlagEventSerializer(competitorSerializer), - new RaceLogStartTimeEventSerializer(competitorSerializer), - new RaceLogRaceStatusEventSerializer(competitorSerializer), - new RaceLogCourseAreaChangedEventSerializer(competitorSerializer))); - } - - private RaceLogEventSerializerChooser serializerChooser; - - public RaceLogEventSerializer(RaceLogEventSerializerChooser serializerChooser) { - this.serializerChooser = serializerChooser; - } - - protected JsonSerializer getSerializer(RaceLogEvent event) { - return serializerChooser.getSerializer(event); - } - - @Override - public JSONObject serialize(RaceLogEvent object) { - return getSerializer(object).serialize(object); - } - -} +package com.sap.sailing.server.gateway.serialization.racelog.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.RaceLogEventSerializerChooser; + +public class RaceLogEventSerializer implements JsonSerializer { + + public static JsonSerializer create(JsonSerializer competitorSerializer) { + return new RaceLogEventSerializer(new RaceLogEventSerializerChooserImpl( + new RaceLogFlagEventSerializer(competitorSerializer), + new RaceLogStartTimeEventSerializer(competitorSerializer), + new RaceLogRaceStatusEventSerializer(competitorSerializer), + new RaceLogCourseAreaChangedEventSerializer(competitorSerializer), + new RaceLogPassChangeEventSerializer(competitorSerializer))); + } + + private RaceLogEventSerializerChooser serializerChooser; + + public RaceLogEventSerializer(RaceLogEventSerializerChooser serializerChooser) { + this.serializerChooser = serializerChooser; + } + + protected JsonSerializer getSerializer(RaceLogEvent event) { + return serializerChooser.getSerializer(event); + } + + @Override + public JSONObject serialize(RaceLogEvent object) { + return getSerializer(object).serialize(object); + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogEventSerializerChooser.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializerChooserImpl.java similarity index 79% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogEventSerializerChooser.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializerChooserImpl.java index 787c802f092..1aad7035935 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogEventSerializerChooser.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializerChooserImpl.java @@ -1,70 +1,75 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; - -import com.sap.sailing.domain.racelog.RaceLogCourseAreaChangedEvent; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.domain.racelog.RaceLogEventVisitor; -import com.sap.sailing.domain.racelog.RaceLogFlagEvent; -import com.sap.sailing.domain.racelog.RaceLogPassChangeEvent; -import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent; -import com.sap.sailing.domain.racelog.RaceLogStartTimeEvent; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceLogEventSerializerChooser implements RaceLogEventVisitor { - - private final JsonSerializer flagEventSerializer; - private final JsonSerializer startTimeSerializer; - private final JsonSerializer raceStatusSerializer; - private final JsonSerializer courseAreaChangedEventSerializer; - - private JsonSerializer chosenSerializer; - - public RaceLogEventSerializerChooser( - JsonSerializer flagEventSerializer, - JsonSerializer startTimeSerializer, - JsonSerializer raceStatusSerializer, - JsonSerializer courseAreaChangedEventSerializer) { - this.flagEventSerializer = flagEventSerializer; - this.startTimeSerializer = startTimeSerializer; - this.raceStatusSerializer = raceStatusSerializer; - this.courseAreaChangedEventSerializer = courseAreaChangedEventSerializer; - - this.chosenSerializer = null; - } - - public JsonSerializer getSerializer(RaceLogEvent event) { - chosenSerializer = null; - event.accept(this); - if (chosenSerializer == null) { - throw new UnsupportedOperationException( - String.format("There is no serializer for event type %s", - event.getClass().getName())); - } - return chosenSerializer; - } - - @Override - public void visit(RaceLogFlagEvent event) { - chosenSerializer = flagEventSerializer; - } - - @Override - public void visit(RaceLogPassChangeEvent event) { - chosenSerializer = null; - } - - @Override - public void visit(RaceLogRaceStatusEvent event) { - chosenSerializer = raceStatusSerializer; - } - - @Override - public void visit(RaceLogStartTimeEvent event) { - chosenSerializer = startTimeSerializer; - } - - @Override - public void visit(RaceLogCourseAreaChangedEvent event) { - chosenSerializer = courseAreaChangedEventSerializer; - } - -} +package com.sap.sailing.server.gateway.serialization.racelog.impl; + +import com.sap.sailing.domain.racelog.RaceLogCourseAreaChangedEvent; +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.domain.racelog.RaceLogEventVisitor; +import com.sap.sailing.domain.racelog.RaceLogFlagEvent; +import com.sap.sailing.domain.racelog.RaceLogPassChangeEvent; +import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent; +import com.sap.sailing.domain.racelog.RaceLogStartTimeEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.RaceLogEventSerializerChooser; + +public class RaceLogEventSerializerChooserImpl implements RaceLogEventSerializerChooser, RaceLogEventVisitor { + + private final JsonSerializer flagEventSerializer; + private final JsonSerializer startTimeSerializer; + private final JsonSerializer raceStatusSerializer; + private final JsonSerializer courseAreaChangedEventSerializer; + private final JsonSerializer passChangedEventSerializer; + + private JsonSerializer chosenSerializer; + + public RaceLogEventSerializerChooserImpl( + JsonSerializer flagEventSerializer, + JsonSerializer startTimeSerializer, + JsonSerializer raceStatusSerializer, + JsonSerializer courseAreaChangedEventSerializer, + JsonSerializer passChangedEventSerializer) { + this.flagEventSerializer = flagEventSerializer; + this.startTimeSerializer = startTimeSerializer; + this.raceStatusSerializer = raceStatusSerializer; + this.courseAreaChangedEventSerializer = courseAreaChangedEventSerializer; + this.passChangedEventSerializer = passChangedEventSerializer; + + this.chosenSerializer = null; + } + + @Override + public JsonSerializer getSerializer(RaceLogEvent event) { + chosenSerializer = null; + event.accept(this); + if (chosenSerializer == null) { + throw new UnsupportedOperationException( + String.format("There is no serializer for event type %s", + event.getClass().getName())); + } + return chosenSerializer; + } + + @Override + public void visit(RaceLogFlagEvent event) { + chosenSerializer = flagEventSerializer; + } + + @Override + public void visit(RaceLogPassChangeEvent event) { + chosenSerializer = passChangedEventSerializer; + } + + @Override + public void visit(RaceLogRaceStatusEvent event) { + chosenSerializer = raceStatusSerializer; + } + + @Override + public void visit(RaceLogStartTimeEvent event) { + chosenSerializer = startTimeSerializer; + } + + @Override + public void visit(RaceLogCourseAreaChangedEvent event) { + chosenSerializer = courseAreaChangedEventSerializer; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogFlagEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogFlagEventSerializer.java similarity index 92% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogFlagEventSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogFlagEventSerializer.java index 39baaed9a88..37d956f6f69 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogFlagEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogFlagEventSerializer.java @@ -1,39 +1,39 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.domain.racelog.RaceLogFlagEvent; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceLogFlagEventSerializer extends BaseRaceLogEventSerializer { - - public static final String VALUE_CLASS = RaceLogFlagEvent.class.getSimpleName(); - public static final String FIELD_UPPER_FLAG = "upperFlag"; - public static final String FIELD_LOWER_FLAG = "lowerFlag"; - public static final String FIELD_DISPLAYED = "displayed"; - - public RaceLogFlagEventSerializer( - JsonSerializer competitorSerializer) { - super(competitorSerializer); - } - - @Override - protected String getClassFieldValue() { - return VALUE_CLASS; - } - - @Override - public JSONObject serialize(RaceLogEvent object) { - RaceLogFlagEvent flagEvent = (RaceLogFlagEvent) object; - - JSONObject result = super.serialize(flagEvent); - result.put(FIELD_UPPER_FLAG, flagEvent.getUpperFlag().toString()); - result.put(FIELD_LOWER_FLAG, flagEvent.getLowerFlag().toString()); - result.put(FIELD_DISPLAYED, flagEvent.isDisplayed()); - - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racelog.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.domain.racelog.RaceLogFlagEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceLogFlagEventSerializer extends BaseRaceLogEventSerializer { + + public static final String VALUE_CLASS = RaceLogFlagEvent.class.getSimpleName(); + public static final String FIELD_UPPER_FLAG = "upperFlag"; + public static final String FIELD_LOWER_FLAG = "lowerFlag"; + public static final String FIELD_DISPLAYED = "displayed"; + + public RaceLogFlagEventSerializer( + JsonSerializer competitorSerializer) { + super(competitorSerializer); + } + + @Override + protected String getClassFieldValue() { + return VALUE_CLASS; + } + + @Override + public JSONObject serialize(RaceLogEvent object) { + RaceLogFlagEvent flagEvent = (RaceLogFlagEvent) object; + + JSONObject result = super.serialize(flagEvent); + result.put(FIELD_UPPER_FLAG, flagEvent.getUpperFlag().toString()); + result.put(FIELD_LOWER_FLAG, flagEvent.getLowerFlag().toString()); + result.put(FIELD_DISPLAYED, flagEvent.isDisplayed()); + + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogPassChangeEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogPassChangeEventSerializer.java similarity index 92% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogPassChangeEventSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogPassChangeEventSerializer.java index c0908ca03c2..7d2d371d259 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogPassChangeEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogPassChangeEventSerializer.java @@ -1,4 +1,4 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; +package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONObject; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogRaceStatusEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRaceStatusEventSerializer.java similarity index 91% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogRaceStatusEventSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRaceStatusEventSerializer.java index 918643e4b17..82e960e2af8 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogRaceStatusEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRaceStatusEventSerializer.java @@ -1,32 +1,32 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceLogRaceStatusEventSerializer extends BaseRaceLogEventSerializer { - - public static final String VALUE_CLASS = RaceLogRaceStatusEvent.class.getSimpleName(); - public static final String FIELD_NEXT_STATUS = "nextStatus"; - - public RaceLogRaceStatusEventSerializer(JsonSerializer competitorSerializer) { - super(competitorSerializer); - } - - @Override - protected String getClassFieldValue() { - return VALUE_CLASS; - } - - @Override - public JSONObject serialize(RaceLogEvent object) { - RaceLogRaceStatusEvent event = (RaceLogRaceStatusEvent) object; - JSONObject result = super.serialize(event); - result.put(FIELD_NEXT_STATUS, event.getNextStatus().toString()); - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racelog.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.domain.racelog.RaceLogRaceStatusEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceLogRaceStatusEventSerializer extends BaseRaceLogEventSerializer { + + public static final String VALUE_CLASS = RaceLogRaceStatusEvent.class.getSimpleName(); + public static final String FIELD_NEXT_STATUS = "nextStatus"; + + public RaceLogRaceStatusEventSerializer(JsonSerializer competitorSerializer) { + super(competitorSerializer); + } + + @Override + protected String getClassFieldValue() { + return VALUE_CLASS; + } + + @Override + public JSONObject serialize(RaceLogEvent object) { + RaceLogRaceStatusEvent event = (RaceLogRaceStatusEvent) object; + JSONObject result = super.serialize(event); + result.put(FIELD_NEXT_STATUS, event.getNextStatus().toString()); + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogSerializer.java similarity index 94% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogSerializer.java index 74f911726f1..e8b7852b7e1 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogSerializer.java @@ -1,4 +1,4 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; +package com.sap.sailing.server.gateway.serialization.racelog.impl; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogStartTimeEventSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogStartTimeEventSerializer.java similarity index 91% rename from java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogStartTimeEventSerializer.java rename to java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogStartTimeEventSerializer.java index 2e63e005412..d810931a67e 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/racelog/RaceLogStartTimeEventSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogStartTimeEventSerializer.java @@ -1,34 +1,34 @@ -package com.sap.sailing.server.gateway.serialization.impl.racelog; - -import org.json.simple.JSONObject; - -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.racelog.RaceLogEvent; -import com.sap.sailing.domain.racelog.RaceLogStartTimeEvent; -import com.sap.sailing.server.gateway.serialization.JsonSerializer; - -public class RaceLogStartTimeEventSerializer extends RaceLogRaceStatusEventSerializer { - - public static final String VALUE_CLASS = RaceLogStartTimeEvent.class.getSimpleName(); - public static final String FIELD_START_TIME = "startTime"; - - public RaceLogStartTimeEventSerializer( - JsonSerializer competitorSerializer) { - super(competitorSerializer); - } - - @Override - protected String getClassFieldValue() { - return VALUE_CLASS; - } - - @Override - public JSONObject serialize(RaceLogEvent object) { - RaceLogStartTimeEvent startTimeEvent = (RaceLogStartTimeEvent) object; - - JSONObject result = super.serialize(startTimeEvent); - result.put(FIELD_START_TIME, startTimeEvent.getStartTime().asMillis()); - return result; - } - -} +package com.sap.sailing.server.gateway.serialization.racelog.impl; + +import org.json.simple.JSONObject; + +import com.sap.sailing.domain.base.Competitor; +import com.sap.sailing.domain.racelog.RaceLogEvent; +import com.sap.sailing.domain.racelog.RaceLogStartTimeEvent; +import com.sap.sailing.server.gateway.serialization.JsonSerializer; + +public class RaceLogStartTimeEventSerializer extends RaceLogRaceStatusEventSerializer { + + public static final String VALUE_CLASS = RaceLogStartTimeEvent.class.getSimpleName(); + public static final String FIELD_START_TIME = "startTime"; + + public RaceLogStartTimeEventSerializer( + JsonSerializer competitorSerializer) { + super(competitorSerializer); + } + + @Override + protected String getClassFieldValue() { + return VALUE_CLASS; + } + + @Override + public JSONObject serialize(RaceLogEvent object) { + RaceLogStartTimeEvent startTimeEvent = (RaceLogStartTimeEvent) object; + + JSONObject result = super.serialize(startTimeEvent); + result.put(FIELD_START_TIME, startTimeEvent.getStartTime().asMillis()); + return result; + } + +} diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java index 2a56f0b9cd0..778a46cf9c3 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java @@ -19,15 +19,15 @@ import com.sap.sailing.server.gateway.serialization.impl.BoatClassJsonSerializer import com.sap.sailing.server.gateway.serialization.impl.ColorJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.CompetitorIdJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.CourseAreaJsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.FleetJsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceCellJsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceGroupJsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceRowJsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceRowsOfSeriesWithRowsSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.SeriesWithRowsJsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.SeriesWithRowsOfRaceGroupSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogEventSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.FleetJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceCellJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceGroupJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceRowJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceRowsOfSeriesWithRowsSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.SeriesWithRowsJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.SeriesWithRowsOfRaceGroupSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogEventSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogSerializer; public class RaceGroupJsonExportServlet extends AbstractJsonHttpServlet { private static final long serialVersionUID = 4510175441769759252L; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/FleetDeserializer.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/FleetDeserializer.java index 1c7926ca141..e4f0d27e358 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/FleetDeserializer.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/FleetDeserializer.java @@ -8,7 +8,7 @@ import com.sap.sailing.domain.common.Color; 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; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.FleetJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.FleetJsonSerializer; public class FleetDeserializer implements JsonDeserializer { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceCellDeserializer.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceCellDeserializer.java index 138edd01fd6..854ae5450d4 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceCellDeserializer.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceCellDeserializer.java @@ -8,7 +8,7 @@ import com.sap.sailing.domain.racelog.RaceLog; 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; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceCellJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceCellJsonSerializer; public class RaceCellDeserializer implements JsonDeserializer { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceGroupDeserializer.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceGroupDeserializer.java index 6207005c2a1..5237000c583 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceGroupDeserializer.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceGroupDeserializer.java @@ -13,8 +13,8 @@ import com.sap.sailing.domain.base.racegroup.impl.RaceGroupImpl; 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; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceGroupJsonSerializer; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.SeriesWithRowsOfRaceGroupSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceGroupJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.SeriesWithRowsOfRaceGroupSerializer; public class RaceGroupDeserializer implements JsonDeserializer { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java index b923b26bee5..8fcb3869f1f 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java @@ -9,7 +9,7 @@ import com.sap.sailing.racecommittee.domain.racelog.impl.PassAwareRaceLogImpl; 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; -import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogSerializer; +import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogSerializer; public class RaceLogDeserializer implements JsonDeserializer { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceRowDeserializer.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceRowDeserializer.java index cfcfe953e2f..ff12c144290 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceRowDeserializer.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceRowDeserializer.java @@ -13,7 +13,7 @@ import com.sap.sailing.domain.base.racegroup.impl.RaceRowImpl; 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; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceRowJsonSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceRowJsonSerializer; public class RaceRowDeserializer implements JsonDeserializer { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/SeriesWithRowsDeserializer.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/SeriesWithRowsDeserializer.java index 54c7cb8eb69..4abe12231c7 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/SeriesWithRowsDeserializer.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/SeriesWithRowsDeserializer.java @@ -11,7 +11,7 @@ import com.sap.sailing.domain.base.racegroup.impl.SeriesWithRowsImpl; 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; -import com.sap.sailing.server.gateway.serialization.impl.racegroup.RaceRowsOfSeriesWithRowsSerializer; +import com.sap.sailing.server.gateway.serialization.racegroup.impl.RaceRowsOfSeriesWithRowsSerializer; public class SeriesWithRowsDeserializer implements JsonDeserializer {