implemented an example of a first contact behaviour, see DiscoverPeerAndStartEGChat in test/mock folder

thsc42 · thsc42 · commit 75d198b8f6b3 · 2020-12-11T11:21:27.000+01:00
diff --git a/src/net/sharksystem/asap/apps/ASAPEnvironmentChangesListener.java b/src/net/sharksystem/asap/apps/ASAPEnvironmentChangesListener.java
@@ -1,12 +1,12 @@
 package net.sharksystem.asap.apps;
 
-import java.util.List;
+import java.util.Set;
 
 public interface ASAPEnvironmentChangesListener {
     /**
      * ASAP peers establish connections on their own and usually if possible. This
      * message is called if one or more connections could be established or got lost.
      * @param peerList current list of peer we have a connection to
      */
-    void onlinePeersChanged(List<CharSequence> peerList);
+    void onlinePeersChanged(Set<CharSequence> peerList);
 }
diff --git a/src/net/sharksystem/asap/apps/ASAPSimplePeer.java b/src/net/sharksystem/asap/apps/ASAPSimplePeer.java
@@ -1,7 +1,9 @@
 package net.sharksystem.asap.apps;
 
-public interface ASAPPeerServices extends
+public interface ASAPSimplePeer extends
         ASAPMessageSender,
         ASAPEnvironmentChangesListenerManagement,
         ASAPMessageReceivedListenerManagement
-{}
+{
+    CharSequence getPeerName();
+}
diff --git a/src/net/sharksystem/asap/apps/mock/ASAPBasicAbstractPeer.java b/src/net/sharksystem/asap/apps/mock/ASAPBasicAbstractPeer.java
@@ -2,11 +2,11 @@
 
 import net.sharksystem.asap.apps.ASAPEnvironmentChangesListener;
 import net.sharksystem.asap.apps.ASAPMessageReceivedListener;
-import net.sharksystem.asap.apps.ASAPPeerServices;
+import net.sharksystem.asap.apps.ASAPSimplePeer;
 import net.sharksystem.asap.listenermanager.ASAPEnvironmentChangesListenerManager;
 import net.sharksystem.asap.listenermanager.ASAPMessageReceivedListenerManager;
 
-public abstract class ASAPBasicAbstractPeer implements ASAPPeerServices {
+public abstract class ASAPBasicAbstractPeer implements ASAPSimplePeer {
     protected final CharSequence peerName;
 
     protected ASAPBasicAbstractPeer(CharSequence peerName) {
diff --git a/src/net/sharksystem/asap/apps/mock/ASAPPeerMock.java b/src/net/sharksystem/asap/apps/mock/ASAPPeerMock.java
@@ -4,8 +4,6 @@
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPMessages;
 import net.sharksystem.asap.apps.*;
-import net.sharksystem.asap.listenermanager.ASAPEnvironmentChangesListenerManager;
-import net.sharksystem.asap.listenermanager.ASAPMessageReceivedListenerManager;
 
 import java.util.*;
 
@@ -14,7 +12,7 @@
  * test your applications logic without any fear of ASAP bugs.
  *
  */
-public class ASAPPeerMock extends ASAPBasicAbstractPeer implements ASAPPeerServices {
+public class ASAPPeerMock extends ASAPBasicAbstractPeer implements ASAPSimplePeer {
     public ASAPPeerMock(CharSequence peerName) {
         super(peerName);
     }
@@ -65,6 +63,7 @@ private void startEncounter(ASAPPeerMock otherPeer, boolean callOtherSide) {
 
         // remember this encounter
         this.encounterEra.put(otherPeer.getPeerName(), this.currentEra);
+        this.environmentChangesListenerManager.notifyListeners(this.encounterEra.keySet());
 
         // simulate message sending
         for(int tmpEra = lastMetEra; tmpEra < this.currentEra; tmpEra++) {
@@ -114,7 +113,7 @@ private void notifyMessageReceived() {
         this.notifyMessagesReceived(appUriMessages);
     }
 
-    private CharSequence getPeerName() {
+    public CharSequence getPeerName() {
         return this.peerName;
     }
 
diff --git a/src/net/sharksystem/asap/apps/mock/ASAPSimplePeerFS.java b/src/net/sharksystem/asap/apps/mock/ASAPSimplePeerFS.java
@@ -1,28 +1,29 @@
 package net.sharksystem.asap.apps.mock;
 
 import net.sharksystem.asap.*;
-import net.sharksystem.asap.apps.ASAPPeerServices;
+import net.sharksystem.asap.apps.ASAPMessageReceivedListener;
+import net.sharksystem.asap.apps.ASAPSimplePeer;
+import net.sharksystem.asap.listenermanager.ASAPMessageReceivedListenerManager;
 import net.sharksystem.asap.util.Helper;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.Set;
 
-public class ASAPSimplePeer extends ASAPBasicAbstractPeer implements ASAPPeerServices, ASAPChunkReceivedListener {
+public class ASAPSimplePeerFS extends ASAPBasicAbstractPeer implements ASAPSimplePeer,
+        ASAPChunkReceivedListener, ASAPOnlinePeersChangedListener {
     private final ASAPPeer peer;
     private final String folderName;
     private ServerSocket serverSocket = null;
     private Socket socket = null;
 
-    public ASAPSimplePeer(CharSequence peerName) throws IOException, ASAPException {
+    public ASAPSimplePeerFS(CharSequence peerName) throws IOException, ASAPException {
         super(peerName);
         this.folderName = "./peers/" + peerName;
-        File asapFolder = new File(folderName);
-        if(!asapFolder.exists()) {
-            asapFolder.mkdirs();
-        }
         this.peer = ASAPPeerFS.createASAPPeer(peerName, folderName, this);
+        this.peer.addOnlinePeersChangedListener(this);
     }
 
     @Override
@@ -37,21 +38,20 @@ public void sendASAPMessage(CharSequence appName, CharSequence uri, byte[] messa
         }
     }
 
-
-    public void startEncounter(int port, ASAPSimplePeer otherPeer) throws IOException {
+    public void startEncounter(int port, ASAPSimplePeerFS otherPeer) throws IOException {
         this.serverSocket = new ServerSocket(port);
 
         new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
-                    ASAPSimplePeer.this.socket = ASAPSimplePeer.this.serverSocket.accept();
+                    ASAPSimplePeerFS.this.socket = ASAPSimplePeerFS.this.serverSocket.accept();
                 } catch (IOException e) {
-                    ASAPSimplePeer.this.log("fatal while waiting for client to connect: "
+                    ASAPSimplePeerFS.this.log("fatal while waiting for client to connect: "
                             + e.getLocalizedMessage());
                 }
 
-                ASAPSimplePeer.this.startSession();
+                ASAPSimplePeerFS.this.startSession();
             }
         }).start();
 
@@ -69,7 +69,7 @@ private void connect(int port) throws IOException {
         this.startSession();
     }
 
-    public void stopEncounter(ASAPSimplePeer otherPeer) throws IOException {
+    public void stopEncounter(ASAPSimplePeerFS otherPeer) throws IOException {
         this.socket.close();
     }
 
@@ -78,16 +78,21 @@ private void startSession() {
             @Override
             public void run() {
                 try {
-                    ASAPSimplePeer.this.peer.handleConnection(
-                            ASAPSimplePeer.this.socket.getInputStream(),
-                            ASAPSimplePeer.this.socket.getOutputStream());
+                    ASAPSimplePeerFS.this.peer.handleConnection(
+                            ASAPSimplePeerFS.this.socket.getInputStream(),
+                            ASAPSimplePeerFS.this.socket.getOutputStream());
                 } catch (IOException | ASAPException e) {
-                    ASAPSimplePeer.this.log("fatal while connecting: " + e.getLocalizedMessage());
+                    ASAPSimplePeerFS.this.log("fatal while connecting: " + e.getLocalizedMessage());
                 }
             }
         }).start();
     }
 
+    @Override
+    public CharSequence getPeerName() {
+        return this.peer.getOwner();
+    }
+
     @Override
     public void chunkReceived(String format, String sender, String uri, int era) throws IOException {
         StringBuilder sb = new StringBuilder();
@@ -101,4 +106,9 @@ public void chunkReceived(String format, String sender, String uri, int era) thr
 
         this.asapMessageReceivedListenerManager.notifyReceived(format, receivedMessages, true);
     }
+
+    @Override
+    public void onlinePeersChanged(ASAPPeer engine) {
+        this.environmentChangesListenerManager.notifyListeners(engine.getOnlinePeers());
+    }
 }
diff --git a/src/net/sharksystem/asap/listenermanager/ASAPEnvironmentChangesListenerManager.java b/src/net/sharksystem/asap/listenermanager/ASAPEnvironmentChangesListenerManager.java
@@ -4,6 +4,7 @@
 import net.sharksystem.asap.apps.ASAPEnvironmentChangesListenerManagement;
 
 import java.util.List;
+import java.util.Set;
 
 public class ASAPEnvironmentChangesListenerManager
         extends GenericListenerImplementation<ASAPEnvironmentChangesListener>
@@ -19,9 +20,11 @@ public void removeASAPEnvironmentChangesListener(ASAPEnvironmentChangesListener
         this.removeListener(changesListener);
     }
 
-    public void notifyListeners(List<CharSequence> peerList) {
+    public void notifyListeners(Set<CharSequence> peerList) {
+        if(peerList == null || peerList.isEmpty()) return;
+        if(this.listenerList == null || this.listenerList.isEmpty()) return;
         for(ASAPEnvironmentChangesListener listener : this.listenerList) {
-            listener.onlinePeersChanged(peerList);
+            if(listener != null) listener.onlinePeersChanged(peerList);
         }
     }
 }
diff --git a/test/net/sharksystem/asap/mockAndTemplates/ASAPMessageReceivedListenerExample.java b/test/net/sharksystem/asap/mockAndTemplates/ASAPMessageReceivedListenerExample.java
@@ -1,4 +1,4 @@
-package net.sharksystem.asap.mock;
+package net.sharksystem.asap.mockAndTemplates;
 
 import net.sharksystem.asap.ASAPMessages;
 import net.sharksystem.asap.apps.ASAPMessageReceivedListener;
diff --git a/test/net/sharksystem/asap/mockAndTemplates/ASAPMockUsage.java b/test/net/sharksystem/asap/mockAndTemplates/ASAPMockUsage.java
@@ -1,7 +1,7 @@
-package net.sharksystem.asap.mock;
+package net.sharksystem.asap.mockAndTemplates;
 
 import net.sharksystem.asap.ASAPException;
-import net.sharksystem.asap.apps.ASAPPeerServices;
+import net.sharksystem.asap.apps.ASAPSimplePeer;
 import net.sharksystem.asap.apps.mock.ASAPPeerMock;
 import org.junit.Test;
 
@@ -66,7 +66,7 @@ public void mockUsageExample2() throws IOException, ASAPException, InterruptedEx
         ASAPPeerMock alicePeerMock = new ASAPPeerMock(TestUtils.ALICE);
 
         // use this interface - it's important - same interface can be used for real app in java and android
-        ASAPPeerServices alicePeer = alicePeerMock;
+        ASAPSimplePeer alicePeer = alicePeerMock;
 
         // setup message received listener - this should be replaced with your code - you implement a listener.
         ASAPMessageReceivedListenerExample aliceMessageReceivedListenerExample =
@@ -83,7 +83,7 @@ public void mockUsageExample2() throws IOException, ASAPException, InterruptedEx
         ASAPPeerMock bobPeerMock = new ASAPPeerMock(TestUtils.BOB);
 
         // use this interface - it's important - same interface can be used for real app in java and android
-        ASAPPeerServices bobPeer = bobPeerMock;
+        ASAPSimplePeer bobPeer = bobPeerMock;
 
         // this should be replaced with your code - you must implement a listener.
         ASAPMessageReceivedListenerExample asapMessageReceivedListenerExample =
diff --git a/test/net/sharksystem/asap/mockAndTemplates/DiscoverPeerAndStartEGChat.java b/test/net/sharksystem/asap/mockAndTemplates/DiscoverPeerAndStartEGChat.java
diff --git a/test/net/sharksystem/asap/mockAndTemplates/TestUtils.java b/test/net/sharksystem/asap/mockAndTemplates/TestUtils.java
diff --git a/test/net/sharksystem/asap/mockAndTemplates/UseThisAsTemplate4YourAppTests.java b/test/net/sharksystem/asap/mockAndTemplates/UseThisAsTemplate4YourAppTests.java

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import net.sharksystem.asap.apps.ASAPEnvironmentChangesListenerManagement;`
`5`	`5`
`6`	`6`	`import java.util.List;`
	`7`	`+import java.util.Set;`
`7`	`8`
`8`	`9`	`public class ASAPEnvironmentChangesListenerManager`
`9`	`10`	`extends GenericListenerImplementation<ASAPEnvironmentChangesListener>`
`@@ -19,9 +20,11 @@ public void removeASAPEnvironmentChangesListener(ASAPEnvironmentChangesListener`
`19`	`20`	`this.removeListener(changesListener);`
`20`	`21`	`}`
`21`	`22`
`22`		`- public void notifyListeners(List<CharSequence> peerList) {`
	`23`	`+ public void notifyListeners(Set<CharSequence> peerList) {`
	`24`	`+ if(peerList == null \|\| peerList.isEmpty()) return;`
	`25`	`+ if(this.listenerList == null \|\| this.listenerList.isEmpty()) return;`
`23`	`26`	`for(ASAPEnvironmentChangesListener listener : this.listenerList) {`
`24`		`- listener.onlinePeersChanged(peerList);`
	`27`	`+ if(listener != null) listener.onlinePeersChanged(peerList);`
`25`	`28`	`}`
`26`	`29`	`}`
`27`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.sharksystem.asap.mock;`
	`1`	`+package net.sharksystem.asap.mockAndTemplates;`
`2`	`2`
`3`	`3`	`import net.sharksystem.asap.ASAPMessages;`
`4`	`4`	`import net.sharksystem.asap.apps.ASAPMessageReceivedListener;`