Changeset 9 for protocol/src/main

Timestamp:

11/28/19 14:40:48 (5 years ago)

Author:

bart

Message:

Release 1.1.0

Location:

protocol/src/main/java/geniusweb/protocol

Files:

• NegoProtocol.java (modified) (2 diffs)
• partyconnection/ProtocolToPartyConn.java (added)
• partyconnection/ProtocolToPartyConnFactory.java (added)
• partyconnection/ProtocolToPartyConnections.java (added)
• session/DefaultSessionState.java (modified) (5 diffs)
• session/saop/SAOP.java (modified) (8 diffs)
• session/saop/SAOPState.java (modified) (5 diffs)
• tournament/allpermutations/AllPermutationsProtocol.java (modified) (4 diffs)

protocol/src/main/java/geniusweb/protocol/NegoProtocol.java

@@ -10 +10 @@
 import geniusweb.events.CurrentState;
 import geniusweb.events.ProtocolEvent;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -70 +70 @@
          * 
          * 
-         * @param connectionfactory the {@link ConnectionWithPartyFactory} that allows
+         * @param connectionfactory the {@link ProtocolToPartyConnFactory} that allows
          *                          the protocol to connect with the {@link Reference}s
          *                          in the settings
          */
-        void start(ConnectionWithPartyFactory connectionfactory);
+        void start(ProtocolToPartyConnFactory connectionfactory);
 
         /**

protocol/src/main/java/geniusweb/protocol/session/DefaultSessionState.java

@@ -10 +10 @@
 import geniusweb.progress.Progress;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
 import geniusweb.references.PartyWithProfile;
 
@@ -19 +19 @@
         private final List<Action> actions;
 
-        private final transient ConnectionWithParties connections;
+        private final transient ProtocolToPartyConnections connections;
 
         private final Progress progress;
@@ -60 +60 @@
          */
         public DefaultSessionState(List<Action> actions,
-                        ConnectionWithParties conns, Progress progr,
+                        ProtocolToPartyConnections conns, Progress progr,
                         SessionSettings settings,
                         Map<PartyId, PartyWithProfile> partyprofiles, ProtocolException e) {
@@ -67 +67 @@
                 }
                 if (conns == null) {
-                        this.connections = new ConnectionWithParties(
+                        this.connections = new ProtocolToPartyConnections(
                                         Collections.EMPTY_LIST);
                 } else {
@@ -92 +92 @@
          * @return existing connections.
          */
-        public ConnectionWithParties getConnections() {
+        public ProtocolToPartyConnections getConnections() {
                 return connections;
         }

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

@@ -23 +23 @@
 import geniusweb.protocol.CurrentNegoState;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -95 +95 @@
         @Override
         public synchronized void start(
-                        ConnectionWithPartyFactory connectionfactory) {
+                        ProtocolToPartyConnFactory connectionfactory) {
 
                 try {
@@ -151 +151 @@
          */
         protected synchronized void connect(
-                        ConnectionWithPartyFactory connectionfactory)
+                        ProtocolToPartyConnFactory connectionfactory)
                         throws InterruptedException, IOException {
                 List<PartyWithProfile> participants = state.getSettings()
@@ -158 +158 @@
                                 .map(parti -> (parti.getParty().getPartyRef()))
                                 .collect(Collectors.toList());
-                List<ConnectionWithParty> connections = null;
+                List<ProtocolToPartyConn> connections = null;
                 log.log(Level.INFO, "SAOP connect " + parties);
                 while (connections == null) {
@@ -218 +218 @@
          */
         protected synchronized void setupParties() throws ProtocolException {
-                for (ConnectionWithParty conn : state.getConnections()) {
+                for (ProtocolToPartyConn conn : state.getConnections()) {
                         conn.addListener(action -> actionRequest(conn, action));
                 }
 
-                for (ConnectionWithParty connection : state.getConnections()) {
+                for (ProtocolToPartyConn connection : state.getConnections()) {
                         try {
                                 sendSettings(connection);
@@ -239 +239 @@
          * @throws IOException if party got disconnected
          */
-        private synchronized void sendSettings(ConnectionWithParty connection)
+        private synchronized void sendSettings(ProtocolToPartyConn connection)
                         throws IOException {
                 PartyId partyid = connection.getParty();
@@ -261 +261 @@
          */
         protected synchronized void actionRequest(
-                        final ConnectionWithParty partyconn, final Action action) {
+                        final ProtocolToPartyConn partyconn, final Action action) {
                 if (action == null) {
-                        handleError(partyconn
-                                        + " did null action, breaching the protocol. Closing session",
-                                        partyconn.getParty().getName(), null);
+                        Throwable err = partyconn.getError();
+                        if (err == null) {
+                                err = new ProtocolException("Party sent a null action",
+                                                partyconn.getParty().getName());
+                        }
+                        handleError(partyconn + "Protocol error",
+                                        partyconn.getParty().getName(), err);
                         return;
                 }
@@ -348 +352 @@
                         return;
                 Inform finished = new Finished(state.getAgreement());
-                for (ConnectionWithParty conn : state.getConnections()) {
+                for (ProtocolToPartyConn conn : state.getConnections()) {
                         sendFinish(conn, finished);
                 }
-                notifyChange(new CurrentNegoState(state));
-        }
-
-        private void sendFinish(ConnectionWithParty connection, Inform finished) {
+                notifyListeners(new CurrentNegoState(state));
+        }
+
+        private void sendFinish(ProtocolToPartyConn connection, Inform finished) {
                 try {
                         connection.send(finished);

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

@@ -16 +16 @@
 import geniusweb.progress.ProgressRounds;
 import geniusweb.protocol.ProtocolException;
-import geniusweb.protocol.partyconnection.ConnectionWithParties;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnections;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.session.DefaultSessionState;
 import geniusweb.protocol.session.SessionSettings;
@@ -42 +42 @@
          *                      occurred.
          */
-        public SAOPState(List<Action> actions, ConnectionWithParties conns,
+        public SAOPState(List<Action> actions, ProtocolToPartyConnections conns,
                         Progress progress, SessionSettings settings,
                         Map<PartyId, PartyWithProfile> partyprofiles, ProtocolException e) {
@@ -55 +55 @@
         public SAOPState(SAOPSettings settings) {
                 this(Collections.emptyList(),
-                                new ConnectionWithParties(Collections.emptyList()), null,
+                                new ProtocolToPartyConnections(Collections.emptyList()), null,
                                 settings, null, null);
 
@@ -82 +82 @@
         /**
          * 
-         * @param connection   the new {@link ConnectionWithParty}
+         * @param connection   the new {@link ProtocolToPartyConn}
          * @param partyprofile the {@link PartyWithProfile} that is associated with
          *                     this state
@@ -91 +91 @@
          *         state currently indicate if that already happened or not.
          */
-        public SAOPState with(ConnectionWithParty connection,
+        public SAOPState with(ProtocolToPartyConn connection,
                         PartyWithProfile partyprofile) {
                 // Only called from the SAOP initialization phase.
-                ConnectionWithParties newconns = getConnections().with(connection);
+                ProtocolToPartyConnections newconns = getConnections().with(connection);
                 Map<PartyId, PartyWithProfile> newprofiles = new HashMap<>(
                                 getPartyProfiles());

protocol/src/main/java/geniusweb/protocol/tournament/allpermutations/AllPermutationsProtocol.java

@@ -7 +7 @@
 import geniusweb.protocol.CurrentNegoState;
 import geniusweb.protocol.SessionResult;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionProtocol;
 import geniusweb.protocol.session.SessionSettings;
@@ -29 +29 @@
         private final transient Reporter log;
 
-        private ConnectionWithPartyFactory connectionFactory; // FINAL
+        private ProtocolToPartyConnFactory connectionFactory; // FINAL
         private AllPermutationsState state; // MUTABLE
 
@@ -45 +45 @@
 
         @Override
-        public void start(ConnectionWithPartyFactory connectionfactory) {
+        public void start(ProtocolToPartyConnFactory connectionfactory) {
                 this.connectionFactory = connectionfactory;
-                notifyChange(new TournamentStarted(state.getSize().longValue()));
+                notifyListeners(new TournamentStarted(state.getSize().longValue()));
                 startNextSession();
         }
@@ -85 +85 @@
                                                 sessionstate.getAgreement(), sessionstate.getError());
                                 state = state.with(result);
-                                notifyChange(new CurrentNegoState(state));
+                                notifyListeners(new CurrentNegoState(state));
                                 if (!state.isFinal(now)) {
                                         startNextSession();