From ef312846ef0349792024bfc7a400549eab9d5de3 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 6 Mar 2018 09:44:53 +0100 Subject: [PATCH 1/3] fixed formatting Change-Id: Ie88c0bc49e2f5cb8a8076309f6c3b4e985f1c327 --- .../sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c9fa97ea132..a957da9f7b4 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 @@ -45,7 +45,7 @@ public abstract class AbstractLeaderboardDTO implements Serializable { public Set getBoatClasses() { Set result = new HashSet(); - if(rows != null) { + if (rows != null) { for (CompetitorDTO competitor : rows.keySet()) { result.add(competitor.getBoatClass()); } From 13ef40bf5b072c595b7760dfa63739799c10cf23 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 6 Mar 2018 09:48:25 +0100 Subject: [PATCH 2/3] added getDominantBoatClass() on AbstractleaderboardDTO Change-Id: Ib114fe2575aa27e2ea554be31e24343d8d56c268 --- .../common/dto/AbstractLeaderboardDTO.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 a957da9f7b4..2952cb1e629 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; @@ -44,13 +45,23 @@ public abstract class AbstractLeaderboardDTO implements Serializable { } public Set getBoatClasses() { - Set result = new HashSet(); + 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() { From ac309e52a0c4785442ef4235e037bdbd764a03c4 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 6 Mar 2018 16:29:23 +0100 Subject: [PATCH 3/3] fixed test case after TracTrac adjusted historic Bundesliga metadata Change-Id: Ife54f3d2ac7dbe449af7d504dfcd86ded1a0adc1 --- ...aceBoatCompetitorMetadataReplicationTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 7f5f9f0ae77..ac4aca81dc8 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 @@ -99,16 +99,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); @@ -147,8 +147,8 @@ public class TrackRaceBoatCompetitorMetadataReplicationTest extends AbstractServ assertNotNull(replicaBoat); assertEquals(masterBoat.getName(), replicaBoat.getName()); assertEquals(masterBoat.getColor(), replicaBoat.getColor()); - assertEquals(replicaBoat.getName(), expectedBoatName); - assertEquals(replicaBoat.getColor().getAsHtml(), expectedBoatColor); + assertEquals(expectedBoatName, replicaBoat.getName()); + assertEquals(expectedBoatColor, replicaBoat.getColor().getAsHtml()); } private Competitor findCompetitor(Iterable competitors, Competitor otherCompetitor) {