diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java index 96f9139e4c5..ee68268707a 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java @@ -2064,10 +2064,9 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { // store mark template list including role names for those who have one defined final BasicDBList markTemplates = new BasicDBList(); - courseTemplate.getMarkTemplates().forEach(m -> { + courseTemplate.getMarkTemplatesWithOptionalRoles().forEach((m, role) -> { final BasicDBObject markTemplateObject = new BasicDBObject( FieldNames.COURSE_TEMPLATE_MARK_TEMPLATE_ID.name(), m.getId().toString()); - final MarkRole role = courseTemplate.getAssociatedRoles().get(m); if (role != null) { markTemplateObject.append(FieldNames.COURSE_TEMPLATE_MARK_TEMPLATE_ROLE.name(), role.getId().toString()); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseConfigurationBase.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseConfigurationBase.java index 53140658682..6ed668c74d3 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseConfigurationBase.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseConfigurationBase.java @@ -53,6 +53,8 @@ public interface CourseConfigurationBase extends WithOptio */ Map getAssociatedRoles(); + Map getAllMarksWithOptionalRoles(); + /** * A {@link CourseConfigurationBase} having a {@link RepeatablePart} can optionally also specify a number of laps. * Depending on the use-case this can be omitted (saving a course template) or is required (creating a regatta diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseTemplate.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseTemplate.java index 4a09476f5c3..328fd18a7e5 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseTemplate.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/CourseTemplate.java @@ -46,6 +46,8 @@ public interface CourseTemplate extends WithOptionalRepeatablePart, NamedWithUUI */ Iterable getMarkTemplates(); + MarkTemplate getMarkTemplateByIdIfContainedInCourseTemplate(UUID markTemplateId); + Iterable getMarkTemplatesInWaypoints(); /** @@ -71,6 +73,12 @@ public interface CourseTemplate extends WithOptionalRepeatablePart, NamedWithUUI Map getAssociatedRoles(); + Map getMarkTemplatesWithOptionalRoles(); + + MarkRole getOptionalAssociatedRole(MarkTemplate markTemplate); + + MarkRole getMarkRoleByIdIfContainedInCourseTemplate(UUID markRoleId); + URL getOptionalImageURL(); Integer getDefaultNumberOfLaps(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseConfigurationBaseImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseConfigurationBaseImpl.java index 486e2a993be..5f52f07d7e6 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseConfigurationBaseImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseConfigurationBaseImpl.java @@ -3,6 +3,7 @@ package com.sap.sailing.domain.coursetemplate.impl; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import com.sap.sailing.domain.coursetemplate.CourseConfigurationBase; import com.sap.sailing.domain.coursetemplate.CourseTemplate; @@ -62,6 +63,11 @@ public abstract class CourseConfigurationBaseImpl implemen public Map getAssociatedRoles() { return associatedRoles; } + + @Override + public Map getAllMarksWithOptionalRoles() { + return markConfigurations.stream().collect(Collectors.toMap(mc -> mc, associatedRoles::get)); + } @Override public Integer getNumberOfLaps() { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseTemplateImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseTemplateImpl.java index 456a66dd2c4..26ec8cbf9be 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseTemplateImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/impl/CourseTemplateImpl.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.stream.Collectors; import com.sap.sailing.domain.coursetemplate.CourseTemplate; import com.sap.sailing.domain.coursetemplate.MarkRole; @@ -19,7 +20,7 @@ import com.sap.sse.common.impl.NamedWithUUIDImpl; public class CourseTemplateImpl extends NamedWithUUIDImpl implements CourseTemplate { private static final long serialVersionUID = -183875832585632806L; - private final Iterable marks; + private final Set marks; private final ArrayList waypoints; @@ -53,11 +54,10 @@ public class CourseTemplateImpl extends NamedWithUUIDImpl implements CourseTempl if (optionalRepeatablePart != null) { optionalRepeatablePart.validateRepeatablePartForSequence(waypoints); } - final Set theMarks = new HashSet<>(); - Util.addAll(marks, theMarks); this.waypoints = new ArrayList<>(); Util.addAll(waypoints, this.waypoints); - this.marks = theMarks; + this.marks = new HashSet<>(); + Util.addAll(marks, this.marks); this.optionalImageURL = optionalImageURL; this.optionalRepeatablePart = optionalRepeatablePart; this.associatedRoles = new HashMap<>(associatedRoles); @@ -83,6 +83,18 @@ public class CourseTemplateImpl extends NamedWithUUIDImpl implements CourseTempl public Iterable getMarkTemplates() { return marks; } + + @Override + public MarkTemplate getMarkTemplateByIdIfContainedInCourseTemplate(UUID markTemplateId) { + MarkTemplate result = null; + for (MarkTemplate markTemplate : marks) { + if (markTemplate.getId().equals(markTemplateId)) { + result = markTemplate; + break; + } + } + return result; + } @Override public Iterable getWaypointTemplates() { @@ -115,6 +127,28 @@ public class CourseTemplateImpl extends NamedWithUUIDImpl implements CourseTempl return associatedRoles; } + @Override + public Map getMarkTemplatesWithOptionalRoles() { + return marks.stream().collect(Collectors.toMap(mc -> mc, associatedRoles::get)); + } + + @Override + public MarkRole getOptionalAssociatedRole(MarkTemplate markTemplate) { + return associatedRoles.get(markTemplate); + } + + @Override + public MarkRole getMarkRoleByIdIfContainedInCourseTemplate(UUID markRoleId) { + MarkRole result = null; + for (MarkRole markRole : associatedRoles.values()) { + if (markRole.getId().equals(markRoleId)) { + result = markRole; + break; + } + } + return result; + } + public void setAssociatedRoles(Map associatedRoles) { this.associatedRoles.clear(); this.associatedRoles.putAll(associatedRoles); 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 31af4aa738e..3532da7f717 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 @@ -124,12 +124,8 @@ public class CourseConfigurationBuilder { private MarkTemplate resolveMarkTemplateByID(UUID markTemplateID) { MarkTemplate resolvedMarkTemplate = null; if (optionalCourseTemplate != null) { - for (MarkTemplate markTemplate : optionalCourseTemplate.getMarkTemplates()) { - if (markTemplate.getId().equals(markTemplateID)) { - resolvedMarkTemplate = markTemplate; - break; - } - } + resolvedMarkTemplate = optionalCourseTemplate + .getMarkTemplateByIdIfContainedInCourseTemplate(markTemplateID); } if (resolvedMarkTemplate == null) { resolvedMarkTemplate = sharedSailingData.getMarkTemplateById(markTemplateID); @@ -140,12 +136,7 @@ public class CourseConfigurationBuilder { private MarkRole resolveMarkRoleByID(UUID markRoleID) { MarkRole resolvedMarkRole = null; if (optionalCourseTemplate != null) { - for (MarkRole markRole : optionalCourseTemplate.getAssociatedRoles().values()) { - if (markRole.getId().equals(markRoleID)) { - resolvedMarkRole = markRole; - break; - } - } + resolvedMarkRole = optionalCourseTemplate.getMarkRoleByIdIfContainedInCourseTemplate(markRoleID); } if (resolvedMarkRole == null) { resolvedMarkRole = sharedSailingData.getMarkRoleById(markRoleID); 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 7347c462661..85786d7d53f 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 @@ -69,7 +69,8 @@ public class CourseConfigurationJsonSerializer implements JsonSerializer markConfigurationsToTempIdMap = new HashMap<>(); final JSONArray markConfigurationsJSON = new JSONArray(); - for (final MarkConfiguration markConfiguration : courseConfiguration.getAllMarks()) { + for (Map.Entry markWithOptionalRole : courseConfiguration.getAllMarksWithOptionalRoles().entrySet()) { + final MarkConfiguration markConfiguration = markWithOptionalRole.getKey(); JSONObject markConfigurationsEntry = new JSONObject(); final UUID markConfigurationId = UUID.randomUUID(); markConfigurationsEntry.put(FIELD_MARK_CONFIGURATION_ID, markConfigurationId.toString()); @@ -77,7 +78,7 @@ public class CourseConfigurationJsonSerializer implements JsonSerializer { + courseTemplate.getMarkTemplatesWithOptionalRoles().forEach((mt, associatedRoleOrNull) -> { final JSONObject markTemplateEntry = markTemplateJsonSerializer.serialize(mt); - final MarkRole associatedRoleOrNull = courseTemplate.getAssociatedRoles().get(mt); if (associatedRoleOrNull != null) { markTemplateEntry.put(FIELD_ASSOCIATED_ROLE_ID, associatedRoleOrNull.getId().toString()); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/CourseAndMarkConfigurationFactoryImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/CourseAndMarkConfigurationFactoryImpl.java index 5e577584f66..384e0125764 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/CourseAndMarkConfigurationFactoryImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/CourseAndMarkConfigurationFactoryImpl.java @@ -221,14 +221,14 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi if (markRoleId == null) { return null; } + MarkRole markRole = null; if (optionalCourseTemplate != null) { - for (MarkRole markRoleInCourseTemplate : optionalCourseTemplate.getAssociatedRoles().values()) { - if (markRoleInCourseTemplate.getId().equals(markRoleId)) { - return markRoleInCourseTemplate; - } - } + markRole = optionalCourseTemplate.getMarkRoleByIdIfContainedInCourseTemplate(markRoleId); } - return sharedSailingData.getMarkRoleById(markRoleId); + if (markRole == null) { + markRole = sharedSailingData.getMarkRoleById(markRoleId); + } + return markRole; } @Override @@ -735,7 +735,7 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi markTemplate, null, /* storeToInventory */ false); markTemplatesToMarkConfigurations.put(markTemplate, markConfiguration); resultingRoleMapping.put(markConfiguration, - courseTemplateOrNull.getAssociatedRoles().get(markTemplate)); + courseTemplateOrNull.getOptionalAssociatedRole(markTemplate)); } replaceTemplateBasedConfigurationCandidatesBySuggestedProperties( markTemplatesToMarkConfigurations, allMarkConfigurations, tagsToFilterMarkProperties, @@ -842,7 +842,7 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi while (markTemplateIterator.hasNext()) { final MarkTemplate markTemplate = markTemplateIterator.next(); final Mark mark = markIterator.next(); - final MarkRole roleForMarkTempalte = courseTemplate.getAssociatedRoles().get(markTemplate); + final MarkRole roleForMarkTempalte = courseTemplate.getOptionalAssociatedRole(markTemplate); if (roleForMarkTempalte == null) { validCourseTemplateUsage = false; break; @@ -956,12 +956,7 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi private MarkTemplate resolveMarkTemplateByID(CourseTemplate courseTemplate, UUID markTemplateID) { MarkTemplate resolvedMarkTemplate = null; if (courseTemplate != null) { - for (MarkTemplate markTemplate : courseTemplate.getMarkTemplates()) { - if (markTemplate.getId().equals(markTemplateID)) { - resolvedMarkTemplate = markTemplate; - break; - } - } + resolvedMarkTemplate = courseTemplate.getMarkTemplateByIdIfContainedInCourseTemplate(markTemplateID); } if (resolvedMarkTemplate == null) { try {