start working on an asap management protocol

Author: thsc42

src/net/sharksystem/asap/MultiASAPEngineFS.java

@@ -1,9 +1,6 @@
 package net.sharksystem.asap;
 
-import net.sharksystem.asap.protocol.ASAPConnection;
-import net.sharksystem.asap.protocol.ASAPConnectionListener;
-import net.sharksystem.asap.protocol.ASAP_PDU_1_0;
-import net.sharksystem.asap.protocol.ThreadFinishedListener;
+import net.sharksystem.asap.protocol.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,7 +19,7 @@
  *
  * That interface hides those different engines.
  */
-public interface MultiASAPEngineFS {
+public interface MultiASAPEngineFS extends ASAPManagementProtocolEngine {
     public static final long DEFAULT_MAX_PROCESSING_TIME = Long.MAX_VALUE;
 
     public ASAPEngine getEngineByFormat(CharSequence format) throws ASAPException, IOException;

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -348,19 +348,53 @@ public void pushInterests(OutputStream os) throws IOException, ASAPException {
         }
     }
 
-    public void handleASAPManagementPDU(ASAP_AssimilationPDU_1_0 asapPDU, ASAP_1_0 protocol,
-                                        InputStream is, OutputStream os) throws ASAPException, IOException {
+    public void handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
+                                        InputStream is) throws ASAPException, IOException {
 
         StringBuilder b = new StringBuilder();
         b.append(this.getLogStart());
         b.append("start processing asap management pdu");
         System.out.println(b.toString());
-        //>>>>>>>>>>>>>>>>>>>debug
+
+        ASAP_AssimilationPDU_1_0 asap_assimilationPDU_1_0 = null;
+        if(asapPDU instanceof ASAP_AssimilationPDU_1_0) {
+            asap_assimilationPDU_1_0 = (ASAP_AssimilationPDU_1_0) asapPDU;
+        } else {
+            b = new StringBuilder();
+            b.append(this.getLogStart());
+            b.append("asap management pdu must be within an assimilate message - got another one / nothing todo");
+            System.out.println(b.toString());
+            return;
+        }
 
         ASAPManagementCreateASAPStoragePDU asapManagementPDU =
-                ASAPManagementProtocolPDU_Impl.parseASAPPDU(asapPDU);
+                ASAPManagementProtocolPDU_Impl.parseASAPPDU(asap_assimilationPDU_1_0);
+
+        CharSequence channelUri = asapManagementPDU.getChannelUri();
+        CharSequence format = asapManagementPDU.getFormat();
+        CharSequence owner = asapManagementPDU.getOwner();
+        List<CharSequence> recipients = asapManagementPDU.getRecipients();
 
+        b = new StringBuilder();
+        b.append(this.getLogStart());
+        b.append("owner: ");
+        b.append(owner);
+        b.append(" | format: ");
+        b.append(format);
+        b.append(" | channelUri: ");
+        b.append(channelUri);
+        b.append(" | #recipients: ");
+        b.append(recipients.size());
+        System.out.println(b.toString());
+
+        // find storage
+        ASAPStorage asapStorage = this.getEngineByFormat(format);
 
+        b = new StringBuilder();
+        b.append(this.getLogStart());
+        b.append("Implementation not yet finished - TODO");
+        b.append(recipients.size());
+        System.out.println(b.toString());
     }
 
     private String getLogStart() {

src/net/sharksystem/asap/protocol/ASAPManagementProtocolEngine.java

@@ -1,22 +1,19 @@
 package net.sharksystem.asap.protocol;
 
-import net.sharksystem.asap.ASAPChunkReceivedListener;
 import net.sharksystem.asap.ASAPException;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 
 public interface ASAPManagementProtocolEngine {
     /**
      * handle asap management pdu
      * @param asapPDU received pdu
      * @param protocol protocol engine
      * @param is inputstream
-     * @param os outputstream - to send data back
      * @throws ASAPException
      * @throws IOException
      */
-    void handleASAPManagementPDU(ASAP_AssimilationPDU_1_0 asapPDU, ASAP_1_0 protocol,
-                                 InputStream is, OutputStream os) throws ASAPException, IOException;
+    void handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
+                                 InputStream is) throws ASAPException, IOException;
 }

src/net/sharksystem/asap/protocol/ASAPPersistentConnection.java

@@ -227,9 +227,16 @@ public void run() {
                 this.setRemotePeer(asappdu.getPeer());
                 // process received pdu
 
-                if(asappdu.getFormat().equalsIgnoreCase(ASAP_1_0.ASAP_MANAGEMENT_FORMAT.toString())) {
+                if(asappdu.getFormat().equalsIgnoreCase(ASAP_1_0.ASAP_MANAGEMENT_FORMAT)) {
                     System.out.println(this.getLogStart()
-                            + "got asap management message - not processed, took remote peer name only");
+                            + "got asap management message - let multiengine handle this one");
+
+                    try {
+                        this.multiASAPEngineFS.handleASAPManagementPDU(asappdu, protocol, is);
+                    } catch (ASAPException | IOException e) {
+                        this.terminate("asap management pdu processing failed", e);
+                        break;
+                    }
                 } else {
                     try {
                         this.executor = new ASAPPDUExecutor(asappdu,

test/net/sharksystem/asap/Point2PointTests.java

@@ -20,12 +20,12 @@
 public class Point2PointTests {
     public static final String ALICE_BOB_CHAT_URL = "content://aliceAndBob.talk";
     public static final String CHAT_FORMAT = "application/x-sn2-makan";
-    public static final String ALICE_ROOT_FOLDER = "tests/alice";
+    public static final String ALICE_ROOT_FOLDER = "tests/Alice";
     public static final String ALICE_APP_FOLDER = ALICE_ROOT_FOLDER + "/appFolder";
-    public static final String BOB_ROOT_FOLDER = "tests/bob";
+    public static final String BOB_ROOT_FOLDER = "tests/Bob";
     public static final String BOB_APP_FOLDER = BOB_ROOT_FOLDER + "/appFolder";
-    public static final String ALICE = "alice";
-    public static final String BOB = "bob";
+    public static final String ALICE = "Alice";
+    public static final String BOB = "Bob";
     public static final String ALICE2BOB_MESSAGE = "Hi Bob";
     public static final String ALICE2BOB_MESSAGE2 = "Hi Bob again";
     public static final String BOB2ALICE_MESSAGE = "Hi Alice";
@@ -105,7 +105,7 @@ public void openMessageExchange() throws IOException, ASAPException, Interrupted
         // wait until communication probably ends
         System.out.flush();
         System.err.flush();
-        Thread.sleep(5000);
+        Thread.sleep(2000);
         System.out.flush();
         System.err.flush();
 
@@ -169,6 +169,8 @@ public void openMessageExchange() throws IOException, ASAPException, Interrupted
         // simulate a sync
         bobStorage = ASAPEngineFS.getASAPStorage(BOB, BOB_APP_FOLDER, CHAT_FORMAT);
         Assert.assertEquals(2, bobStorage.getEra());
+
+        Thread.sleep(1000);
     }
 
     @Test
@@ -240,7 +242,7 @@ public void notOpenMessageChunkExchange() throws IOException, ASAPException, Int
         // wait until communication probably ends
         System.out.flush();
         System.err.flush();
-        Thread.sleep(5000);
+        Thread.sleep(2000);
         System.out.flush();
         System.err.flush();
 
@@ -304,6 +306,8 @@ public void notOpenMessageChunkExchange() throws IOException, ASAPException, Int
         // simulate a sync
         bobStorage = ASAPEngineFS.getASAPStorage(BOB, BOB_APP_FOLDER, CHAT_FORMAT);
         Assert.assertEquals(2, bobStorage.getEra());
+
+        Thread.sleep(1000);
     }
 
     @Test
@@ -392,7 +396,7 @@ public void usageWithImmediateSync() throws IOException, ASAPException, Interrup
         // wait until communication probably ends
         System.out.flush();
         System.err.flush();
-        Thread.sleep(5000);
+        Thread.sleep(2000);
         System.out.flush();
         System.err.flush();
 
@@ -445,6 +449,8 @@ public void usageWithImmediateSync() throws IOException, ASAPException, Interrup
         bobReceivedMessages = bobReceivedChunk.getMessages();
         bobReceivedMessage = bobReceivedMessages.next();
         Assert.assertEquals(ALICE2BOB_MESSAGE2, bobReceivedMessage);
+
+        Thread.sleep(1000);
     }
 
     @Test