prepare extraction of stream/tcp/fs utils into a separate project

Author: thsc42

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

@@ -1,7 +1,5 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.utils.Helper;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;

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

@@ -1,6 +1,6 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.streams.StreamPair;
+import net.sharksystem.utils.streams.StreamPair;
 
 import java.io.IOException;
 

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

@@ -4,7 +4,7 @@
 import net.sharksystem.asap.protocol.ASAPConnection;
 import net.sharksystem.asap.protocol.ASAPConnectionListener;
 import net.sharksystem.asap.utils.PeerIDHelper;
-import net.sharksystem.streams.StreamPair;
+import net.sharksystem.utils.streams.StreamPair;
 import net.sharksystem.utils.Log;
 
 import java.io.*;

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

@@ -1,7 +1,7 @@
 package net.sharksystem.asap;
 
 import net.sharksystem.asap.engine.*;
-import net.sharksystem.asap.utils.Helper;
+import net.sharksystem.asap.utils.ASAPLogHelper;
 import net.sharksystem.utils.Log;
 
 import java.io.IOException;
@@ -95,7 +95,7 @@ public void chunkStored(String format, String senderE2E, String uri, int era,
         } else {
             this.log("extract messages from chunk and notify listener");
             ASAPMessages receivedMessages =
-                    Helper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolder, era);
+                    ASAPLogHelper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolder, era);
 
             this.chunkAssimilated(receivedMessages, format, senderE2E, uri, era, asapHopList, true);
         }

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

@@ -0,0 +1,37 @@
+package net.sharksystem.asap;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class ASAPUtils {
+    /**
+     *
+     * @param searchSpace list of possible eras
+     * @param fromEra lowest era
+     * @param toEra highest era
+     * @return list of era which are within from and to and also in search space
+     */
+    public static Collection<Integer> getErasInRange(Collection<Integer> searchSpace,
+                                                     int fromEra, int toEra) {
+
+        Collection<Integer> eras = new ArrayList<>();
+
+        // the only trick is to be aware of the cyclic nature of era numbers
+        boolean wrapped = fromEra > toEra; // it reached the era end and started new
+
+        for(Integer era : searchSpace) {
+            if(!wrapped) {
+                //INIT ---- from-> +++++++++++++ <-to ----- MAX (+ fits)
+                if(era >= fromEra && era <= toEra) eras.add(era);
+            } else {
+                // INIT+++++++++<-to ------ from->++++++MAX
+                if(era <= toEra && era >= ASAP.INITIAL_ERA
+                        || era >= fromEra && era <= ASAP.MAX_ERA
+                ) eras.add(era);
+            }
+        }
+
+        return eras;
+
+    }
+}

src/main/java/net/sharksystem/asap/apps/gossip/GossipUI.java

@@ -4,9 +4,10 @@
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPMessages;
 import net.sharksystem.asap.engine.*;
-import net.sharksystem.asap.utils.Helper;
+import net.sharksystem.asap.utils.ASAPLogHelper;
 import net.sharksystem.asap.cmdline.TCPStream;
 import net.sharksystem.asap.cmdline.TCPStreamCreatedListener;
+import net.sharksystem.utils.SerializationHelper;
 
 import java.io.IOException;
 import java.text.DateFormat;
@@ -75,7 +76,7 @@ private void go() {
             String myMessage = "message from " + this.peerName + " at " + df.format(new Date());
 
             // convert to bytes
-            byte[] byteMessage = Helper.str2bytes(myMessage);
+            byte[] byteMessage = SerializationHelper.str2bytes(myMessage);
             this.println("add message");
             exampleApp.add("exampleChannel", byteMessage);
 
@@ -101,14 +102,14 @@ public void chunkStored(String format, String senderE2E, String uri, int era,
                             List<ASAPHop> asapHop) throws IOException {
 
         ASAPMessages receivedMessages =
-                Helper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolderName, era);
+                ASAPLogHelper.getMessagesByChunkReceivedInfos(format, senderE2E, uri, this.rootFolderName, era);
 
         this.println("messages received: " + format + " | " + senderE2E + " | " + uri);
 
         Iterator<byte[]> messages = receivedMessages.getMessages();
         while(messages.hasNext()) {
             byte[] msgBytes = messages.next();
-            String receivedMessage = Helper.bytes2str(msgBytes);
+            String receivedMessage = SerializationHelper.bytes2str(msgBytes);
             this.println("message received: " + receivedMessage);
         };
     }
@@ -119,7 +120,7 @@ private void printReceivedMessages(ASAPMessages asapMessages, List<ASAPHop> asap
         Iterator<byte[]> messages = asapMessages.getMessages();
         while(messages.hasNext()) {
             byte[] msgBytes = messages.next();
-            String receivedMessage = Helper.bytes2str(msgBytes);
+            String receivedMessage = SerializationHelper.bytes2str(msgBytes);
             this.println("message received: " + receivedMessage);
         };
     }

src/main/java/net/sharksystem/asap/cmdline/CmdLineUI.java

@@ -4,6 +4,7 @@
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.engine.ASAPInternalStorage;
 import net.sharksystem.asap.engine.*;
+import net.sharksystem.utils.fs.FSUtils;
 
 import java.io.*;
 import java.util.*;
@@ -603,7 +604,7 @@ public void doCreateASAPMessage(String parameterString) throws ASAPException {
     }
 
     public void doResetASAPStorages() {
-        ASAPEngineFS.removeFolder(PEERS_ROOT_FOLDER);
+        FSUtils.removeFolder(PEERS_ROOT_FOLDER);
         File rootFolder = new File(PEERS_ROOT_FOLDER);
         rootFolder.mkdirs();
 

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

@@ -6,6 +6,7 @@
 import net.sharksystem.asap.ASAPChunkStorage;
 import net.sharksystem.asap.ASAPMessages;
 import net.sharksystem.utils.Log;
+import net.sharksystem.utils.fs.FSUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -135,7 +136,7 @@ public void dropChunks(int era) throws IOException {
         // here comes a Java 6 compatible version - fits to android SDK 23
         String eraPathName = this.rootDirectory + "/" + Integer.toString(era);
 
-        ASAPEngineFS.removeFolder(eraPathName);
+        FSUtils.removeFolder(eraPathName);
     }
 
     @Override

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

@@ -293,41 +293,4 @@ public List<CharSequence> getSender() {
 
         return senderList;
     }
-
-    ////////////////////////////////////////////////////////////////////////////////////////
-    //                                         helper                                     //
-    ////////////////////////////////////////////////////////////////////////////////////////
-
-    public static void removeFolder(String eraPathName) {
-        File dir = new File(eraPathName);
-
-        String[] dirEntries = dir.list();
-
-        if(dirEntries != null) {
-            for(String fileName : dirEntries) {
-                File fileInDir = new File(eraPathName + "/" + fileName);
-                if(fileInDir.isDirectory()) {
-                    ASAPEngineFS.removeFolder(fileInDir.getAbsolutePath());
-                } else {
-                    try {
-                        if(!fileInDir.delete()) {
-                            Log.writeLog(ASAPEngineFS.class,"ASAPEngineFS: cannot delete file (try deleteOnExit):"
-                                    + fileInDir);
-                        }
-                    } catch (RuntimeException e) {
-                        Log.writeLog(ASAPEngineFS.class, "cannot file:" + e.getLocalizedMessage());
-                        // try next
-                    }
-                }
-            }
-        }
-
-        dir.delete();
-        dir.deleteOnExit();
-        try {
-            Thread.sleep(1); // give file system a moment
-        } catch (InterruptedException e) {
-            // nobody wants to know
-        }
-    }
 }

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

@@ -1,6 +1,6 @@
 package net.sharksystem.asap.engine;
 
-import net.sharksystem.asap.ASAPHop;
+import net.sharksystem.asap.ASAPUtils;
 import net.sharksystem.utils.Utils;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPMessages;
@@ -72,7 +72,7 @@ private void syncChunkList() throws IOException {
         Collection<Integer> erasInFolder = Utils.getErasInFolder(this.chunkStorage.getRootDirectory());
         if(erasInFolder.isEmpty()) return;
 
-        Collection<Integer> erasToUse = Utils.getErasInRange(erasInFolder, this.fromEra, this.toEra);
+        Collection<Integer> erasToUse = ASAPUtils.getErasInRange(erasInFolder, this.fromEra, this.toEra);
         if(erasToUse.isEmpty()) return;
 
         /*