Changeset 10 for protocol/src/main/java/geniusweb/protocol/session/saop/SAOPSettings.java

Timestamp:

01/28/20 10:19:54 (4 years ago)

Author:

bart

Message:

Update 28 jan 2020

File:

• protocol/src/main/java/geniusweb/protocol/session/saop/SAOPSettings.java (modified) (6 diffs)

protocol/src/main/java/geniusweb/protocol/session/saop/SAOPSettings.java

@@ -4 +4 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -11 +12 @@
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
+import geniusweb.protocol.session.TeamOfPartiesAndProfiles;
 import geniusweb.references.PartyWithProfile;
 import tudelft.utilities.logging.Reporter;
 
 public class SAOPSettings implements SessionSettings {
-        private final List<PartyWithProfile> participants;
+        private final List<SaopPartyWithProfile> participants;
         private final Deadline deadline;
 
@@ -28 +30 @@
         @JsonCreator
         public SAOPSettings(
-                        @JsonProperty("participants") List<PartyWithProfile> participants,
+                        @JsonProperty("participants") List<SaopPartyWithProfile> participants,
                         @JsonProperty("deadline") Deadline deadline) {
                 this.participants = participants;
@@ -51 +53 @@
 
         @Override
-        public List<PartyWithProfile> getParticipants() {
+        public List<TeamOfPartiesAndProfiles> getTeams() {
                 return Collections.unmodifiableList(participants);
         }
@@ -60 +62 @@
         public Deadline getDeadline() {
                 return deadline;
+        }
+
+        @Override
+        public List<PartyWithProfile> getAllParties() {
+                return participants.stream()
+                                .map(particip -> particip.getAllParties().get(0))
+                                .collect(Collectors.toList());
         }
 
@@ -101 +110 @@
 
         @Override
-        public SessionSettings with(PartyWithProfile party) {
-                List<PartyWithProfile> newparts = new LinkedList<>(participants);
-                newparts.add(party);
+        public SessionSettings with(TeamOfPartiesAndProfiles party) {
+                if (!(party instanceof SaopPartyWithProfile))
+                        throw new IllegalArgumentException(
+                                        "Added party must be SaopPartyWithProfile but got "
+                                                        + party);
+                List<SaopPartyWithProfile> newparts = new LinkedList<>(participants);
+                newparts.add((SaopPartyWithProfile) party);
                 return new SAOPSettings(newparts, deadline);
         }