diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesBasedMarkConfiguration.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesBasedMarkConfiguration.java index 322848603de..61121ee3ba5 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesBasedMarkConfiguration.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesBasedMarkConfiguration.java @@ -1,23 +1,20 @@ package com.sap.sailing.domain.coursetemplate; /** - * Configures a mark based on a {@link MarkProperties} object returned from {@link #getMarkProperties()}. Optionally, a - * non-{@code null} {@link MarkTemplate} may be returned from {@link #getOptionalMarkTemplate()} which then means that the mark - * to create and configure assumes the "role" defined by the mark template. The {@link MarkProperties} attributes, - * if present, take precedence over their respective {@link MarkTemplate} counterparts. + * Configures a mark based on a {@link MarkProperties} object returned from {@link #getOptionalMarkProperties()}. + * Optionally, a non-{@code null} {@link MarkTemplate} may be returned from {@link #getOptionalMarkTemplate()} which + * then means that the mark to create and configure assumes the "role" defined by the mark template. The + * {@link MarkProperties} attributes, if present, take precedence over their respective {@link MarkTemplate} + * counterparts. * * @author Axel Uhl (D043530) * */ public interface MarkPropertiesBasedMarkConfiguration

extends MarkConfiguration

{ - MarkProperties getMarkProperties(); - /** - * The "optional" {@link MarkProperties} for this type of mark configuration are the {@link #getMarkProperties() - * MarkProperties} referenced by this object and hence never {@code null}. + * The "optional" {@link MarkProperties} for this type of mark configuration are the {@link MarkProperties} + * referenced by this object and hence never {@code null}. */ @Override - default MarkProperties getOptionalMarkProperties() { - return getMarkProperties(); - } + MarkProperties getOptionalMarkProperties(); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkTemplate.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkTemplate.java index e57d9b04821..5f0308fb047 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkTemplate.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkTemplate.java @@ -24,7 +24,6 @@ import com.sap.sse.security.shared.WithQualifiedObjectIdentifier; public interface MarkTemplate extends ControlPointTemplate, NamedWithUUID, CommonMarkProperties, WithQualifiedObjectIdentifier, IsManagedByCache { public interface MarkTemplateResolver { - MarkTemplate getOrCreate(MarkTemplate markTemplate); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/RegattaMarkConfiguration.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/RegattaMarkConfiguration.java index eac72cbad37..ed4d8bb6df3 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/RegattaMarkConfiguration.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/RegattaMarkConfiguration.java @@ -10,9 +10,11 @@ import com.sap.sailing.domain.base.Mark; *

* * An optional non-{@code null} {@link MarkTemplate} may be returned from {@link #getOptionalMarkTemplate()} which then - * leads to recording a usage relation between the regatta {@link Mark} and said {@link MarkTemplate}. + * leads to recording a usage relation between the regatta {@link Mark} and said {@link MarkTemplate}. This relation can be + * requested using {@link Mark#getOriginatingMarkTemplateIdOrNull()}. * {@link #getOptionalMarkProperties()} can reference a {@link MarkProperties} object if the {@link #getMark mark} was - * originally created from that {@link MarkProperties} object. + * originally created from that {@link MarkProperties} object. Again, the resulting usage relation can be requested using + * {@link Mark#getOriginatingMarkPropertiesIdOrNull()}. *

* * The {@link #getEffectiveProperties() effective properties} will contain diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/TrackingDeviceBasedPositioningWithLastKnownPosition.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/TrackingDeviceBasedPositioningWithLastKnownPosition.java new file mode 100755 index 00000000000..bb896d253c5 --- /dev/null +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/TrackingDeviceBasedPositioningWithLastKnownPosition.java @@ -0,0 +1,12 @@ +package com.sap.sailing.domain.coursetemplate; + +import com.sap.sailing.domain.common.Position; + +public interface TrackingDeviceBasedPositioningWithLastKnownPosition extends TrackingDeviceBasedPositioning { + Position getLastKnownPosition(); + + @Override + default T accept(PositioningVisitor visitor) { + return visitor.visit(this); + } +} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/MarkPropertiesBasedMarkConfigurationImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/MarkPropertiesBasedMarkConfigurationImpl.java index 8c4e76cb488..4b97789368d 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/MarkPropertiesBasedMarkConfigurationImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/MarkPropertiesBasedMarkConfigurationImpl.java @@ -27,7 +27,7 @@ public class MarkPropertiesBasedMarkConfigurationImpl

extends MarkConfigurati } @Override - public MarkProperties getMarkProperties() { + public MarkProperties getOptionalMarkProperties() { return markProperties; } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/sharedsailingdata/SharedSailingData.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/sharedsailingdata/SharedSailingData.java index 9105b3e7383..7ad11af5bde 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/sharedsailingdata/SharedSailingData.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/sharedsailingdata/SharedSailingData.java @@ -10,6 +10,7 @@ import com.sap.sailing.domain.common.DeviceIdentifier; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.coursetemplate.CommonMarkProperties; import com.sap.sailing.domain.coursetemplate.CourseTemplate; +import com.sap.sailing.domain.coursetemplate.FixedPositioning; import com.sap.sailing.domain.coursetemplate.MarkProperties; import com.sap.sailing.domain.coursetemplate.MarkRole; import com.sap.sailing.domain.coursetemplate.MarkTemplate; @@ -65,6 +66,13 @@ public interface SharedSailingData { MarkProperties updateMarkProperties(UUID uuid, CommonMarkProperties properties, Iterable tags); + /** + * @param positioningInformation + * if {@code null}, no update will be performed to the positioning information of the + * {@link MarkProperties} object identified by {@code uuid}. To clear the positioning information, pass + * in a valid, non-{@code null} {@link Positioning} object that makes an "empty" specification, such as a + * {@link FixedPositioning} with a {@code null} {@link FixedPositioning#getFixedPosition()} return. + */ MarkProperties updateMarkProperties(UUID uuid, CommonMarkProperties properties, Positioning positioningInformation, Iterable tags); /** diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java index 172165ae5cc..80b82b2e843 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CourseConfigurationBuilder.java @@ -182,7 +182,7 @@ public class CourseConfigurationBuilder { public MarkConfiguration addRegattaMarkConfiguration(UUID markID, Positioning optionalPositioning, boolean storeToInventory) { if (optionalRegatta == null) { - throw new IllegalStateException(); + throw new IllegalStateException("Require a valid regatta in CourseConfigurationBuilder to add regatta mark with ID "+markID); } for (RaceColumn raceColumn : optionalRegatta.getRaceColumns()) { for (Mark mark : raceColumn.getAvailableMarks()) { @@ -308,6 +308,14 @@ public class CourseConfigurationBuilder { return bestMatchingDeviceMapping; } + /** + * For a {@link MarkProperties} object finds its {@link MarkProperties#getPositioningInformation()} and if it is {@code null}, returns {@code null}; + * otherwise, for a fixed position specification that position will be returned as the "last known position" and no device ID will be returned in this + * case, although practically, the fixed position at some point may be stored in a regatta context using a "PING" device mapping.

+ * + * For device identifier-based positioning requests the device identifier will be returned and a query for the last known position of that device will + * be launched using the {@code positionResolver}. If a last known position is found that way, it is included in the return value of this method. + */ public static MarkConfigurationResponseAnnotation getPositioningIfAvailable(MarkProperties markProperties, Function positionResolver) { final MarkConfigurationResponseAnnotation result; final Positioning positioning = markProperties.getPositioningInformation(); diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CourseConfigurationJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CourseConfigurationJsonSerializer.java index 957ba57da50..53802dbcb8f 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CourseConfigurationJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CourseConfigurationJsonSerializer.java @@ -93,6 +93,7 @@ public class CourseConfigurationJsonSerializer implements JsonSerializer freeStyleMarkConfiguration = (FreestyleMarkConfiguration) markConfiguration; @@ -107,7 +108,7 @@ public class CourseConfigurationJsonSerializer implements JsonSerializer markPropertiesBasedMarkConfiguration = (MarkPropertiesBasedMarkConfiguration) markConfiguration; markConfigurationsEntry.put(FIELD_MARK_CONFIGURATION_MARK_PROPERTIES_ID, - markPropertiesBasedMarkConfiguration.getMarkProperties().getId().toString()); + markPropertiesBasedMarkConfiguration.getOptionalMarkProperties().getId().toString()); if (markPropertiesBasedMarkConfiguration.getOptionalMarkTemplate() != null) { markConfigurationsEntry.put(FIELD_MARK_CONFIGURATION_MARK_TEMPLATE_ID, markPropertiesBasedMarkConfiguration.getOptionalMarkTemplate().getId().toString()); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java index e8646f1a6df..65675ccc360 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CourseConfigurationResource.java @@ -238,8 +238,8 @@ public class CourseConfigurationResource extends AbstractSailingServerResource { public Response createCourse(@PathParam("regattaName") String regattaName, @QueryParam("markPropertiesGroupOwnership") String markPropertiesGroupOwnership, @PathParam("raceColumn") String raceColumn, @PathParam("fleet") String fleet, - String json) throws Exception { - if (json == null || json.isEmpty()) { + String jsonCourseConfiguration) throws Exception { + if (jsonCourseConfiguration == null || jsonCourseConfiguration.isEmpty()) { return getBadCourseConfigurationValidationErrorResponse( "Course configuration is required to be given as json object"); } @@ -257,7 +257,7 @@ public class CourseConfigurationResource extends AbstractSailingServerResource { if (raceColumnByName == null || fleetByName == null) { return getBadRaceErrorResponse(regattaName, raceColumn, fleet); } - final Object parsedObject = new JSONParser().parse(json); + final Object parsedObject = new JSONParser().parse(jsonCourseConfiguration); if (parsedObject == null || !(parsedObject instanceof JSONObject)) { getBadCourseConfigurationValidationErrorResponse( "Course configuration is required to be given as json object"); diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/courseConfigurationCreateCourseTemplate.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/courseConfigurationCreateCourseTemplate.html index c418e8632f3..a5ac74f27d1 100644 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/courseConfigurationCreateCourseTemplate.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/courseConfigurationCreateCourseTemplate.html @@ -49,7 +49,6 @@

  • pattern: For marks with BUOY type, this may be specified as CHECKERED
  • -
  • positioning (optional): Not implemented yet!
  • positioning (optional): Any given positioning is only included in the resulting course configuration. As mark templates can't have positioning information attached this is not saved when creating a mark template. Because the resulting course configuration may be used to update the UI state, the positioning is included in the updated mark configurations. Either of the following properties may be given: