eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-11 13:22:43 +00:00
Code Activity

use a CompetitorAndBoatJsonSerializer in LeaderboardsResource.getStartOrder()

Browse Source 
Change-Id: Ibf9dc7f2b57318f6696d5df3d119dc3a2a7fe62d
This commit is contained in:
Axel Uhl committed 2018-04-09 17:01:44 +02:00
1 parent 06447318e5
commit b0a3669924
1 file changed
+3 -5
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
+3 -5
View File
@@ -64,9 +64,7 @@ import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.base.impl.CompetitorWithBoatImpl;
import com.sap.sailing.domain.base.impl.CourseImpl;
import com.sap.sailing.domain.base.impl.DynamicBoat;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.CourseDesignerMode;
import com.sap.sailing.domain.common.DeviceIdentifier;
@@ -115,7 +113,7 @@ import com.sap.sailing.server.gateway.serialization.coursedata.impl.CourseJsonSe
import com.sap.sailing.server.gateway.serialization.coursedata.impl.GateJsonSerializer;
import com.sap.sailing.server.gateway.serialization.coursedata.impl.MarkJsonSerializer;
import com.sap.sailing.server.gateway.serialization.coursedata.impl.WaypointJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.CompetitorJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.CompetitorAndBoatJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.FlatGPSFixJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.MarkJsonSerializerWithPosition;
import com.sap.sse.InvalidDateException;
@@ -1030,11 +1028,11 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource {
return result;
});
}
CompetitorJsonSerializer serializer = CompetitorJsonSerializer.create();
CompetitorAndBoatJsonSerializer serializer = CompetitorAndBoatJsonSerializer.create();
JSONArray result = new JSONArray();
for (final Competitor c : competitors) {
Boat boat = trackedRace.getBoatOfCompetitor(c);
JSONObject jsonCompetitor = serializer.serialize(new CompetitorWithBoatImpl(c, (DynamicBoat) boat));
JSONObject jsonCompetitor = serializer.serialize(new Pair<>(c, boat));
result.add(jsonCompetitor);
}
String json = result.toJSONString();