added test - test on stable connection even without data exchange - works

Author: thsc42

manifest.mf

@@ -1,3 +1,4 @@
 Manifest-Version: 1.0
 X-COMMENT: Main-Class will be added automatically by build
+Main-Class: net.sharksystem.cmdline.CmdLineUI
 

src/net/sharksystem/asap/ASAPChannel.java

@@ -1,7 +1,5 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.apps.ASAPMessages;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Set;

src/net/sharksystem/asap/ASAPChannelImpl.java

@@ -1,7 +1,5 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.apps.ASAPMessages;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Set;

src/net/sharksystem/asap/ASAPChunk.java

@@ -41,14 +41,14 @@ public interface ASAPChunk {
      * @return iterator of all messages in the chunk
      * @throws IOException
      */
-    Iterator<CharSequence> getMessages() throws IOException;
+    Iterator<CharSequence> getMessagesAsCharSequence() throws IOException;
 
     /**
      *
      * @return iterator of all messages in the chunk
      * @throws IOException
      */
-    Iterator<byte[]> getMessagesAsBytes() throws IOException;
+    Iterator<byte[]> getMessages() throws IOException;
 
     /**
      * remove that chunk.. drop all object references after

src/net/sharksystem/asap/ASAPChunkFS.java

@@ -189,7 +189,7 @@ public void addMessage(InputStream messageByteIS, long length) throws IOExceptio
     }
 
     @Override
-    public Iterator<byte[]> getMessagesAsBytes() throws IOException {
+    public Iterator<byte[]> getMessages() throws IOException {
         return this.getMessagesAsBytesList().iterator();
     }
 
@@ -276,7 +276,7 @@ public CharSequence getExtra(String key) throws IOException {
     }
 
     @Override
-    public Iterator<CharSequence> getMessages() throws IOException {
+    public Iterator<CharSequence> getMessagesAsCharSequence() throws IOException {
         try {
             return new MessageIter(this.getMessagesAsBytesList());
         } catch (FileNotFoundException ex) {

src/net/sharksystem/asap/ASAPChunkReceivedListener.java

@@ -1,5 +1,7 @@
 package net.sharksystem.asap;
 
+import java.io.IOException;
+
 /**
  *
  * @author thsc
@@ -11,5 +13,5 @@ public interface ASAPChunkReceivedListener {
      * @param uri
      * @param era
      */
-    void chunkReceived(String format, String sender, String uri, int era);
+    void chunkReceived(String format, String sender, String uri, int era) throws IOException;
 }

src/net/sharksystem/asap/ASAPChunkStorage.java

@@ -1,7 +1,5 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.apps.ASAPMessages;
-
 import java.io.IOException;
 import java.util.List;
 

src/net/sharksystem/asap/ASAPChunkStorageFS.java

@@ -1,7 +1,6 @@
 package net.sharksystem.asap;
 
 import net.sharksystem.Utils;
-import net.sharksystem.asap.apps.ASAPMessages;
 import net.sharksystem.asap.util.Log;
 
 import java.io.File;

src/net/sharksystem/asap/ASAPEngine.java

@@ -1,6 +1,5 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.apps.ASAPMessages;
 import net.sharksystem.asap.management.ASAPManagementStorage;
 import net.sharksystem.asap.management.ASAPManagementStorageImpl;
 import net.sharksystem.asap.protocol.*;
@@ -164,14 +163,14 @@ public void removeRecipient(CharSequence urlTarget, CharSequence recipient) thro
     }
 
     @Override
-    public void add(CharSequence urlTarget, CharSequence message) throws IOException {
-        this.add(urlTarget, message.toString().getBytes());
+    public void add(CharSequence uri, CharSequence message) throws IOException {
+        this.add(uri, message.toString().getBytes());
     }
 
     @Override
-    public void add(CharSequence urlTarget, byte[] messageAsBytes) throws IOException {
+    public void add(CharSequence uri, byte[] messageAsBytes) throws IOException {
 //        Log.writeLog(this, "reached add(uri, byte[] message");
-        ASAPChunk chunk = this.chunkStorage.getChunk(urlTarget, this.era);
+        ASAPChunk chunk = this.chunkStorage.getChunk(uri, this.era);
 
 //        Log.writeLog(this, "call chunk.addMessage()");
         chunk.addMessage(messageAsBytes);
@@ -184,7 +183,7 @@ public void add(CharSequence urlTarget, byte[] messageAsBytes) throws IOExceptio
             try {
                 Log.writeLog(this, "send online message...");
                 this.asapOnlineMessageSender.sendASAPAssimilateMessage(
-                        this.format, urlTarget, chunk.getRecipients(),
+                        this.format, uri, chunk.getRecipients(),
                         messageAsBytes, this.era);
             } catch (IOException | ASAPException e) {
                 StringBuilder sb = Log.startLog(this);
@@ -363,7 +362,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimiliationPDU,
         //>>>>>>>>>>>>>>>>>>>debug
 
         // get received storage
-        ASAPChunkStorage incomingSenderStorage = this.getIncomingChunkStorage(sender);
+        ASAPChunkStorage incomingSenderStorage = this.getReceivedChunksStorage(sender);
         //<<<<<<<<<<<<<<<<<<debug
         b = new StringBuilder();
         b.append(this.getLogStart());
@@ -552,7 +551,7 @@ public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 prot
 
             for(CharSequence sender : this.getSender()) {
                 System.out.println(this.getLogStart() + "send chunks received from: " + sender);
-                ASAPChunkStorage incomingChunkStorage = this.getIncomingChunkStorage(sender);
+                ASAPChunkStorage incomingChunkStorage = this.getReceivedChunksStorage(sender);
 
                 this.sendChunks(sender, peer, incomingChunkStorage, protocol, workingEra, lastEra, os);
             }
@@ -818,7 +817,7 @@ public void newEra() {
     //                                            Online management                                           //
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public void activateOnlineMessages(MultiASAPEngineFS multiEngine) {
+    public void activateOnlineMessages(ASAPPeer multiEngine) {
         if(this.asapOnlineMessageSender == null) {
             Log.writeLog(this, "created new online message sender");
             this.attachASAPMessageAddListener(new ASAPOnlineMessageSenderEngineSide(multiEngine));

src/net/sharksystem/asap/ASAPEngineFS.java

@@ -173,12 +173,12 @@ private void restoreFromMemento() throws IOException {
     }
 
     @Override
-    public void add(CharSequence urlTarget, byte[] messageAsBytes) throws IOException {
+    public void add(CharSequence uri, byte[] messageAsBytes) throws IOException {
         // always re-read metainformation
         this.restoreFromMemento();
 
         // do the real work
-        super.add(urlTarget, messageAsBytes);
+        super.add(uri, messageAsBytes);
     }
 
     /*
@@ -196,7 +196,7 @@ private ASAPMementoFS getMemento(String rootDirectory) {
     private HashMap<CharSequence, ASAPChunkStorage> storageList = new HashMap<>();
 
     @Override
-    public ASAPChunkStorage getIncomingChunkStorage(CharSequence sender) {
+    public ASAPChunkStorage getReceivedChunksStorage(CharSequence sender) {
         String dir = this.rootDirectory + "/" + sender;
         return new ASAPChunkStorageFS(dir, this.format);
     }
@@ -263,5 +263,10 @@ public static void removeFolder(String eraPathName) {
         }
 
         dir.delete();
+        try {
+            Thread.sleep(1); // give file system a moment
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
     }
 }