Changeset 10 for protocol/src/main/java/geniusweb/protocol/session/saop/SAOPState.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/SAOPState.java (modified) (4 diffs)

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

@@ -16 +16 @@
 import geniusweb.progress.ProgressRounds;
 import geniusweb.protocol.ProtocolException;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
-import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.session.DefaultSessionState;
 import geniusweb.protocol.session.SessionSettings;
@@ -61 +61 @@
 
         /**
-         * @param actor         the actor that did this action. Can be used to check
-         *                      if action is valid. NOTICE caller has to make sure
-         *                      the current state is not final.
-         * @param action        the action that was proposed by actor.
-         * @param currentTimeMs the current time in ms since 1970, see
-         *                      {@link System#currentTimeMillis()}
-         * @return new SessionState with the action added as last action.
-         */
-        public SAOPState with(PartyId actor, Action action) {
-                try {
-                        return with1(actor, action);
-                } catch (ProtocolException e) {
-                        List<Action> newactions = new LinkedList<>(getActions());
-                        newactions.add(action);
-                        return new SAOPState(newactions, getConnections(), getProgress(),
-                                        getSettings(), getPartyProfiles(), e);
-                }
-        }
-
-        /**
          * 
          * @param connection   the new {@link ProtocolToPartyConn}
@@ -164 +144 @@
 
         /**
+         * @param actor         the actor that did this action. Can be used to check
+         *                      if action is valid. NOTICE caller has to make sure
+         *                      the current state is not final.
+         * @param action        the action that was proposed by actor.
+         * @param currentTimeMs the current time in ms since 1970, see
+         *                      {@link System#currentTimeMillis()}
+         * @return new SessionState with the action added as last action.
+         */
+
+        public SAOPState with(PartyId actor, Action action) {
+
+                if (actor == null) { // this is a bug
+                        throw new IllegalArgumentException("actor must not be null");
+                }
+                if (!actor.equals(getNextActor())) {
+                        throw new IllegalArgumentException("Party does not have the turn ");
+
+                }
+                if (action == null) {
+                        throw new IllegalArgumentException("action is null");
+                }
+                if (!actor.equals(action.getActor())) {
+                        throw new IllegalArgumentException(
+                                        "act contains wrong credentials: " + action);
+                }
+
+                // check protocol is followed for specific actions
+                if (action instanceof Accept) {
+                        Bid bid = getLastBid();
+                        if (bid == null) {
+                                throw new IllegalArgumentException(
+                                                "Accept without a recent offer");
+                        }
+                        if (!bid.equals(((Accept) action).getBid())) {
+                                throw new IllegalArgumentException(
+                                                "Party accepts a bid differing from the last offer ="
+                                                                + bid + ", action=" + action + ")");
+                        }
+                } else if (action instanceof Offer) {
+                        // offer is always fine. We don't check if bid is actually in domain
+                        // or complete etc. We would need domain for that
+                } else if (action instanceof EndNegotiation) {
+                        // just act, we will get into the final state then.
+                } else {
+                        throw new IllegalArgumentException(
+                                        "Action " + action + " is not allowed in SAOP");
+                }
+
+                List<Action> newactions = new LinkedList<>(getActions());
+                newactions.add(action);
+                return new SAOPState(newactions, getConnections(), advanceProgress(),
+                                getSettings(), getPartyProfiles(), null);
+        }
+
+        /**
          * Check up to nparticipants-1 steps back if there was an offer.
          * 
@@ -182 +217 @@
         }
 
-        private SAOPState with1(PartyId actor, Action action)
-                        throws ProtocolException {
-
-                if (actor == null) { // this is a bug
-                        throw new IllegalArgumentException("actor must not be null");
-                }
-                if (!actor.equals(getNextActor())) {
-                        throw new ProtocolException("Party does not have the turn ",
-                                        actor.getName());
-
-                }
-                if (action == null) {
-                        throw new ProtocolException("action is null", actor.getName());
-                }
-                if (!actor.equals(action.getActor())) {
-                        throw new ProtocolException(
-                                        "act contains wrong credentials: " + action,
-                                        actor.getName());
-                }
-
-                // check protocol is followed for specific actions
-                if (action instanceof Accept) {
-                        Bid bid = getLastBid();
-                        if (bid == null) {
-                                throw new ProtocolException("Accept without a recent offer",
-                                                actor.getName());
-                        }
-                        if (!bid.equals(((Accept) action).getBid())) {
-                                throw new ProtocolException(
-                                                "Party accepts a bid differing from the last offer ="
-                                                                + bid + ", action=" + action + ")",
-                                                actor.getName());
-                        }
-                } else if (action instanceof Offer) {
-                        // offer is always fine. We don't check if bid is actually in domain
-                        // or complete etc. We would need domain for that
-                } else if (action instanceof EndNegotiation) {
-                        // just act, we will get into the final state then.
-                } else {
-                        throw new ProtocolException(
-                                        "Action " + action + " is not allowed in SAOP",
-                                        actor.getName());
-                }
-
-                List<Action> newactions = new LinkedList<>(getActions());
-                newactions.add(action);
-                return new SAOPState(newactions, getConnections(), advanceProgress(),
-                                getSettings(), getPartyProfiles(), null);
-        }
-
         /**
          *