working on better integration in SNM.

Author: thsc42

makeASAPHubJar.sh

@@ -1,4 +1,4 @@
-cd target/classes/
+cd out/production/main/
 jar -cvf ASAPHub.jar net
-mv ASAPHub.jar ../../ASAPHub.jar
-cd ../../
+mv ASAPHub.jar ../../../ASAPHub.jar
+cd ../../../

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

@@ -26,10 +26,6 @@ public abstract class BasicHubConnectionManager implements HubConnectionManager
 
     private long lastSync = System.currentTimeMillis();
 
-    public long getLastSyncTime() {
-        return this.lastSync;
-    }
-
     /**
      * Hub manager can be asked to connect to or disconnect from hubs. We send a list of hubs which are to be
      * connected. Connection establishment can take a while, though. It is a wish list on application side for a while.

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

@@ -19,10 +19,16 @@ public interface HubConnectionManager extends NewHubConnectionListenerManagement
 
     /**
      *
-     * @return time when last sync with hubs happened.
+     * @return time when last sync with hubs happened. Is -1 if never synced
      */
     long getLastSyncTime();
 
+    /**
+     * Force a new synchronization with all connected hubs. Use this method carefully. We do not want
+     * to produce unnecessary traffic.
+     */
+    void forceSync();
+
     /**
      * Connect a hub
      * @param hcd Hub description

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

@@ -67,6 +67,17 @@ public void removeNewConnectedHubListener(NewHubConnectedListener connectedHubLi
         }
     }
 
+    public long getLastSyncTime() {
+        if(this.hubManager == null) return -1;
+        return this.hubManager.getLastSynchedWithConnectedHubs();
+    }
+
+    public void forceSync() {
+        if(this.hubManager != null) {
+            this.hubManager.forceSyncWithHubs();
+        }
+    }
+
     public HubConnectionManagerImpl(
             ASAPEncounterManager encounterManager, ASAPPeer asapPeer, int waitIntervalInSeconds) {
         this.asapPeer = asapPeer;

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

@@ -84,10 +84,10 @@ public void removeHub(HubConnector hubConnector) {
      */
     private void forceNewRound() {
         if(this.alarmClock != null) {
-            Log.writeLog(this, this.toString(), "kill old alarm");
+            //Log.writeLog(this, this.toString(), "kill old alarm");
             this.alarmClock.kill();
         }
-        Log.writeLog(this, this.toString(), "set new alarm");
+        //Log.writeLog(this, this.toString(), "set new alarm");
         this.alarmClock = new AlarmClock(forceNewRoundWaitingPeriod, FORCE_NEW_ROUND_KEY, this);
         this.alarmClock.start();
     }
@@ -260,14 +260,21 @@ public void forceSyncWithHubs() {
 
     private boolean managerThreadStopped = false;
 
+    private long lastSyncStatusWithConnectedHubs = -1;
+
+    public long getLastSynchedWithConnectedHubs() {
+        return this.lastSyncStatusWithConnectedHubs;
+    }
+
     @Override
     public void run() {
         this.managerThread = Thread.currentThread();
         Log.writeLog(this, this.toString(), "hub manager thread started");
 
         while (!this.managerThreadStopped) {
-            Log.writeLog(this, this.toString(),"start a new round");
+            Log.writeLog(this, this.toString(),"start a new sync round");
 
+            this.lastSyncStatusWithConnectedHubs = System.currentTimeMillis();
             for(HubConnector hubConnector : this.hubConnectors) {
                 Log.writeLog(this, this.toString(), "check hub connection");
                 hubConnector.addStatusListener(this);
@@ -288,7 +295,7 @@ public void run() {
                 Thread.sleep(sleepingTime);
             } catch (InterruptedException e) {
                 if(!this.managerThreadStopped) {
-                    Log.writeLog(this, this.toString(), "interrupted - make next round earlier");
+                    Log.writeLog(this, this.toString(), "interrupted - make next sync round now");
                 }
             }
         }

src/main/main.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="ASAPJava" level="project" />
+    <orderEntry type="module" module-name="test" />
+  </component>
+</module>

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

@@ -13,9 +13,6 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 
 import static net.sharksystem.hub.TestConstants.*;

src/test/test.iml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="ASAPJava" level="project" />
+    <orderEntry type="module" module-name="main" />
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13.1/junit-4.13.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13.1/junit-4.13.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>