remoteurl is only transmitted once, filled with remoteserver if not

transitivly filled (not used yet, but for future compability)
This commit is contained in:
Kai Boernert committed 2017-08-08 14:20:01 +02:00
1 parent 87019ad480
commit f39eb531db
7 files changed
+91 -23

No files matched your search

@@ -0,0 +1,42 @@
package com.sap.sailing.server.gateway.serialization.impl;
import java.util.Date;
import java.util.UUID;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.anniversary.DetailedRaceInfo;
import com.sap.sailing.domain.common.RegattaNameAndRaceName;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
public class DetailedRaceInfoJsonSerializer implements JsonSerializer<DetailedRaceInfo>, JsonDeserializer<DetailedRaceInfo> {
public static final String FIELD_EVENT_ID = "eventID";
public static final String FIELD_LEADERBOARD_NAME = "leaderboardName";
private static final String FIELD_REMOTEURL = "remoteUrl";
@Override
public JSONObject serialize(DetailedRaceInfo object) {
JSONObject result = new JSONObject();
result.put(FIELD_EVENT_ID, object.getEventID().toString());
result.put(SimpleRaceInfoJsonSerializer.FIELD_RACE_NAME, object.getIdentifier().getRaceName());
result.put(SimpleRaceInfoJsonSerializer.FIELD_REGATTA_NAME, object.getIdentifier().getRegattaName());
result.put(FIELD_LEADERBOARD_NAME, object.getLeaderboardName());
result.put(SimpleRaceInfoJsonSerializer.FIELD_START_OF_RACE, object.getStartOfRace());
result.put(FIELD_REMOTEURL, object.getRemoteUrl());
return result;
}
@Override
public DetailedRaceInfo deserialize(JSONObject object) throws JsonDeserializationException {
String eventId = object.get(FIELD_EVENT_ID).toString();
String raceName = object.get(SimpleRaceInfoJsonSerializer.FIELD_RACE_NAME).toString();
String regattaName = object.get(SimpleRaceInfoJsonSerializer.FIELD_REGATTA_NAME).toString();
String leaderboardName = object.get(FIELD_LEADERBOARD_NAME).toString();
Date startOfRace = (Date) object.get(SimpleRaceInfoJsonSerializer.FIELD_START_OF_RACE);
String remoteUrl = (String) object.get(FIELD_REMOTEURL);
return new DetailedRaceInfo(new RegattaNameAndRaceName(regattaName, raceName), leaderboardName, startOfRace, UUID.fromString(eventId),remoteUrl);
}
}
@@ -7,10 +7,9 @@ import org.json.simple.JSONObject;
import com.sap.sailing.domain.anniversary.SimpleRaceInfo;
import com.sap.sailing.domain.common.RegattaNameAndRaceName;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
public class SimpleRaceInfoJsonSerializer implements JsonSerializer<SimpleRaceInfo>,JsonDeserializer<SimpleRaceInfo> {
public class SimpleRaceInfoJsonSerializer implements JsonSerializer<SimpleRaceInfo> {
public static final String FIELD_RACE_NAME = "raceName";
public static final String FIELD_REGATTA_NAME = "regattaName";
@@ -25,11 +24,10 @@ public class SimpleRaceInfoJsonSerializer implements JsonSerializer<SimpleRaceIn
return result;
}
@Override
public SimpleRaceInfo deserialize(JSONObject object) throws JsonDeserializationException {
public SimpleRaceInfo deserialize(JSONObject object,String remoteUrl) throws JsonDeserializationException {
String raceName = object.get(SimpleRaceInfoJsonSerializer.FIELD_RACE_NAME).toString();
String regattaName = object.get(SimpleRaceInfoJsonSerializer.FIELD_REGATTA_NAME).toString();
Date startOfRace = new Date(((Number)object.get(SimpleRaceInfoJsonSerializer.FIELD_START_OF_RACE)).longValue());
return new SimpleRaceInfo(new RegattaNameAndRaceName(regattaName, raceName), startOfRace, /* remoteName */ null);
return new SimpleRaceInfo(new RegattaNameAndRaceName(regattaName, raceName), startOfRace,remoteUrl);
}
}