working on asap management message hopping

Author: thsc42

src/net/sharksystem/asap/ASAPAbstractOnlineMessageSender.java

@@ -6,10 +6,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public abstract class ASAPAbstractOnlineMessageSender implements ASAPOnlineMessageSender {
     private ASAPStorage source = null;
@@ -29,7 +26,7 @@ public void sendASAPAssimilate(CharSequence format, CharSequence uri, CharSequen
         if(recipient == null) {
             this.sendASAPAssimilate(format, uri, messageAsBytes, era);
         } else {
-            List<CharSequence> recipients = new ArrayList<>();
+            Set<CharSequence> recipients = new HashSet<>();
             recipients.add(recipient);
             this.sendASAPAssimilate(format, uri, recipients, messageAsBytes, era);
         }

src/net/sharksystem/asap/ASAPChannel.java

@@ -0,0 +1,10 @@
+package net.sharksystem.asap;
+
+import java.io.IOException;
+import java.util.Set;
+
+public interface ASAPChannel {
+    CharSequence getOwner() throws IOException;
+    CharSequence getUri() throws IOException;
+    Set<CharSequence> getRecipients() throws IOException;
+}

src/net/sharksystem/asap/ASAPChannelImpl.java

@@ -0,0 +1,34 @@
+package net.sharksystem.asap;
+
+import java.io.IOException;
+import java.util.Set;
+
+public class ASAPChannelImpl implements ASAPChannel {
+    private static final String CHANNEL_OWNER = "ASAPChannelOwner";
+    private final ASAPEngine asapEngine;
+    private final CharSequence uri;
+
+    public ASAPChannelImpl(ASAPEngine asapEngine, CharSequence uri) {
+        this.asapEngine = asapEngine;
+        this.uri = uri;
+    }
+
+    @Override
+    public CharSequence getOwner() throws IOException {
+        return this.asapEngine.getExtra(this.getUri(), CHANNEL_OWNER);
+    }
+
+    @Override
+    public CharSequence getUri() throws IOException {
+        return this.uri;
+    }
+
+    @Override
+    public Set<CharSequence> getRecipients() throws IOException {
+        return this.asapEngine.getRecipients(this.getUri());
+    }
+
+    public void setOwner(CharSequence owner) throws IOException {
+        this.asapEngine.putExtra(this.getUri(), CHANNEL_OWNER, owner.toString());
+    }
+}

src/net/sharksystem/asap/ASAPChunk.java

@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 /**
  * An AASP chunk contains messages regarding a topic described by an
@@ -65,7 +66,7 @@ public interface ASAPChunk {
      * 
      * @return recipients of that chunk 
      */
-    List<CharSequence> getRecipients();
+    Set<CharSequence> getRecipients();
 
     /**
      * add recipients

src/net/sharksystem/asap/ASAPChunkFS.java

@@ -16,7 +16,7 @@ class ASAPChunkFS implements ASAPChunk {
     private final ASAPChunkStorageFS storage;
     private String sender;
     private String uri = DEFAULT_URL;
-    private List<CharSequence> recipients;
+    private Set<CharSequence> recipients;
     private List<CharSequence> deliveredTo;
     private List<Long> messageStartOffsets = new ArrayList<>();
     private File metaFile;
@@ -92,7 +92,7 @@ private void initFiles(String trunkName) throws IOException {
         if(!this.readMetaData(this.metaFile)) {
             // no metadate to be read - set defaults
             this.writeMetaData(this.metaFile);
-            this.recipients = new ArrayList<>();
+            this.recipients = new HashSet<>();
             this.deliveredTo = new ArrayList<>();
             this.messageStartOffsets = new ArrayList<>();
         }
@@ -103,7 +103,7 @@ private void saveStatus() throws IOException {
     }
 
     @Override
-    public List<CharSequence> getRecipients() {
+    public Set<CharSequence> getRecipients() {
         return this.recipients;
     }
 
@@ -115,7 +115,7 @@ public void addRecipient(CharSequence recipient) throws IOException {
 
     @Override
     public void setRecipients(List<CharSequence> newRecipients) throws IOException {
-        this.recipients = new ArrayList<>();
+        this.recipients = new HashSet<>();
         for(CharSequence recipient : newRecipients) {
             this.recipients.add(recipient);
         }
@@ -289,7 +289,7 @@ private boolean readMetaData(File metaFile) throws IOException {
         }
 
         try {
-            this.recipients = Helper.string2CharSequenceList(dis.readUTF());
+            this.recipients = Helper.string2CharSequenceSet(dis.readUTF());
             this.deliveredTo = Helper.string2CharSequenceList(dis.readUTF());
 
             // finally read offset list

src/net/sharksystem/asap/ASAPChunkStorageFS.java

@@ -35,7 +35,7 @@ public boolean existsChunk(CharSequence uri, int era) throws IOException {
     }
 
     String getChunkContentFilename(int era, CharSequence uri) {
-        return this.getChunkFileTrunkname(era, uri.toString()) + "." +  DATA_EXTENSION;
+        return this.getChunkFileTrunkname(era, uri.toString()) + "." +  META_DATA_EXTENSION;
     }
 
     String getChunkFileTrunkname(int era, String uri) {

src/net/sharksystem/asap/ASAPEngine.java

@@ -1,5 +1,7 @@
 package net.sharksystem.asap;
 
+import net.sharksystem.asap.management.ASAPManagementMessage;
+import net.sharksystem.asap.management.ASAPManagementStorage;
 import net.sharksystem.asap.protocol.*;
 import net.sharksystem.asap.util.Log;
 
@@ -9,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * That ASAPEngine manages exchange of stored messages with peers.
@@ -91,13 +94,20 @@ public CharSequence getExtra(CharSequence uri, String key) throws IOException {
     }
 
     @Override
-    public void createChannel(CharSequence urlTarget, List<CharSequence> recipients) throws IOException, ASAPException {
-        this.setRecipients(urlTarget, recipients);
+    public void createChannel(CharSequence uri, List<CharSequence> recipients) throws IOException, ASAPException {
+        this.createChannel(this.getOwner(), uri, recipients);
+    }
+
+    @Override
+    public void createChannel(CharSequence owner, CharSequence uri, List<CharSequence> recipients)
+            throws IOException, ASAPException {
+
+        this.setRecipients(uri, recipients);
+        this.getASAPChannelImpl(uri).setOwner(owner);
 
         // inform recipients about that event
         if(this.isASAPManagementStorageSet()) {
-            ASAPManagementStorage asapManagementStorage = this.getASAPManagementStorage();
-            asapManagementStorage.addCreateClosedASAPChannelMessage(this.format, urlTarget, recipients);
+            this.getASAPManagementStorage().notifyChannelCreated(this.format, owner, uri, recipients);
         } else {
             System.out.println(this.getLogStart()
                     + "asap management storage not set - no propagation of channel creation");
@@ -128,13 +138,13 @@ public boolean isASAPManagementStorageSet() {
         return this.asapManagementStorage != null;
     }
 
-    public void addCreateClosedASAPChannelMessage(CharSequence appName, CharSequence channelUri,
-                                                  List<CharSequence> recipients)
+    public void notifyChannelCreated(CharSequence appName, CharSequence owner,
+                                     CharSequence uri, List<CharSequence> recipients)
             throws ASAPException, IOException {
 
         byte[] createClosedASAPChannelMessage =
                 ASAPManagementMessage.getCreateClosedASAPChannelMessage(
-                        this.getOwner(), appName, channelUri, recipients);
+                        owner, appName, uri, recipients);
 
         // put into create channel
         this.add(ASAPManagementStorage.ASAP_CREATE_CHANNEL, createClosedASAPChannelMessage);
@@ -149,7 +159,7 @@ public void setRecipients(CharSequence urlTarget, List<CharSequence> recipients)
         this.chunkStorage.getChunk(urlTarget, this.era).setRecipients(recipients);
     }
 
-    public List<CharSequence> getRecipients(CharSequence urlTarget) throws IOException {
+    public Set<CharSequence> getRecipients(CharSequence urlTarget) throws IOException {
         return this.chunkStorage.getChunk(urlTarget, this.era).getRecipients();
     }
 
@@ -201,6 +211,19 @@ public List<CharSequence> getChannelURIs() throws IOException {
         return uriList;
     }
 
+    @Override
+    public ASAPChannel getChannel(CharSequence uri) throws ASAPException, IOException {
+        return this.getASAPChannelImpl(uri);
+    }
+
+    private ASAPChannelImpl getASAPChannelImpl(CharSequence uri) throws ASAPException, IOException {
+        if(this.channelExists(uri)) {
+            return new ASAPChannelImpl(this, uri);
+        }
+
+        throw new ASAPException("channel with does not exist: " + uri);
+    }
+
     @Override
     public boolean channelExists(CharSequence uri) throws IOException {
         return this.chunkStorage.existsChunk(uri, this.getEra());
@@ -463,10 +486,6 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimiliationPDU,
         }
     }
 
-    private boolean isASAPManagementMessage(ASAP_PDU_1_0 asapPDU) {
-        return asapPDU.getFormat().equalsIgnoreCase(ASAP_1_0.ASAP_MANAGEMENT_FORMAT);
-    }
-
     public void handleASAPInterest(ASAP_Interest_PDU_1_0 asapInterest, ASAP_1_0 protocol, OutputStream os)
             throws ASAPException, IOException {
 
@@ -612,7 +631,7 @@ private void sendChunks(CharSequence sender, String recipient, ASAPChunkStorage
 
                 // is not a public chunk
                 if (!this.isPublic(chunk)) {
-                    List<CharSequence> recipients = chunk.getRecipients();
+                    Set<CharSequence> recipients = chunk.getRecipients();
 
                     if (!recipients.contains(recipient)) {
                         continue;

src/net/sharksystem/asap/ASAPManagementStorage.java

@@ -1,10 +1,10 @@
 package net.sharksystem.asap;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Set;
 
 public interface ASAPOnlineMessageSender {
-    void sendASAPAssimilate(CharSequence format, CharSequence urlTarget, List<CharSequence> recipients,
+    void sendASAPAssimilate(CharSequence format, CharSequence urlTarget, Set<CharSequence> recipients,
                             byte[] messageAsBytes, int era) throws IOException, ASAPException;
 
     void sendASAPAssimilate(CharSequence format, CharSequence urlTarget, CharSequence recipient,

src/net/sharksystem/asap/ASAPOnlineMessageSender.java

@@ -36,7 +36,7 @@ public void sendASAPAssimilate(CharSequence format, CharSequence uri, byte[] mes
             throw new ASAPException("no online peers");
         }
 
-        List<CharSequence> onlinePeerList = new ArrayList<>();
+        Set<CharSequence> onlinePeerList = new HashSet<>();
         for(CharSequence peerName : onlinePeers) {
             onlinePeerList.add(peerName);
             System.out.println(this.getLogStart() + peerName  + "is online");
@@ -45,8 +45,8 @@ public void sendASAPAssimilate(CharSequence format, CharSequence uri, byte[] mes
         this.sendASAPAssimilate(format, uri, onlinePeerList, messageAsBytes, era);
     }
 
-    public void sendASAPAssimilate(CharSequence format, CharSequence uri, List<CharSequence> recipients,
-        byte[] messageAsBytes, int era) throws IOException, ASAPException {
+    public void sendASAPAssimilate(CharSequence format, CharSequence uri, Set<CharSequence> recipients,
+                                   byte[] messageAsBytes, int era) throws IOException, ASAPException {
 
         if(recipients == null || recipients.size() < 1) {
             this.sendASAPAssimilate(format, uri, messageAsBytes, era);