produce release compatible with ASAPJava 0.9.0

Author: thsc42

libs/ASAPJava.jar

@@ -313,7 +313,7 @@ public void notifySynced(Connector connector, boolean changed) {
                 Log.writeLog(this, this.toString(), "got peerIDs: " + peerIDs);
                 if (peerIDs != null && !peerIDs.isEmpty()) for (CharSequence peerID : peerIDs) {
                     if (this.asapEncounterManager.shouldCreateConnectionToPeer(
-                            peerID, ASAPEncounterConnectionType.ASAP_HUB)) {
+                            peerID, EncounterConnectionType.ASAP_HUB)) {
                         hubConnector.connectPeer(peerID);
                     }
                 }
@@ -331,7 +331,7 @@ public void notifyPeerConnected(CharSequence targetPeerID, StreamPair streamPair
         try {
             // can be a race condition - this side did not initiate connection establishment
 //            this.asapEncounterManager.handleEncounter(streamPair, ASAPEncounterConnectionType.ASAP_HUB, false);
-            this.asapEncounterManager.handleEncounter(streamPair, ASAPEncounterConnectionType.ASAP_HUB);
+            this.asapEncounterManager.handleEncounter(streamPair, EncounterConnectionType.ASAP_HUB);
         } catch (IOException e) {
             Log.writeLogErr(this, this.toString(), "cannot handle peer encounter: "
                     + e.getLocalizedMessage());

src/main/java/net/sharksystem/hub/peerside/ASAPHubManagerImpl.java

@@ -23,7 +23,7 @@
  */
 public interface HubConnector {
     /**
-     * A hub can asked to provide a list of peer names which are connected right now.
+     * A hub can be asked to provide a list of peer names which are connected right now.
      * @return peer name list - can be empty but not null.
      * @throws IOException communication problem, e.g. not connected to a hub
      */

src/main/java/net/sharksystem/hub/peerside/HubConnector.java

@@ -3,9 +3,9 @@
 import net.sharksystem.SharkException;
 import net.sharksystem.asap.*;
 import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
-import net.sharksystem.fs.FSUtils;
 import net.sharksystem.hub.HubConnectionManager;
 import net.sharksystem.hub.HubConnectionManagerImpl;
+import net.sharksystem.utils.fs.FSUtils;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -28,7 +28,8 @@ public HubTester(String peerId, CharSequence format) throws IOException, SharkEx
         this.asapPeer = new ASAPTestPeerFS(peerId, new ArrayList<>(Collections.singletonList(format)));
         this.format = format;
         this.hubConnectionManager = new HubConnectionManagerImpl(
-                new ASAPEncounterManagerImpl(asapPeer, asapPeer.getPeerID()), asapPeer);
+                new ASAPEncounterManagerImpl(asapPeer),
+                asapPeer);
         printStream = System.out;
     }
 

src/main/java/net/sharksystem/hub/peerside/HubTester.java

@@ -34,7 +34,7 @@ public void setUp() throws Exception {
         localHostHubDescription = new TCPHubConnectorDescriptionImpl("localhost", hubPort, multiChannel);
         ASAPPeerFS asapPeer = new ASAPTestPeerFS(ALICE_ID, Collections.singletonList(FORMAT));
         hubConnectionManager = new HubConnectionManagerImpl(
-                new ASAPEncounterManagerImpl(asapPeer, asapPeer.getPeerID()), asapPeer);
+                new ASAPEncounterManagerImpl(asapPeer), asapPeer);
         asapHub = ASAPTCPHub.startTCPHubThread(hubPort, multiChannel, MAX_IDLE_IN_SECONDS);
     }
 

src/test/java/net/sharksystem/hub/HubConnectionManagerTest.java

@@ -61,7 +61,7 @@ public void test1() throws IOException, SharkException, InterruptedException {
         Thread.sleep(maxTimeOutMillis*2);
 
         // add to hub manager
-        ASAPEncounterManagerImpl asapEncounterManager = new ASAPEncounterManagerImpl(alicePeer, alicePeer.getPeerID());
+        ASAPEncounterManagerImpl asapEncounterManager = new ASAPEncounterManagerImpl(alicePeer);
         ASAPHubManagerImpl asapASAPHubManager = new ASAPHubManagerImpl(asapEncounterManager);
         asapASAPHubManager.setTimeOutInMillis(maxTimeOutMillis);
         asapASAPHubManager.addHub(aliceHubConnector);

src/test/java/net/sharksystem/hub/HubManagerTests.java

@@ -4,9 +4,9 @@
 import net.sharksystem.asap.ASAPEncounterManagerImpl;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
-import net.sharksystem.fs.FSUtils;
 import net.sharksystem.hub.peerside.*;
 import net.sharksystem.hub.hubside.ASAPTCPHub;
+import net.sharksystem.utils.fs.FSUtils;
 import net.sharksystem.utils.testsupport.TestHelper;
 import org.junit.Assert;
 import org.junit.Test;
@@ -210,7 +210,7 @@ public void usageHubManagerAndTwoPeers(boolean multichannel) throws IOException,
         ///////////////////// connect to hub - Alice
         // setup encounter manager with a connection handler
         ASAPEncounterManagerImpl aliceEncounterManager =
-                new ASAPEncounterManagerImpl(aliceASAPPeer, aliceASAPPeer.getPeerID());
+                new ASAPEncounterManagerImpl(aliceASAPPeer);
 
         // setup hub manager
         ASAPHubManager aliceHubManager = ASAPHubManagerImpl.createASAPHubManager(aliceEncounterManager);
@@ -223,7 +223,7 @@ public void usageHubManagerAndTwoPeers(boolean multichannel) throws IOException,
         ///////////////////// connect to hub - Bob
         // setup encounter manager with a connection handler
         ASAPEncounterManagerImpl bobEncounterManager =
-                new ASAPEncounterManagerImpl(bobASAPPeer, bobASAPPeer.getPeerID());
+                new ASAPEncounterManagerImpl(bobASAPPeer);
 
         // setup hub manager
 //        ASAPHubManager bobHubManager = ASAPHubManagerImpl.startASAPHubManager(bobEncounterManager);

src/test/java/net/sharksystem/hub/HubUsageTests.java

@@ -29,7 +29,7 @@ public void setUp() throws Exception {
         hubPort = TestHelper.getPortNumber();
         ASAPPeerFS asapPeer = new ASAPTestPeerFS(ALICE_ID, Collections.singletonList(FORMAT));
         hubConnectionManager = new HubConnectionManagerImpl(
-                new ASAPEncounterManagerImpl(asapPeer, asapPeer.getPeerID()), asapPeer);
+                new ASAPEncounterManagerImpl(asapPeer), asapPeer);
         asapHub = ASAPTCPHub.startTCPHubThread(hubPort, multiChannel, MAX_IDLE_IN_SECONDS);
     }