added getSender() to help makan wrapper

Author: thsc42

src/net/sharksystem/aasp/AASPChunkReader.java

@@ -48,7 +48,7 @@ public void run() {
         AASPChunkStorage peerStorage = null;
 
         // get received storage
-        peerStorage = this.storage.getReceivedChunkStorage(peer);
+        peerStorage = this.storage.getIncomingChunkStorage(peer);
         //<<<<<<<<<<<<<<<<<<debug
         b = new StringBuilder();
         b.append(this.getLogStart());

src/net/sharksystem/aasp/AASPEngineFS.java

@@ -2,7 +2,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * AASPEngine that stores data in file system.
@@ -94,11 +96,40 @@ private AASPMementoFS getMemento(String rootDirectory) {
     private HashMap<CharSequence, AASPChunkStorage> storageList = new HashMap<>();
 
     @Override
-    public AASPChunkStorage getReceivedChunkStorage(CharSequence sender) {
+    public AASPChunkStorage getIncomingChunkStorage(CharSequence sender) {
         String dir = this.rootDirectory + "/" + sender;
         return new AASPChunkStorageFS(dir);
     }
 
+    @Override
+    public List<CharSequence> getSender() {
+        List<CharSequence> senderList = new ArrayList<>();
+
+        File dir = new File(this.rootDirectory);
+
+        String[] dirEntries = dir.list();
+
+        if (dirEntries != null) {
+            for (String fileName : dirEntries) {
+                // era folder?
+                try {
+                    Integer.parseInt(fileName);
+                    // a number. It is a era folder go ahead
+                    continue;
+                } catch (NumberFormatException e) {
+                    // no number - that's ok!
+                }
+
+                File fileInDir = new File(this.rootDirectory + "/" + fileName);
+                if (fileInDir.isDirectory()) {
+                    senderList.add(fileName);
+                }
+            }
+        }
+
+        return senderList;
+    }
+
     ////////////////////////////////////////////////////////////////////////////////////////
     //                                         helper                                     //
     ////////////////////////////////////////////////////////////////////////////////////////
@@ -126,5 +157,4 @@ static void removeFolder(String eraPathName) {
 
         dir.delete();
     }
-
 }

src/net/sharksystem/aasp/AASPStorage.java

@@ -129,8 +129,14 @@ public interface AASPStorage {
      * @param sender
      * @return 
      */
-    public AASPChunkStorage getReceivedChunkStorage(CharSequence sender);
-    
+    public AASPChunkStorage getIncomingChunkStorage(CharSequence sender);
+
+    /**
+     *
+     * @return list of peers with an incoming chunk storage
+     */
+    public List<CharSequence> getSender();
+
     /**
      * 
      * @return The local chunk storage that is meant to be used by the local

test/net/sharksystem/aasp/BasicTests.java

@@ -6,6 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 import net.sharksystem.util.localloop.TCPChannel;
 import org.junit.Test;
@@ -24,40 +25,10 @@ public class BasicTests {
     public static final String ALICE2BOB_MESSAGE = "Hi Bob";
     public static final String BOB2ALICE_MESSAGE = "Hi Alice";
 
-    private void removeDirectory(String dirname) {
-        Path dir = Paths.get(dirname);
-        
-        DirectoryStream<Path> entries = null;
-        try {
-            entries = Files.newDirectoryStream(dir);
-        }
-        catch(IOException ioe) {
-            // directory does not exist - ok, nothing to drop
-            return;
-        }
-
-        for (Path path : entries) {
-            File file = path.toFile();
-            if(file.isDirectory()) {
-                this.removeDirectory(file.getAbsolutePath());
-                boolean deleted = file.delete();
-            } else {
-                boolean deleted = file.delete();
-            }
-        }
-        
-        // finally remove directory itself
-        File dirFile = new File(dirname);
-        if(dirFile.exists()) {
-            boolean deleted = dirFile.delete();
-            int i = 42;
-        }
-    }
-    
     @Test
     public void androidUsage() throws IOException, AASPException, InterruptedException {
-       this.removeDirectory(ALICE_FOLDER); // clean previous version before
-       this.removeDirectory(BOB_FOLDER); // clean previous version before
+        AASPEngineFS.removeFolder(ALICE_FOLDER); // clean previous version before
+        AASPEngineFS.removeFolder(BOB_FOLDER); // clean previous version before
 
         // alice writes a message into chunkStorage
         AASPStorage aliceStorage = 
@@ -118,7 +89,7 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
 
         // get message alice received
         AASPChunkStorage aliceSenderStored = 
-                aliceStorage.getReceivedChunkStorage(aliceListener.getSender());
+                aliceStorage.getIncomingChunkStorage(aliceListener.getSender());
 
         AASPChunk aliceReceivedChunk = 
                 aliceSenderStored.getChunk(aliceListener.getUri(), 
@@ -131,7 +102,7 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
 
         // get message bob received
         AASPChunkStorage bobSenderStored = 
-                bobStorage.getReceivedChunkStorage(bobListener.getSender());
+                bobStorage.getIncomingChunkStorage(bobListener.getSender());
 
         AASPChunk bobReceivedChunk = 
                 bobSenderStored.getChunk(bobListener.getUri(), 
@@ -141,5 +112,10 @@ public void androidUsage() throws IOException, AASPException, InterruptedExcepti
                 bobReceivedChunk.getMessages().next();
 
         Assert.assertEquals(ALICE2BOB_MESSAGE, bobReceivedMessage);
+
+        List<CharSequence> senderList = aliceStorage.getSender();
+        // expect bob
+        Assert.assertEquals(1, senderList.size());
+        Assert.assertTrue(BOB.equalsIgnoreCase(senderList.get(0).toString()));
     }
 }