diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java index 200f27563cc..657dc991b86 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java @@ -3,6 +3,7 @@ package com.sap.sailing.domain.common.dto; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.List; @@ -45,13 +46,23 @@ public abstract class AbstractLeaderboardDTO implements Serializable { } public Set getBoatClasses() { - Set result = new HashSet(); - if(rows != null) { + Set result = new HashSet<>(); + collectBoatClasses(result); + return result; + } + + private void collectBoatClasses(Collection boatClasses) { + if (rows != null) { for (CompetitorDTO competitor : rows.keySet()) { - result.add(competitor.getBoatClass()); + boatClasses.add(competitor.getBoatClass()); } } - return result; + } + + public BoatClassDTO getDominantBoatClass() { + List result = new ArrayList<>(); + collectBoatClasses(result); + return Util.getDominantObject(result); } public String getDisplayName() { diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java index 423edab57a7..8d0e6f8ea80 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java @@ -122,16 +122,16 @@ public class TrackRaceBoatCompetitorMetadataReplicationTest extends AbstractServ @Test public void testStartTrackingRaceReplication() throws Exception { final String boat1CompetitorName = "CYC"; - final String boat1Name = "Boot 1"; - final String boat1Color = "#FF0000"; + final String boat1Name = "Boot 1"; + final String boat1Color = "#141414"; final String boat2CompetitorName = "SVI"; - final String boat2Name = "Boot 2"; - final String boat2Color = "#FFFF00"; + final String boat2Name = "Boot 2"; + final String boat2Color = "#606060"; final String boat3CompetitorName = "BYCÜ"; - final String boat3Name = "Boot 3"; - final String boat3Color = "#FF00FF"; + final String boat3Name = "Boot 3"; + final String boat3Color = "#0169EF"; startTracking(); Thread.sleep(5000);