Changeset 9 for simplerunner/src/main/java/geniusweb

Timestamp:

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

Author:

bart

Message:

Release 1.1.0

Location:

simplerunner/src/main/java/geniusweb/simplerunner

Files:

• BasicConnection.java (modified) (2 diffs)
• ClassPathConnectionFactory.java (modified) (6 diffs)
• NegoRunner.java (modified) (2 diffs)

simplerunner/src/main/java/geniusweb/simplerunner/BasicConnection.java

@@ -4 +4 @@
 import java.net.URI;
 
-import geniusweb.connection.Connection;
+import geniusweb.connection.ConnectionEnd;
 import geniusweb.references.Reference;
 import tudelft.utilities.listener.DefaultListenable;
@@ -17 +17 @@
  */
 public class BasicConnection<IN, OUT> extends DefaultListenable<IN>
-                implements Connection<IN, OUT> {
+                implements ConnectionEnd<IN, OUT> {
         private final Reference reference;
         private final URI uri;

simplerunner/src/main/java/geniusweb/simplerunner/ClassPathConnectionFactory.java

@@ -13 +13 @@
 import geniusweb.party.Party;
 import geniusweb.party.inform.Inform;
-import geniusweb.protocol.partyconnection.ConnectionWithParty;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.references.Reference;
 import tudelft.utilities.repository.NoResourcesNowException;
@@ -25 +25 @@
  *
  */
-public class ClassPathConnectionFactory implements ConnectionWithPartyFactory {
+public class ClassPathConnectionFactory implements ProtocolToPartyConnFactory {
         private static final String SCHEME = "classpath";
         private static int serialcounter = 1;
@@ -31 +31 @@
 
         @Override
-        public ConnectionWithParty connect(Reference reference) {
+        public ProtocolToPartyConn connect(Reference reference) {
                 // set up the whole other party including the connection to it.
                 String classpath = getClassPath(reference.getURI());
@@ -42 +42 @@
                                 uri("classpath:" + reference.getURI().getSchemeSpecificPart()
                                                 + "." + (serialcounter++)));
-                party2protocol.init(action -> protocol2party.notifyChange(action));
-                protocol2party.init(info -> party2protocol.notifyChange(info));
+                party2protocol.init(action -> protocol2party.notifyListeners(action));
+                protocol2party.init(info -> party2protocol.notifyListeners(info));
 
                 party.connect(party2protocol);
@@ -102 +102 @@
 
         @Override
-        public List<ConnectionWithParty> connect(List<Reference> references)
+        public List<ProtocolToPartyConn> connect(List<Reference> references)
                         throws IOException, NoResourcesNowException {
-                List<ConnectionWithParty> connections = new LinkedList<>();
+                List<ProtocolToPartyConn> connections = new LinkedList<>();
                 for (Reference partyref : references) {
                         connections.add(connect(partyref));
@@ -114 +114 @@
 
 class BasicConnectionWithParty extends BasicConnection<Action, Inform>
-                implements ConnectionWithParty {
+                implements ProtocolToPartyConn {
 
         private PartyId id;

simplerunner/src/main/java/geniusweb/simplerunner/NegoRunner.java

@@ -13 +13 @@
 import geniusweb.protocol.NegoProtocol;
 import geniusweb.protocol.NegoSettings;
-import geniusweb.protocol.partyconnection.ConnectionWithPartyFactory;
+import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
 import geniusweb.protocol.session.SessionSettings;
 import tudelft.utilities.logging.ReportToLogger;
@@ -27 +27 @@
         private final NegoSettings settings;
         private final NegoProtocol protocol;
-        private final ConnectionWithPartyFactory connectionfactory;
+        private final ProtocolToPartyConnFactory connectionfactory;
         private final Reporter log;
         private final static ObjectMapper jackson = new ObjectMapper();
 
         public NegoRunner(NegoSettings settings,
-                        ConnectionWithPartyFactory connectionfactory, Reporter logger) {
+                        ProtocolToPartyConnFactory connectionfactory, Reporter logger) {
                 if (settings == null || connectionfactory == null) {
                         throw new NullPointerException("Arguments must be not null");