From 1f74ccc8415df00316a8f470c84bb498f41bf91b Mon Sep 17 00:00:00 2001 From: Dennis Aulenbacher Date: Thu, 22 Oct 2020 18:21:45 +0200 Subject: [PATCH] bug5310: Using new MarkContext dto object in MarkResource --- .../META-INF/MANIFEST.MF | 1 + .../sailing/server/gateway/jaxrs/api/MarkResource.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF index 97c2327d1cd..22caf8a597d 100644 --- a/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.server.gateway.serialization/META-INF/MANIFEST.MF @@ -18,6 +18,7 @@ Require-Bundle: com.sap.sailing.domain.common, com.sap.sse.replication, com.sap.sailing.shared.server Export-Package: com.sap.sailing.server.gateway.deserialization.impl, + com.sap.sailing.server.gateway.dto, com.sap.sailing.server.gateway.serialization, com.sap.sailing.server.gateway.serialization.impl, com.sap.sailing.server.gateway.serialization.racelog.tracking, diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkResource.java index b574f35a029..c58d61c8784 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkResource.java @@ -68,20 +68,20 @@ import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter; import com.sap.sailing.domain.regattalike.HasRegattaLike; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.impl.Helpers; +import com.sap.sailing.server.gateway.dto.MarkContext; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; import com.sap.sailing.server.gateway.serialization.coursedata.impl.ControlPointJsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.CourseBaseJsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.CourseJsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.GateJsonSerializer; -import com.sap.sailing.server.gateway.serialization.coursedata.impl.MarkContextJsonSerializer; 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.MarkContextJsonSerializer; import com.sap.sailing.server.interfaces.RacingEventService; import com.sap.sailing.util.RegattaUtil; import com.sap.sse.common.Color; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; -import com.sap.sse.common.Util.Triple; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.impl.RGBColor; import com.sap.sse.security.SecurityService; @@ -414,7 +414,7 @@ public class MarkResource extends AbstractSailingServerResource { throw new IllegalArgumentException("No MarkPropertiesObject with Id: " + markPropertiesId); } getSecurityService().checkCurrentUserReadPermission(markPropertiesObject); - Set> markContexts = new HashSet<>(); + Set markContexts = new HashSet<>(); Iterable events = getEventsWithSufficientPermissions(eventIds); for (Event event : events) { Set regattas = getRegattasOfEventWithSufficientPermissionsFilteredByIds(event, regattaIds); @@ -426,14 +426,14 @@ public class MarkResource extends AbstractSailingServerResource { if (originatingMarkPropertiesIdOrNull != null && originatingMarkPropertiesIdOrNull.equals(markPropertiesObject.getId())) { markContexts.add( - new Triple(mark, event.getId().toString(), regatta.getName())); + new MarkContext(mark, event, regatta)); } } } } JSONArray jsonContexts = new JSONArray(); MarkContextJsonSerializer markContextJsonSerializer = new MarkContextJsonSerializer(); - for (Triple markContext : markContexts) { + for (MarkContext markContext : markContexts) { jsonContexts.add(markContextJsonSerializer.serialize(markContext)); } Response response = Response.ok(streamingOutput(jsonContexts)).build();