working on better hub integration in shark messenger.

Author: thsc42

src/main/java/net/sharksystem/hub/HubConnectionManager.java

@@ -1,6 +1,7 @@
 package net.sharksystem.hub;
 
 import net.sharksystem.SharkException;
+import net.sharksystem.hub.peerside.HubConnector;
 import net.sharksystem.hub.peerside.HubConnectorDescription;
 
 import java.io.IOException;
@@ -39,6 +40,14 @@ public interface HubConnectionManager {
     List<HubConnectorDescription> getConnectedHubs();
     List<FailedConnectionAttempt> getFailedConnectionAttempts();
 
+    /**
+     * Produce a hub connector by its description
+     * @param hcd
+     * @return
+     * @throws SharkException if no connection exists
+     */
+    HubConnector getHubConnector(HubConnectorDescription hcd) throws SharkException;
+
     interface FailedConnectionAttempt {
         HubConnectorDescription getHubConnectorDescription();
         long getTimeStamp();

src/main/java/net/sharksystem/hub/HubConnectionManagerImpl.java

@@ -4,6 +4,7 @@
 import net.sharksystem.asap.ASAPEncounterManager;
 import net.sharksystem.asap.ASAPPeer;
 import net.sharksystem.hub.peerside.ASAPHubManagerImpl;
+import net.sharksystem.hub.peerside.HubConnector;
 import net.sharksystem.hub.peerside.HubConnectorDescription;
 
 import java.io.IOException;
@@ -33,6 +34,11 @@ public void disconnectHub(HubConnectorDescription hcd) throws SharkException, IO
         this.connectionChanged(hcd, false);
     }
 
+    @Override
+    public HubConnector getHubConnector(HubConnectorDescription hcd) throws SharkException {
+        return this.hubManager.getHubConnector(hcd);
+    }
+
     public HubConnectionManagerImpl(ASAPEncounterManager encounterManager, ASAPPeer asapPeer) {
         this.asapPeer = asapPeer;
         this.hubManager = new ASAPHubManagerImpl(encounterManager);

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

@@ -1,5 +1,6 @@
 package net.sharksystem.hub.peerside;
 
+import net.sharksystem.SharkException;
 import net.sharksystem.asap.ASAPPeer;
 
 import java.util.Collection;
@@ -30,6 +31,14 @@ public interface ASAPHubManager {
      */
     void connectASAPHubs(Collection<HubConnectorDescription> descriptions, ASAPPeer asapPeer, boolean killNotDescribed);
 
+    /**
+     * Produce a hub connector by its description
+     * @param hcd
+     * @return
+     * @throws SharkException if no connection exists
+     */
+    HubConnector getHubConnector(HubConnectorDescription hcd) throws SharkException;
+
     /**
      * Produce a list of running connections. Note: Chronologically order can change after each call.
      * @return

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

@@ -1,5 +1,6 @@
 package net.sharksystem.hub.peerside;
 
+import net.sharksystem.SharkException;
 import net.sharksystem.asap.*;
 import net.sharksystem.hub.Connector;
 import net.sharksystem.utils.AlarmClock;
@@ -126,6 +127,14 @@ public synchronized List<HubConnectorDescription> getRunningConnectorDescription
         return this.runningConnectorDescriptions;
     }
 
+    public HubConnector getHubConnector(HubConnectorDescription hcd) throws SharkException {
+        for(HubConnector runningHc : this.hubConnectors) {
+            if(runningHc.isSame(hcd)) return runningHc;
+        }
+
+        throw new SharkException("no connection to described hub available");
+    }
+
     public void connectASAPHubs(Collection<HubConnectorDescription> descriptions,
                                 ASAPPeer asapPeer, boolean killNotDescribed) {
         // for each description

src/main/java/net/sharksystem/hub/peerside/HubTester.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;

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

@@ -4,10 +4,9 @@
 import net.sharksystem.asap.ASAPEncounterManagerImpl;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.apps.testsupport.ASAPTestPeerFS;
-import net.sharksystem.asap.engine.ASAPEngineFS;
+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;