eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 05:05:31 +00:00
Code Activity

# some ignores

Browse Source 
# serialization details moved to final fields
This commit is contained in:
Lukas Niemeier
2013-01-16 17:25:39 +01:00
parent 64d422358a
commit c24d19e284
11 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -10,3 +10,4 @@ sailing_debug0*
/mobile\com.sap.sailing.racecommittee.glue\bin/AndroidManifest.xml
/mobile\com.sap.sailing.racecommittee.glue\bin/com.sap.sailing.racecommittee.glue.jar
/mobile\com.sap.sailing.racecommittee.glue\bin/jarlist.cache
/mobile/com.sap.sailing.racecommittee.glue/bin/com.sap.sailing.racecommittee.glue.jar
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/BoatClassJsonSerializer.java
+2 -1
View File
@@ -5,11 +5,12 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.BoatClass;
public class BoatClassJsonSerializer implements JsonSerializer<BoatClass> {
public static final String FIELD_NAME = "name";
@Override
public JSONObject serialize(BoatClass object) {
JSONObject result = new JSONObject();
result.put("name", object.getName());
result.put(FIELD_NAME, object.getName());
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/CourseAreaJsonSerializer.java
+5 -4
View File
@@ -6,20 +6,21 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.RaceDefinition;
public class CourseAreaJsonSerializer implements JsonSerializer<CourseArea>
{
public class CourseAreaJsonSerializer implements JsonSerializer<CourseArea> {
public static final String FIELD_NAME = "name";
public static final String FIELD_RACES = "races";
@Override
public JSONObject serialize(CourseArea object) {
JSONObject result = new JSONObject();
result.put("name", object.getName());
result.put(FIELD_NAME, object.getName());
JSONArray races = new JSONArray();
for (RaceDefinition race : object.getRaces())
{
races.add(race.getId().toString());
}
result.put("races", races);
result.put(FIELD_RACES, races);
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/EventJsonSerializer.java
+10 -6
View File
@@ -5,8 +5,12 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Venue;
public class EventJsonSerializer implements JsonSerializer<Event>
{
public class EventJsonSerializer implements JsonSerializer<Event> {
public static final String FIELD_ID = "id";
public static final String FIELD_NAME = "name";
public static final String FIELD_PUBLICATION_URL = "publicationUrl";
public static final String FIELD_VENUE = "venue";
private JsonSerializer<Venue> venueSerializer;
public EventJsonSerializer(JsonSerializer<Venue> venueSerializer)
@@ -17,10 +21,10 @@ public class EventJsonSerializer implements JsonSerializer<Event>
public JSONObject serialize(Event object) {
JSONObject result = new JSONObject();
result.put("id", object.getId().toString());
result.put("name", object.getName());
result.put("publicationUrl", object.getPublicationUrl());
result.put("venue", venueSerializer.serialize(object.getVenue()));
result.put(FIELD_ID, object.getId().toString());
result.put(FIELD_NAME, object.getName());
result.put(FIELD_PUBLICATION_URL, object.getPublicationUrl());
result.put(FIELD_VENUE, venueSerializer.serialize(object.getVenue()));
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/RaceCommitteeEventSerializer.java
+7 -4
View File
@@ -5,13 +5,16 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
public class RaceCommitteeEventSerializer implements JsonSerializer<RaceCommitteeEvent> {
public static final String FIELD_ID = "id";
public static final String FIELD_TIMESTAMP = "timestamp";
public static final String FIELD_PASS_ID = "passId";
@Override
public JSONObject serialize(RaceCommitteeEvent object) {
JSONObject result = new JSONObject();
result.put("id", object.getId().toString());
result.put("timestamp", object.getTimePoint().asMillis());
result.put("passId", object.getPassId());
result.put(FIELD_ID, object.getId().toString());
result.put(FIELD_TIMESTAMP, object.getTimePoint().asMillis());
result.put(FIELD_PASS_ID, object.getPassId());
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/RaceCommitteeEventSerializerFactory.java
-1
View File
@@ -5,7 +5,6 @@ import com.sap.sailing.domain.racecommittee.RaceCommitteeFlagEvent;
import com.sap.sailing.domain.racecommittee.RaceCommitteeStartTimeEvent;
public class RaceCommitteeEventSerializerFactory {
private JsonSerializer<RaceCommitteeEvent> baseEventSerializer;
public RaceCommitteeEventSerializerFactory() {
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/RaceCommitteeFlagEventSerializer.java
+7 -4
View File
@@ -10,7 +10,10 @@ import com.sap.sailing.domain.racecommittee.RaceCommitteeFlagEvent;
* with {@link RaceCommitteeEventSerializerFactory}, see type-safeness of generics.
*/
public class RaceCommitteeFlagEventSerializer implements JsonSerializer<RaceCommitteeEvent> {
public static final String FIELD_UPPER_FLAG = "upperFlag";
public static final String FIELD_LOWER_FLAG = "lowerFlag";
public static final String FIELD_DISPLAYED = "displayed";
private JsonSerializer<RaceCommitteeEvent> baseSerializer;
public RaceCommitteeFlagEventSerializer(JsonSerializer<RaceCommitteeEvent> baseSerializer) {
@@ -23,9 +26,9 @@ public class RaceCommitteeFlagEventSerializer implements JsonSerializer<RaceComm
RaceCommitteeFlagEvent flagEvent = (RaceCommitteeFlagEvent) object;
JSONObject result = baseSerializer.serialize(flagEvent);
result.put("upperFlag", flagEvent.getUpperFlag());
result.put("lowerFlag", flagEvent.getLowerFlag());
result.put("displayed", flagEvent.isDisplayed());
result.put(FIELD_UPPER_FLAG, flagEvent.getUpperFlag());
result.put(FIELD_LOWER_FLAG, flagEvent.getLowerFlag());
result.put(FIELD_DISPLAYED, flagEvent.isDisplayed());
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/RaceCommitteeStartTimeEventSerializer.java
+3 -2
View File
@@ -9,7 +9,8 @@ import com.sap.sailing.domain.racecommittee.RaceCommitteeStartTimeEvent;
* with {@link RaceCommitteeEventSerializerFactory}, see type-safeness of generics.
*/
public class RaceCommitteeStartTimeEventSerializer implements JsonSerializer<RaceCommitteeEvent> {
public static final String FIELD_START_TIME = "startTime";
private JsonSerializer<RaceCommitteeEvent> baseSerializer;
public RaceCommitteeStartTimeEventSerializer(JsonSerializer<RaceCommitteeEvent> baseSerializer) {
@@ -22,7 +23,7 @@ public class RaceCommitteeStartTimeEventSerializer implements JsonSerializer<Rac
RaceCommitteeStartTimeEvent startTimeEvent = (RaceCommitteeStartTimeEvent) object;
JSONObject result = baseSerializer.serialize(startTimeEvent);
result.put("startTime", startTimeEvent.getStartTime().asMillis());
result.put(FIELD_START_TIME, startTimeEvent.getStartTime().asMillis());
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/RaceDefinitionJsonSerializer.java
+7 -4
View File
@@ -5,14 +5,17 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.RaceDefinition;
public class RaceDefinitionJsonSerializer implements JsonSerializer<RaceDefinition> {
public static final String FIELD_ID = "id";
public static final String FIELD_NAME = "name";
public static final String FIELD_COURSE = "course";
@Override
public JSONObject serialize(RaceDefinition object) {
JSONObject result = new JSONObject();
result.put("id", object.getId().toString());
result.put("name", object.getName());
result.put("course", "tbd");
result.put(FIELD_ID, object.getId().toString());
result.put(FIELD_NAME, object.getName());
result.put(FIELD_COURSE, "tbd");
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/RegattaJsonSerializer.java
+9 -5
View File
@@ -8,7 +8,11 @@ import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.domain.base.Regatta;
public class RegattaJsonSerializer implements JsonSerializer<Regatta> {
public static final String FIELD_ID = "id";
public static final String FIELD_BASE_NAME = "baseName";
public static final String FIELD_BOAT_CLASS = "boatClass";
public static final String FIELD_RACES = "races";
private JsonSerializer<BoatClass> boatClassSerializer;
private JsonSerializer<RaceDefinition> raceDefinitionSerializer;
@@ -24,16 +28,16 @@ public class RegattaJsonSerializer implements JsonSerializer<Regatta> {
public JSONObject serialize(Regatta object) {
JSONObject result = new JSONObject();
result.put("id", object.getId().toString());
result.put("baseName", object.getBaseName());
result.put("boatClass", boatClassSerializer.serialize(object.getBoatClass()));
result.put(FIELD_ID, object.getId().toString());
result.put(FIELD_BASE_NAME, object.getBaseName());
result.put(FIELD_BOAT_CLASS, boatClassSerializer.serialize(object.getBoatClass()));
JSONArray races = new JSONArray();
for (RaceDefinition race : object.getAllRaces())
{
races.add(raceDefinitionSerializer.serialize(race));
}
result.put("races", races);
result.put(FIELD_RACES, races);
return result;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/VenueJsonSerializer.java
+5 -4
View File
@@ -7,8 +7,9 @@ import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Venue;
public class VenueJsonSerializer implements JsonSerializer<Venue>
{
public class VenueJsonSerializer implements JsonSerializer<Venue> {
public static final String FIELD_NAME = "name";
public static final String FIELD_COURSE_AREAS = "courseAreas";
private JsonSerializer<CourseArea> areaSerializer;
@@ -21,13 +22,13 @@ public class VenueJsonSerializer implements JsonSerializer<Venue>
public JSONObject serialize(Venue object) {
JSONObject result = new JSONObject();
result.put("name", object.getName());
result.put(FIELD_NAME, object.getName());
JSONArray areas = new JSONArray();
for (CourseArea area : object.getCourseAreas())
{
areas.add(areaSerializer.serialize(area));
}
result.put("courseAreas", areas);
result.put(FIELD_COURSE_AREAS, areas);
return result;
}