eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-02 09:09:37 +00:00
Code Activity

# small fix in SeriesOfRegattaExtensionSerializer

Browse Source 
# moved some code to method local vars
This commit is contained in:
Lukas Niemeier committed 2013-02-05 14:01:12 +01:00
1 parent e2842c4b68
commit c40ca74218
5 files changed
+34 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventTrackJsonExportServlet.java
+9 -16
View File
@@ -29,22 +29,6 @@ import com.sap.sailing.server.gateway.serialization.impl.racelog.RaceLogStartTim
public class EventTrackJsonExportServlet extends JsonExportServlet {
private static final long serialVersionUID = 2197006949440887925L;
/**
* Created in init() - access is thread-safe.
*/
private JsonSerializer<RaceLogEvent> rcEventSerializer;
@Override
public void init() throws ServletException {
super.init();
JsonSerializer<Competitor> competitorSerializer = new CompetitorIdJsonSerializer();
rcEventSerializer = new RaceLogEventSerializer(
new RaceLogFlagEventSerializer(competitorSerializer),
new RaceLogStartTimeEventSerializer(competitorSerializer),
new RaceLogCourseAreaChangedEventSerializer(competitorSerializer));
}
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@@ -61,6 +45,7 @@ public class EventTrackJsonExportServlet extends JsonExportServlet {
}
private JSONArray serizalizeTrack(TrackedRace trackedRace) {
JsonSerializer<RaceLogEvent> rcEventSerializer = createSerializer();
JSONArray result = new JSONArray();
RaceLog track = trackedRace.getRaceLog();
@@ -116,4 +101,12 @@ public class EventTrackJsonExportServlet extends JsonExportServlet {
return true;
}
private static JsonSerializer<RaceLogEvent> createSerializer() {
JsonSerializer<Competitor> competitorSerializer = new CompetitorIdJsonSerializer();
return new RaceLogEventSerializer(
new RaceLogFlagEventSerializer(competitorSerializer),
new RaceLogStartTimeEventSerializer(competitorSerializer),
new RaceLogCourseAreaChangedEventSerializer(competitorSerializer));
}
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventsJsonExportServlet.java
+4 -10
View File
@@ -18,27 +18,21 @@ import com.sap.sailing.server.gateway.serialization.impl.VenueJsonSerializer;
public class EventsJsonExportServlet extends JsonExportServlet {
private static final long serialVersionUID = 4515246650108245796L;
/**
* Created in init() - access is thread-safe.
*/
private JsonSerializer<Event> eventSerializer;
@Override
public void init() throws ServletException {
super.init();
eventSerializer = new EventJsonSerializer(
new VenueJsonSerializer(
new CourseAreaJsonSerializer()));
}
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
JsonSerializer<Event> eventSerializer = new EventJsonSerializer(
new VenueJsonSerializer(
new CourseAreaJsonSerializer()));
JSONArray result = new JSONArray();
for (Event event : getService().getAllEvents())
//for (Event event : exampleEvents())
{
result.add(eventSerializer.serialize(event));
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RegattasJsonExportServlet.java
+15 -15
View File
@@ -91,21 +91,6 @@ public class RegattasJsonExportServlet extends JsonExportServlet {
}
private JsonSerializer<Regatta> createSerializer(Filter<RaceDefinition> raceFilter) {
JsonSerializer<BoatClass> boatClassSerializer = new BoatClassJsonSerializer();
return new RegattaJsonSerializer(
boatClassSerializer,
new SeriesOfRegattaExtensionSerializer(
new SeriesJsonSerializer(
new FleetWithRacesOfSeriesExtensionSerializer(
new FleetWithRacesJsonSerializer(
new FleetJsonSerializer(
new ColorJsonSerializer()),
raceFilter,
new RaceDefinitionJsonSerializer(
boatClassSerializer))))));
}
private Filter<RaceDefinition> createFilter(final String courseAreaId) {
return new Filter<RaceDefinition>() {
@@ -128,5 +113,20 @@ public class RegattasJsonExportServlet extends JsonExportServlet {
}
};
}
private static JsonSerializer<Regatta> createSerializer(Filter<RaceDefinition> raceFilter) {
JsonSerializer<BoatClass> boatClassSerializer = new BoatClassJsonSerializer();
return new RegattaJsonSerializer(
boatClassSerializer,
new SeriesOfRegattaExtensionSerializer(
new SeriesJsonSerializer(
new FleetWithRacesOfSeriesExtensionSerializer(
new FleetWithRacesJsonSerializer(
new FleetJsonSerializer(
new ColorJsonSerializer()),
raceFilter,
new RaceDefinitionJsonSerializer(
boatClassSerializer))))));
}
}