log messages slightly changed

Author: thsc42

src/main/java/net/sharksystem/asap/ASAPEncounterManagerAdmin.java

@@ -58,7 +58,7 @@ public interface ASAPEncounterManagerAdmin {
      * Cancel a connection to a peer. This method call does not change the deny list.
      * @param peerID
      */
-    void cancelConnection(CharSequence peerID);
+    void closeEncounter(CharSequence peerID);
 
 
     /**

src/main/java/net/sharksystem/asap/ASAPEncounterManagerImpl.java

@@ -324,7 +324,7 @@ private boolean solveRaceCondition(StreamPair streamPair, boolean connectionInit
     @Override
     public synchronized void asapConnectionStarted(String remotePeerName, ASAPConnection connection) {
         CharSequence peerID = connection.getEncounteredPeer();
-        Log.writeLog(this, this.toString(), "new ASAP session: " + connection);
+        Log.writeLog(this, this.toString(), "new ASAP encounter: " + connection);
 
         CharSequence streamPairID = this.openASAPConnections.get(connection);
         if(PeerIDHelper.sameID(streamPairID, peerID)) {
@@ -345,7 +345,7 @@ public synchronized void asapConnectionStarted(String remotePeerName, ASAPConnec
 
     @Override
     public synchronized void asapConnectionTerminated(Exception terminatingException, ASAPConnection connection) {
-        Log.writeLog(this, this.toString(), "terminated: " + connection);
+        Log.writeLog(this, this.toString(), "encounter terminated: " + connection);
         CharSequence peerID = connection.getEncounteredPeer();
 
         CharSequence peerIDOrAddress = this.openASAPConnections.get(connection);
@@ -456,7 +456,7 @@ public ASAPEncounterConnectionType getConnectionType(CharSequence peerID) throws
     }
 
     @Override
-    public void cancelConnection(CharSequence peerID) {
+    public void closeEncounter(CharSequence peerID) {
         StreamPair stream2Close = this.openStreamPairs.get(peerID);
         if(stream2Close != null) {
             stream2Close.close();

src/main/java/net/sharksystem/asap/engine/ASAPInternalPeerFS.java

@@ -461,11 +461,11 @@ public Set<CharSequence> getOnlinePeers() {
     }
 
     @Override
-    public void asapConnectionStarted(String remotePeerName, ASAPConnection thread) {
-        if(thread == null) {
+    public void asapConnectionStarted(String remotePeerName, ASAPConnection asapConnection) {
+        if(asapConnection == null) {
             StringBuilder sb = new StringBuilder();
             sb.append(this.getLogStart());
-            sb.append("asap connection started but thread terminated cannot be null - do nothing");
+            sb.append("asap connection started but asapConnection terminated cannot be null - do nothing");
             Log.writeLogErr(this,sb.toString());
             return;
         }
@@ -484,28 +484,28 @@ public void asapConnectionStarted(String remotePeerName, ASAPConnection thread)
         sb.append(remotePeerName);
         Log.writeLog(this, sb.toString());
 
-        this.connectedThreads.put(remotePeerName, thread);
-        this.threadPeerNames.put(thread, remotePeerName);
+        this.connectedThreads.put(remotePeerName, asapConnection);
+        this.threadPeerNames.put(asapConnection, remotePeerName);
         this.notifyOnlinePeersChangedListener();
     }
 
     @Override
-    public synchronized void asapConnectionTerminated(Exception terminatingException, ASAPConnection thread) {
-        if(thread == null) {
+    public synchronized void asapConnectionTerminated(Exception terminatingException, ASAPConnection asapConnection) {
+        if(asapConnection == null) {
             StringBuilder sb = new StringBuilder();
             sb.append(this.getLogStart());
             sb.append("terminated connection cannot be null - do nothing");
             Log.writeLogErr(this, sb.toString());
             return;
         }
 
-        // get thread name
-        CharSequence peerName = this.threadPeerNames.remove(thread);
+        // get asapConnection name
+        CharSequence peerName = this.threadPeerNames.remove(asapConnection);
         this.connectedThreads.remove(peerName);
 
         StringBuilder sb = new StringBuilder();
         sb.append(this.getLogStart());
-        sb.append("thread terminated connected to: ");
+        sb.append("asapConnection terminated connected to: ");
 
         if(peerName != null) {
             sb.append(peerName);

src/main/java/net/sharksystem/asap/protocol/ASAPSessionImpl.java

@@ -111,7 +111,7 @@ public void kill() {
     public void kill(Exception e) {
         if(!this.terminated) {
             this.terminated = true;
-            // kill reader - proofed to be useful in a bluetooth environment
+            // kill reader - proved to be useful in a bluetooth environment
             if(this.pduReader != null && this.pduReader.isAlive()) {
                 this.pduReader.interrupt();
             }
@@ -312,6 +312,8 @@ public void run() {
                 }
             }
         }
+
+        // asap session ended
     }
 
     private Thread threadUsingStreams = null;

src/test/java/junit5Tests/release_1/net/sharksystem/asap/LSANEncounterManagerAdminTests.java

@@ -120,7 +120,7 @@ public void testAliceSendsOneMessageConnectionKilled() throws InterruptedExcepti
         this.runAliceBobEncounter();
 
         // kill connection via encounter manager
-        aliceEncounterManager.cancelConnection(TestConstants.BOB_ID);
+        aliceEncounterManager.closeEncounter(TestConstants.BOB_ID);
         // try to send another message
         aliceASAPPeerFS.sendASAPMessage(TestConstants.TEST_APP_FORMAT, TestConstants.URI, TestConstants.MESSAGE_2);
         Thread.sleep(200);