working on an asap management protocol

Author: thsc42

src/net/sharksystem/asap/ASAPEngine.java

@@ -154,6 +154,11 @@ public List<CharSequence> getChannelURIs() throws IOException {
         return uriList;
     }
 
+    @Override
+    public boolean channelExists(CharSequence uri) throws IOException {
+        return this.chunkStorage.existsChunk(uri, this.getEra());
+    }
+
     public void removeChannel(CharSequence uri) throws IOException {
         ASAPChunk chunk = this.chunkStorage.getChunk(uri, this.getEra());
         chunk.drop();

src/net/sharksystem/asap/ASAPEngineFS.java

@@ -35,7 +35,7 @@ public String getRootFolder() {
     public String getOwner() {
         return this.owner;
     }
-    
+
     public static ASAPEngine getASAPStorage(String owner, String rootDirectory, CharSequence format)
             throws IOException, ASAPException {
 

src/net/sharksystem/asap/ASAPMementoFS.java

@@ -74,12 +74,10 @@ public void restore(ASAPEngine engine) throws IOException {
         DataInputStream dis = new DataInputStream(
                                 new FileInputStream(file));
 
-        engine.owner = dis.readUTF();
-        engine.format = dis.readUTF();
-        engine.era = dis.readInt();
-
-        // from hereon optional values - could work with defaults
         try {
+            engine.owner = dis.readUTF();
+            engine.format = dis.readUTF();
+            engine.era = dis.readInt();
             engine.oldestEra = dis.readInt();
             engine.contentChanged = dis.readBoolean();
             engine.dropDeliveredChunks = dis.readBoolean();

src/net/sharksystem/asap/ASAPStorage.java

@@ -9,7 +9,7 @@
  * That chunk storage is meant to keep messages which are produced by an
  * app for later transmission.
  * 
- * Messages which cannot be sent to their recipients can be stored in AASP chunks.
+ * Messages which cannot be sent to their recipients can be stored in ASAP chunks.
  * Each chunk is addressed with an URI (comparable to URIs e.g. in Android
  * Content Provider)
  * 
@@ -37,8 +37,8 @@
  * changed by the ASAPEngine whenever a peer (re-) connects. In that case, the
  * current era is declared to be finished and an new era is opened. 
  * Any new message is now tagged as message from that new era. The ASAPEngine
- * transmitts all message to the peer which are stored after the final 
- * encounter. If no encounter ever happend - all avaiable messages are 
+ * transmits all message to the peer which are stored after the final
+ * encounter. If no encounter ever happened - allavailablee messages are
  * transmitted. 
  *
  * @see ASAPEngine
@@ -130,6 +130,13 @@ public interface ASAPStorage {
      * @throws IOException 
      */
     public void removeRecipient(CharSequence urlTarget, CharSequence recipients) throws IOException;
+
+    /**
+     *
+     * @param uri channel uri
+     * @return if channel exists - in other words: at least one message was added with this channel uri
+     */
+    boolean channelExists(CharSequence uri) throws IOException;
 
     /**
      * Add a message to that chunk.

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -390,11 +390,34 @@ public void handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
         // 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());
+        if(asapStorage.channelExists(channelUri)) {
+            List<CharSequence> existingChannelRecipientsList = asapStorage.getRecipients(channelUri);
+            if(existingChannelRecipientsList.size() == recipients.size()) {
+                // could be the same - same recipients?
+
+                // iterate all recipient and check whether they are also in local recipient list
+                for(CharSequence recipient : recipients) {
+                    boolean found = false;
+                    for(CharSequence existingRecipient : existingChannelRecipientsList) {
+                        if(existingRecipient.toString().equalsIgnoreCase(recipient.toString())) {
+                            // got it
+                            found = true;
+                            break; // leave loop and test next
+                        }
+                    }
+                    if(!found) {
+                        throw new ASAPException("channel already exists but with different recipients");
+                    }
+                }
+                // ok it the same
+                return;
+            } else {
+                throw new ASAPException("channel already exists but with different settings");
+            }
+        }
+
+        // else - channel does not exist - create by setting recipients
+        asapStorage.setRecipients(channelUri, recipients);
     }
 
     private String getLogStart() {

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

@@ -233,7 +233,10 @@ public void run() {
 
                     try {
                         this.multiASAPEngineFS.handleASAPManagementPDU(asappdu, protocol, is);
-                    } catch (ASAPException | IOException e) {
+                    } catch (ASAPException e) {
+                        System.err.println("asap management pdu processing failed - go ahead in read/process loop"
+                                + e.getLocalizedMessage());
+                    } catch (IOException e) {
                         this.terminate("asap management pdu processing failed", e);
                         break;
                     }