eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

Improved name of a serializer

Browse Source
This commit is contained in:
Frank Mittag
2017-07-21 17:28:49 +02:00
parent 9e9f5aeaec
commit 20bc27a3da
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorWithBoatJsonSerializer.java → java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorAndBoatJsonSerializer.java
+5 -5
View File
@@ -8,19 +8,19 @@ import com.sap.sailing.domain.base.CompetitorAndBoat;
import com.sap.sailing.domain.common.tracking.impl.CompetitorJsonConstants;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
public class CompetitorWithBoatJsonSerializer implements JsonSerializer<CompetitorAndBoat> {
public class CompetitorAndBoatJsonSerializer implements JsonSerializer<CompetitorAndBoat> {
private final JsonSerializer<Boat> boatJsonSerializer;
private final JsonSerializer<Competitor> competitorJsonSerializer;
public static CompetitorWithBoatJsonSerializer create() {
return new CompetitorWithBoatJsonSerializer(CompetitorJsonSerializer.create(), BoatJsonSerializer.create());
public static CompetitorAndBoatJsonSerializer create() {
return new CompetitorAndBoatJsonSerializer(CompetitorJsonSerializer.create(), BoatJsonSerializer.create());
}
public CompetitorWithBoatJsonSerializer() {
public CompetitorAndBoatJsonSerializer() {
this(null, null);
}
public CompetitorWithBoatJsonSerializer(JsonSerializer<Competitor> competitorJsonSerializer, JsonSerializer<Boat> boatJsonSerializer) {
public CompetitorAndBoatJsonSerializer(JsonSerializer<Competitor> competitorJsonSerializer, JsonSerializer<Boat> boatJsonSerializer) {
this.competitorJsonSerializer = competitorJsonSerializer;
this.boatJsonSerializer = boatJsonSerializer;
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ManeuversJsonSerializer.java
+2 -2
View File
@@ -16,10 +16,10 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
public class ManeuversJsonSerializer extends AbstractTrackedRaceDataJsonSerializer {
public final static String MANEUVERS = "maneuvers";
private final CompetitorWithBoatJsonSerializer competitorSerializer;
private final CompetitorAndBoatJsonSerializer competitorSerializer;
private final ManeuverJsonSerializer maneuverSerializer;
public ManeuversJsonSerializer(CompetitorWithBoatJsonSerializer competitorSerializer, ManeuverJsonSerializer maneuverSerializer) {
public ManeuversJsonSerializer(CompetitorAndBoatJsonSerializer competitorSerializer, ManeuverJsonSerializer maneuverSerializer) {
super();
this.competitorSerializer = competitorSerializer;
this.maneuverSerializer = maneuverSerializer;
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/MarkPassingsJsonSerializer.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class MarkPassingsJsonSerializer extends AbstractTrackedRaceDataJsonSeria
public JSONObject serialize(TrackedRace trackedRace) {
final Course course = trackedRace.getRace().getCourse();
JSONObject result = new JSONObject();
CompetitorWithBoatJsonSerializer competitorWithBoatSerializer = CompetitorWithBoatJsonSerializer.create();
CompetitorAndBoatJsonSerializer competitorWithBoatSerializer = CompetitorAndBoatJsonSerializer.create();
CompetitorJsonSerializer competitorSerializer = CompetitorJsonSerializer.create();
JSONArray byCompetitorJson = new JSONArray();
result.put(BYCOMPETITOR, byCompetitorJson);
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
+4 -4
View File
@@ -67,7 +67,7 @@ import com.sap.sailing.server.gateway.serialization.coursedata.impl.WaypointJson
import com.sap.sailing.server.gateway.serialization.impl.AbstractTrackedRaceDataJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.ColorJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.CompetitorJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.CompetitorWithBoatJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.CompetitorAndBoatJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.DefaultWindTrackJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.DistanceJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.FleetJsonSerializer;
@@ -211,7 +211,7 @@ public class RegattasResource extends AbstractSailingServerResource {
if (race == null) {
response = getBadRaceErrorResponse(regattaName, raceName);
} else {
CompetitorWithBoatJsonSerializer competitorJsonSerializer = CompetitorWithBoatJsonSerializer.create();
CompetitorAndBoatJsonSerializer competitorJsonSerializer = CompetitorAndBoatJsonSerializer.create();
JsonSerializer<RaceDefinition> raceEntriesSerializer = new RaceEntriesJsonSerializer(competitorJsonSerializer);
JSONObject serializedRaceEntries = raceEntriesSerializer.serialize(race);
@@ -861,7 +861,7 @@ public class RegattasResource extends AbstractSailingServerResource {
.build();
} else {
TrackedRace trackedRace = findTrackedRace(regattaName, raceName);
ManeuversJsonSerializer serializer = new ManeuversJsonSerializer(new CompetitorWithBoatJsonSerializer(),
ManeuversJsonSerializer serializer = new ManeuversJsonSerializer(new CompetitorAndBoatJsonSerializer(),
new ManeuverJsonSerializer(new GPSFixJsonSerializer(), new DistanceJsonSerializer()));
JSONObject jsonMarkPassings = serializer.serialize(trackedRace);
String json = jsonMarkPassings.toJSONString();
@@ -930,7 +930,7 @@ public class RegattasResource extends AbstractSailingServerResource {
return result;
});
}
CompetitorWithBoatJsonSerializer serializer = new CompetitorWithBoatJsonSerializer();
CompetitorAndBoatJsonSerializer serializer = new CompetitorAndBoatJsonSerializer();
JSONArray result = new JSONArray();
for (final Competitor c : competitors) {
Boat boat = trackedRace.getBoatOfCompetitor(c);