diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java index 0cd3a72b7e5..347ba1d5e3a 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/LeaderboardGroupBaseImpl.java @@ -14,10 +14,11 @@ public abstract class LeaderboardGroupBaseImpl implements LeaderboardGroupBase { private String displayName; private String description; - public LeaderboardGroupBaseImpl(UUID id, String name, String description) { + public LeaderboardGroupBaseImpl(UUID id, String name, String description, String displayName) { this.id = id; this.name = name; this.description = description; + this.displayName = displayName; } private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/StrippedLeaderboardGroupImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/StrippedLeaderboardGroupImpl.java index 7df0a3d23a8..b97b42187ce 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/StrippedLeaderboardGroupImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/StrippedLeaderboardGroupImpl.java @@ -6,8 +6,8 @@ public class StrippedLeaderboardGroupImpl extends LeaderboardGroupBaseImpl { private static final long serialVersionUID = 7263952130620919924L; private final boolean hasOverallLeaderboard; - public StrippedLeaderboardGroupImpl(UUID id, String name, String description, boolean hasOverallLeaderboard) { - super(id, name, description); + public StrippedLeaderboardGroupImpl(UUID id, String name, String description, String displayName, boolean hasOverallLeaderboard) { + super(id, name, description, displayName); this.hasOverallLeaderboard = hasOverallLeaderboard; } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardGroupImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardGroupImpl.java index 23893df8bcd..7d4a5736602 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardGroupImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardGroupImpl.java @@ -45,8 +45,7 @@ public class LeaderboardGroupImpl extends LeaderboardGroupBaseImpl implements Le */ public LeaderboardGroupImpl(UUID id, String name, String description, String displayName, boolean displayGroupsInReverseOrder, List leaderboards) { - super(id, name, description); - setDisplayName(displayName); + super(id, name, description, displayName); this.displayGroupsInReverseOrder = displayGroupsInReverseOrder; this.leaderboards = new ArrayList(leaderboards); this.listeners = new HashSet(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java index c4b2315c91f..da407f47f20 100755 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EventDataJsonSerializerTest.java @@ -42,7 +42,7 @@ public class EventDataJsonSerializerTest { protected final Venue expectedVenue = new VenueImpl("Expected Venue"); protected final URL expectedOfficialWebsiteURL; protected final URL expectedLogoImageURL; - protected final LeaderboardGroup expectedLeaderbaordGroup = mock(LeaderboardGroup.class); + protected final LeaderboardGroup expectedLeaderboardGroup = mock(LeaderboardGroup.class); protected JsonSerializer venueSerializer; protected EventBaseJsonSerializer serializer; @@ -74,11 +74,12 @@ public class EventDataJsonSerializerTest { serializer = new EventBaseJsonSerializer(new VenueJsonSerializer(new CourseAreaJsonSerializer()), new LeaderboardGroupBaseJsonSerializer()); deserializer = new EventBaseJsonDeserializer(new VenueJsonDeserializer(new CourseAreaJsonDeserializer(DomainFactory.INSTANCE)), new LeaderboardGroupBaseJsonDeserializer()); - when(expectedLeaderbaordGroup.getId()).thenReturn(UUID.randomUUID()); - when(expectedLeaderbaordGroup.getName()).thenReturn("LG"); - when(expectedLeaderbaordGroup.getDescription()).thenReturn("LG Description"); - when(expectedLeaderbaordGroup.hasOverallLeaderboard()).thenReturn(false); - doReturn(Collections.singleton(expectedLeaderbaordGroup)).when(event).getLeaderboardGroups(); + when(expectedLeaderboardGroup.getId()).thenReturn(UUID.randomUUID()); + when(expectedLeaderboardGroup.getName()).thenReturn("LG"); + when(expectedLeaderboardGroup.getDescription()).thenReturn("LG Description"); + when(expectedLeaderboardGroup.getDisplayName()).thenReturn("LG Display Name"); + when(expectedLeaderboardGroup.hasOverallLeaderboard()).thenReturn(false); + doReturn(Collections.singleton(expectedLeaderboardGroup)).when(event).getLeaderboardGroups(); } @Test @@ -118,10 +119,11 @@ public class EventDataJsonSerializerTest { assertEquals(expectedName, deserializedEvent.getName()); assertEquals(expectedStartDate, deserializedEvent.getStartDate()); assertEquals(expectedEndDate, deserializedEvent.getEndDate()); - assertEquals(expectedLeaderbaordGroup.getName(), deserializedEvent.getLeaderboardGroups().iterator().next().getName()); - assertEquals(expectedLeaderbaordGroup.getDescription(), deserializedEvent.getLeaderboardGroups().iterator().next().getDescription()); - assertEquals(expectedLeaderbaordGroup.getId(), deserializedEvent.getLeaderboardGroups().iterator().next().getId()); - assertEquals(expectedLeaderbaordGroup.hasOverallLeaderboard(), deserializedEvent.getLeaderboardGroups().iterator().next().hasOverallLeaderboard()); + assertEquals(expectedLeaderboardGroup.getName(), deserializedEvent.getLeaderboardGroups().iterator().next().getName()); + assertEquals(expectedLeaderboardGroup.getDescription(), deserializedEvent.getLeaderboardGroups().iterator().next().getDescription()); + assertEquals(expectedLeaderboardGroup.getDisplayName(), deserializedEvent.getLeaderboardGroups().iterator().next().getDisplayName()); + assertEquals(expectedLeaderboardGroup.getId(), deserializedEvent.getLeaderboardGroups().iterator().next().getId()); + assertEquals(expectedLeaderboardGroup.hasOverallLeaderboard(), deserializedEvent.getLeaderboardGroups().iterator().next().hasOverallLeaderboard()); } @Test diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/LeaderboardGroupBaseJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/LeaderboardGroupBaseJsonDeserializer.java index 64e66fb2664..efb460f9707 100755 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/LeaderboardGroupBaseJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/LeaderboardGroupBaseJsonDeserializer.java @@ -20,8 +20,10 @@ public class LeaderboardGroupBaseJsonDeserializer implements JsonDeserializer