before removing chunkReceived and chunkSend interfaces.

Author: thsc

src/net/sharksystem/asp3/ASP3ChunkReader.java

@@ -4,17 +4,17 @@
 import java.io.IOException;
 
 class ASP3ChunkReader implements Runnable {
-    ASP3Reader reader;
     private final DataInputStream dis;
     private final String peer;
     private final String owner;
+    private final ASP3ChunkStorage storage;
 
-    ASP3ChunkReader(ASP3Reader reader, DataInputStream dis, String owner, 
-            String peer) {
-        this.reader = reader;
+    ASP3ChunkReader(DataInputStream dis, String owner, 
+            String peer, ASP3ChunkStorage storage) {
         this.dis = dis;
         this.peer = peer;
         this.owner = owner;
+        this.storage = storage;
     }
 
     private String getLogStart() {
@@ -37,16 +37,51 @@ public void run() {
         System.out.println(b.toString());
         //>>>>>>>>>>>>>>>>>>>debug
 
-        this.reader.newSender(peer);
+        ASP3Storage peerStorage = null;
+        
+        // get received storage
+        peerStorage = this.storage.getReceivedChunkStorage(peer);
+        //<<<<<<<<<<<<<<<<<<debug
+        b = new StringBuilder();
+        b.append(this.getLogStart());
+        b.append("got received chunk storage ");
+        System.out.println(b.toString());
+        //>>>>>>>>>>>>>>>>>>>debug
+       
         try {
-            String chunkUrl = dis.readUTF();
+            String uri = dis.readUTF();
             //<<<<<<<<<<<<<<<<<<debug
             b = new StringBuilder();
             b.append(this.getLogStart());
             b.append("read chunkURI: ");
-            b.append(chunkUrl);
+            b.append(uri);
             System.out.println(b.toString());
             //>>>>>>>>>>>>>>>>>>>debug
+            ASP3Chunk2Send chunk = 
+                    peerStorage.getChunk(uri, storage.getEra());
+            
+            if(chunk != null) {
+                //<<<<<<<<<<<<<<<<<<debug
+                b = new StringBuilder();
+                b.append(this.getLogStart());
+                b.append("got chunk: ");
+                b.append(uri);
+                System.out.println(b.toString());
+                //>>>>>>>>>>>>>>>>>>>debug
+            } else {
+                //<<<<<<<<<<<<<<<<<<debug
+                b = new StringBuilder();
+                b.append(this.getLogStart());
+                b.append("ERROR: no chunk found for sender/uri: ");
+                b.append(peer);
+                b.append(" / ");
+                b.append(uri);
+                System.err.println(b.toString());
+                //>>>>>>>>>>>>>>>>>>>debug
+            }
+
+            ASP3ChunkSerialization.readChunk(chunk, dis);
+            
             for(;;) {
                 // escapes with IOException
                 String message = dis.readUTF();
@@ -58,9 +93,17 @@ public void run() {
                 System.out.println(b.toString());
                 //>>>>>>>>>>>>>>>>>>>debug
 
-                if(this.reader != null) {
-                    this.reader.read(chunkUrl, message);
-                }
+                //<<<<<<<<<<<<<<<<<<debug
+                b = new StringBuilder();
+                b.append(this.getLogStart());
+                b.append("going to write to received chunk: ");
+                b.append(uri);
+                b.append(" / era: ");
+                b.append(storage.getEra());
+                System.out.println(b.toString());
+                //>>>>>>>>>>>>>>>>>>>debug
+
+                chunk.add(message);
             }
         } catch (IOException ex) {
             // done

src/net/sharksystem/asp3/ASP3ChunkSerialization.java

@@ -0,0 +1,73 @@
+package net.sharksystem.asp3;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+
+/**
+ *
+ * @author thsc
+ */
+abstract class ASP3ChunkSerialization {
+    static void sendChunk(ASP3Chunk2Send chunk, DataOutputStream dos)
+            throws IOException {
+        
+        //<<<<<<<<<<<<<<<<<<debug
+        StringBuilder b = new StringBuilder();
+        b.append("send chunk url: ");
+        b.append(chunk.getUri());
+        System.out.println(b.toString());
+        //>>>>>>>>>>>>>>>>>>>debug
+        
+        // send url
+        dos.writeUTF(chunk.getUri());
+
+        Iterator<CharSequence> messages = chunk.getMessages();
+        //<<<<<<<<<<<<<<<<<<debug
+        b = new StringBuilder();
+        b.append("iterate messages ");
+        System.out.println(b.toString());
+        //>>>>>>>>>>>>>>>>>>>debug
+        while(messages.hasNext()) {
+            CharSequence message = messages.next();
+            //<<<<<<<<<<<<<<<<<<debug
+            b = new StringBuilder();
+            b.append("read message from chunk: ");
+            b.append(message);
+            System.out.println(b.toString());
+            //>>>>>>>>>>>>>>>>>>>debug
+            
+            dos.writeUTF((String) message);
+
+            //<<<<<<<<<<<<<<<<<<debug
+            b = new StringBuilder();
+            b.append("wrote message to stream: ");
+            b.append(message);
+            System.out.println(b.toString());
+            //>>>>>>>>>>>>>>>>>>>debug
+
+        }
+        //<<<<<<<<<<<<<<<<<<debug
+        b = new StringBuilder();
+        b.append("stop iterating messages ");
+        System.out.println(b.toString());
+    }
+    
+    static void readChunk(ASP3ChunkReceived chunk, DataInputStream dis)
+            throws IOException {
+        
+        for(;;) {
+            // escapes with IOException
+            String message = dis.readUTF();
+            //<<<<<<<<<<<<<<<<<<debug
+            StringBuilder b = new StringBuilder();
+            b.append("chunk deserialisation read message: ");
+            b.append(message);
+            System.out.println(b.toString());
+            //>>>>>>>>>>>>>>>>>>>debug
+
+            chunk.addReceivedMessage(message);
+        }
+    }
+}

src/net/sharksystem/asp3/ASP3DefaultReader.java

@@ -30,20 +30,12 @@ public abstract class ASP3Engine implements ASP3ChunkStorage, ASP3ProtocolEngine
     protected HashMap<String, Integer> lastSeen = new HashMap<>();
     protected ASP3Memento memento = null;
 
-    private final ASP3Reader reader;
     /* private */ final private ASP3Storage chunkStorage;
 
-    protected ASP3Engine(ASP3Storage chunkStorage, ASP3Reader reader) 
+    protected ASP3Engine(ASP3Storage chunkStorage) 
             throws ASP3Exception, IOException {
 
         this.chunkStorage = chunkStorage;
-        this.reader = reader;
-
-/*        
-        if(reader == null) {
-            throw new ASP3Exception("reader must not be null");
-        }
-        */
     }
 
     ASP3Storage getStorage() {
@@ -129,7 +121,7 @@ public void handleConnection(InputStream is, OutputStream os,
 
             // start reading from remote peer
             Thread readerThread = new Thread(
-                    new ASP3ChunkReader(this.reader, dis, this.owner, peer));
+                    new ASP3ChunkReader(dis, this.owner, peer, this));
 
             readerThread.start();
             //<<<<<<<<<<<<<<<<<<debug
@@ -219,7 +211,7 @@ public void handleConnection(InputStream is, OutputStream os,
                     b.append("send chunk");
                     System.out.println(b.toString());
                     //>>>>>>>>>>>>>>>>>>>debug
-                    this.sendChunk(chunk, dos);
+                    ASP3ChunkSerialization.sendChunk(chunk, dos);
 
                     // remember sent
                     chunk.removeRecipient(peer);
@@ -355,65 +347,6 @@ private synchronized void incrementEra() throws IOException {
         this.chunkStorage.dropChunks(this.era); 
     }
 
-    private void sendChunk(ASP3Chunk2Send chunk, DataOutputStream dos) 
-            throws IOException {
-        
-        //<<<<<<<<<<<<<<<<<<debug
-        StringBuilder b = new StringBuilder();
-        b.append("ASP3Engine (");
-        b.append(this.owner);
-        b.append(")");
-        b.append("send chunk url: ");
-        b.append(chunk.getUri());
-        System.out.println(b.toString());
-        //>>>>>>>>>>>>>>>>>>>debug
-        
-        // send url
-        dos.writeUTF(chunk.getUri());
-
-        Iterator<CharSequence> messages = chunk.getMessages();
-        //<<<<<<<<<<<<<<<<<<debug
-        b = new StringBuilder();
-        b.append("ASP3Engine (");
-        b.append(this.owner);
-        b.append(")");
-        b.append("iterate messages ");
-        System.out.println(b.toString());
-        //>>>>>>>>>>>>>>>>>>>debug
-        while(messages.hasNext()) {
-            CharSequence message = messages.next();
-            //<<<<<<<<<<<<<<<<<<debug
-            b = new StringBuilder();
-            b.append("ASP3Engine (");
-            b.append(this.owner);
-            b.append(")");
-            b.append("read message: ");
-            b.append(message);
-            System.out.println(b.toString());
-            //>>>>>>>>>>>>>>>>>>>debug
-            
-            dos.writeUTF((String) message);
-
-            //<<<<<<<<<<<<<<<<<<debug
-            b = new StringBuilder();
-            b.append("ASP3Engine (");
-            b.append(this.owner);
-            b.append(")");
-            b.append("wrote message: ");
-            b.append(message);
-            System.out.println(b.toString());
-            //>>>>>>>>>>>>>>>>>>>debug
-
-        }
-        //<<<<<<<<<<<<<<<<<<debug
-        b = new StringBuilder();
-        b.append("ASP3Engine (");
-        b.append(this.owner);
-        b.append(")");
-        b.append("stop iterating messages ");
-        System.out.println(b.toString());
-    }
-
     /**
      * We interpret an existing chunk with *no* recipients as
      * public chunk

src/net/sharksystem/asp3/ASP3Engine.java

@@ -18,10 +18,10 @@ public class ASP3EngineFS extends ASP3Engine {
     private ASP3StorageFS chunkStorageFS;
 
     private ASP3EngineFS(String rootDirectory,
-            ASP3StorageFS chunkStorage, ASP3Reader reader) 
+            ASP3StorageFS chunkStorage) 
         throws ASP3Exception, IOException {
 
-        super(new ASP3StorageFS(rootDirectory), reader);
+        super(new ASP3StorageFS(rootDirectory));
 
         this.rootDirectory = rootDirectory;
     }
@@ -35,7 +35,7 @@ public static ASP3ChunkStorage getASP3ChunkStorage(String owner, String rootDire
             root.mkdirs();
         }
 
-        return ASP3EngineFS.getASP3Engine(owner, rootDirectory, null);
+        return ASP3EngineFS.getASP3Engine(owner, rootDirectory);
 
     }
 
@@ -49,18 +49,6 @@ public static ASP3ChunkStorage getASP3ChunkStorage(String rootDirectory)
     public static ASP3Engine getASP3Engine(String owner, String rootDirectory) 
             throws IOException, ASP3Exception {
 
-        ASP3DefaultReader reader = new ASP3DefaultReader();
-        ASP3Engine engine = ASP3EngineFS.getASP3Engine(owner, rootDirectory, reader);
-        
-        reader.setEngine(engine);
-        
-        return engine;
-        
-    }
-    
-    public static ASP3Engine getASP3Engine(String owner, String rootDirectory, 
-            ASP3Reader reader) throws IOException, ASP3Exception {
-        
         // root directory must exist when setting up an engine
         File root = new File(rootDirectory);
         if(!root.exists() || !root.isDirectory()) {
@@ -69,8 +57,7 @@ public static ASP3Engine getASP3Engine(String owner, String rootDirectory,
 
         ASP3EngineFS engine = new ASP3EngineFS(
                 rootDirectory, 
-                new ASP3StorageFS(rootDirectory),
-                reader);
+                new ASP3StorageFS(rootDirectory));
 
 
         ASP3EngineFS.ASP3MementoFS mementoFS = engine.getMemento(rootDirectory);
@@ -96,10 +83,10 @@ public static ASP3Engine getASP3Engine(String owner, String rootDirectory,
         return engine;
     }
 
-    public static ASP3Engine getASP3Engine(String rootDirectory, ASP3Reader reader) 
+    public static ASP3Engine getASP3Engine(String rootDirectory) 
             throws IOException, ASP3Exception {
 
-        return ASP3EngineFS.getASP3Engine(null, rootDirectory, reader);
+        return ASP3EngineFS.getASP3Engine(null, rootDirectory);
 
     }
 
@@ -111,7 +98,8 @@ private ASP3EngineFS.ASP3MementoFS getMemento(String rootDirectory) {
 
     @Override
     public ASP3Storage getReceivedChunkStorage(CharSequence sender) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        String dir = this.rootDirectory + "/" + sender;
+        return new ASP3StorageFS(dir);
     }
 
     class ASP3MementoFS implements ASP3Memento {