From a5991002bf6700a86e10ab810e8e94d56c1deff7 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Thu, 10 Aug 2017 13:51:15 +0200 Subject: [PATCH] Bug 4227: Consistently using null as remoteURL for local TrackedRaces in the REST API --- .../serialization/impl/DetailedRaceInfoJsonSerializer.java | 7 ++----- .../server/gateway/jaxrs/api/TrackedRaceListResource.java | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/DetailedRaceInfoJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/DetailedRaceInfoJsonSerializer.java index cee7f5a0cea..23add4cd915 100644 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/DetailedRaceInfoJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/DetailedRaceInfoJsonSerializer.java @@ -30,11 +30,8 @@ public class DetailedRaceInfoJsonSerializer 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().asMillis()); - if (object.getRemoteUrl() == null) { - result.put(FIELD_REMOTEURL, ""); - } else { - result.put(FIELD_REMOTEURL, object.getRemoteUrl().toExternalForm()); - } + final URL remoteUrl = object.getRemoteUrl(); + result.put(FIELD_REMOTEURL, remoteUrl == null ? null : remoteUrl.toExternalForm()); return result; } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TrackedRaceListResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TrackedRaceListResource.java index 9048c9e12a0..b3d65fad8e5 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TrackedRaceListResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TrackedRaceListResource.java @@ -83,11 +83,8 @@ public class TrackedRaceListResource extends AbstractSailingServerResource { list.add(simpleRaceListJsonSerializer.serialize(simpleRaceInfo)); } JSONObject remote = new JSONObject(); - if(raced.getKey() == null){ - remote.put(DetailedRaceInfoJsonSerializer.FIELD_REMOTEURL, ""); - }else{ - remote.put(DetailedRaceInfoJsonSerializer.FIELD_REMOTEURL, raced.getKey().toExternalForm()); - } + final URL remoteURL = raced.getKey(); + remote.put(DetailedRaceInfoJsonSerializer.FIELD_REMOTEURL, remoteURL == null ? null : remoteURL.toExternalForm()); remote.put(DetailedRaceInfoJsonSerializer.FIELD_RACES, list); json.add(remote); }