about implementing closed channels and introducing concept of asap management storage

Author: thsc42

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -59,7 +59,7 @@ private void setupFolderMap() throws IOException, ASAPException {
         this.folderMap = new HashMap<>();
         File rootFolder = new File(rootFolderName.toString());
 
-        System.out.println(this.getLogStart() + "iterate subfolder in " + this.rootFolderName);
+        System.out.println(this.getLogStart() + "setting up ASAPEngine based on subfolders in " + this.rootFolderName);
         File[] files = rootFolder.listFiles();
         for (File file : files) {
             if (file.isDirectory()) {
@@ -342,29 +342,33 @@ public ASAPConnection getASAPConnection(CharSequence recipient) {
     public void pushInterests(OutputStream os) throws IOException, ASAPException {
         ASAP_1_0 protocol = new ASAP_Modem_Impl();
 
+        System.out.println(this.getLogStart() + "start sending interest for each engine");
         // issue an interest for each owner / format combination
         for(CharSequence format : this.folderMap.keySet()) {
+            System.out.println(this.getLogStart() + "send interest for app/format: " + format);
             protocol.interest(this.owner, null, format,null, -1, -1, os, false);
         }
     }
 
-    public void handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
-                                        InputStream is) throws ASAPException, IOException {
+    public boolean 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());
 
+        System.out.println(this.getLogStart() + asapPDU);
+
         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");
+            b.append("asap management pdu not an assimilate message - let ordinary engine to the job");
             System.out.println(b.toString());
-            return;
+            return false;
         }
 
         CharSequence owner = asapPDU.getPeer();
@@ -412,17 +416,18 @@ public void handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
                     }
                 }
                 // ok it the same
-                return;
+                return false;
             } else {
                 throw new ASAPException("channel already exists but with different settings");
             }
         }
 
         // else - channel does not exist - create by setting recipients
         asapStorage.createChannel(channelUri, recipients);
+        return false;
     }
 
     private String getLogStart() {
-        return this.getClass().getSimpleName() + ": ";
+        return this.getClass().getSimpleName() + "(" + this.getOwner() + "): ";
     }
 }

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

@@ -13,7 +13,8 @@ public interface ASAPManagementProtocolEngine {
      * @param is inputstream
      * @throws ASAPException
      * @throws IOException
+     * @return true if that pdu was fully executed and no further processing is required
      */
-    void handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
-                                 InputStream is) throws ASAPException, IOException;
+    boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
+                                    InputStream is) throws ASAPException, IOException;
 }

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

@@ -225,22 +225,27 @@ public void run() {
             if(asappdu != null) {
                 System.out.println(this.getLogStart() + "read valid pdu");
                 this.setRemotePeer(asappdu.getPeer());
-                // process received pdu
 
+                // process received pdu
+                boolean pduExecuted = false;
                 if(asappdu.getFormat().equalsIgnoreCase(ASAP_1_0.ASAP_MANAGEMENT_FORMAT)) {
                     System.out.println(this.getLogStart()
-                            + "got asap management message - let multiengine handle this one");
+                            + "got asap management message - let multi-engine handle this one");
 
                     try {
-                        this.multiASAPEngineFS.handleASAPManagementPDU(asappdu, protocol, is);
+                        // if return true - message was handled. No further actions required
+                        pduExecuted = this.multiASAPEngineFS.handleASAPManagementPDU(asappdu, protocol, is);
                     } catch (ASAPException e) {
                         System.err.println("asap management pdu processing failed - go ahead in read/process loop"
                                 + e.getLocalizedMessage());
+                        pduExecuted = false; // failed to execute - forget and go ahead
                     } catch (IOException e) {
                         this.terminate("asap management pdu processing failed", e);
                         break;
                     }
-                } else {
+                }
+
+                if(!pduExecuted) { // not (completely executed by multi engine
                     try {
                         this.executor = new ASAPPDUExecutor(asappdu,
                                             this.is, this.os,

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

@@ -38,6 +38,23 @@ abstract class PDU_Impl implements ASAP_PDU_1_0{
         this.cmd = cmd;
     }
 
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("cmd: ");
+        switch(cmd) {
+            case ASAP_1_0.INTEREST_CMD: sb.append("I"); break;
+            case ASAP_1_0.OFFER_CMD: sb.append("O"); break;
+            case ASAP_1_0.ASSIMILATE_CMD: sb.append("A"); break;
+        }
+        sb.append(" | sender: "); if(peerSet) sb.append(this.peer); else sb.append("X");
+        sb.append(" | format: "); sb.append(format);
+        sb.append(" | channel: "); if(channelSet) sb.append(this.channel); else sb.append("X");
+        sb.append(" | era: "); if(eraSet) sb.append(era); else sb.append("X");
+
+        return sb.toString();
+    }
+
     protected static void sendHeader(byte cmd, int flags, OutputStream os) throws IOException {
         PDU_Impl.sendByteParameter(cmd, os); // mand
         PDU_Impl.sendByteParameter((byte)flags, os); // mand