ASAPMessage has got a format

Author: thsc42

src/net/sharksystem/asap/ASAPChunkStorage.java

@@ -16,14 +16,15 @@
  * @author thsc
  */
 public interface ASAPChunkStorage {
+    String getFormat();
 
-    public ASAPChunk getChunk(CharSequence uri, int era) throws IOException;
+    ASAPChunk getChunk(CharSequence uri, int era) throws IOException;
 
-    public boolean existsChunk(CharSequence uri, int era) throws IOException;
+    boolean existsChunk(CharSequence uri, int era) throws IOException;
 
-    public List<ASAPChunk> getChunks(int era) throws IOException;
+    List<ASAPChunk> getChunks(int era) throws IOException;
 
-    public void dropChunks(int era) throws IOException;
+    void dropChunks(int era) throws IOException;
 
     /**
      * 

src/net/sharksystem/asap/ASAPChunkStorageFS.java

@@ -18,9 +18,15 @@
 class ASAPChunkStorageFS implements ASAPChunkStorage {
 
     private final String rootDirectory;
+    private final String format;
 
-    ASAPChunkStorageFS(String rootDirectory) {
+    ASAPChunkStorageFS(String rootDirectory, String format) {
         this.rootDirectory = rootDirectory;
+        this.format = format;
+    }
+
+    public String getFormat() {
+        return format;
     }
 
     @Override
@@ -123,6 +129,7 @@ public ASAPMessages getASAPChunkCache(CharSequence uri, int toEra) throws IOExce
         }
 
         return new ASAPInMemoMessages(this,
+                this.getFormat(),
                 uri,
                 fromEra, // set starting era
                 toEra // anything before

src/net/sharksystem/asap/ASAPEngineFS.java

@@ -22,7 +22,7 @@ private ASAPEngineFS(String owner,
                          String rootDirectory, ASAPChunkStorageFS chunkStorage, CharSequence format)
         throws ASAPException, IOException {
 
-        super(new ASAPChunkStorageFS(rootDirectory), format);
+        super(new ASAPChunkStorageFS(rootDirectory, format.toString()), format);
 
         this.owner = owner;
         this.rootDirectory = rootDirectory;
@@ -84,10 +84,11 @@ static ASAPEngineFS getASAPEngineFS(String owner, String rootDirectory, CharSequ
             throw new ASAPException("chunk root directory must exist when creating an ASAPEngine");
         }
 
+        String formatString = format != null ? format.toString() : ASAP_1_0.ANY_FORMAT;
         ASAPEngineFS engine = new ASAPEngineFS(
                 owner,
                 rootDirectory, 
-                new ASAPChunkStorageFS(rootDirectory),
+                new ASAPChunkStorageFS(rootDirectory, formatString),
                 ASAP_1_0.ANY_FORMAT // set to default - real value is restored by memento anyway
         );
 
@@ -168,7 +169,7 @@ private ASAPMementoFS getMemento(String rootDirectory) {
     @Override
     public ASAPChunkStorage getIncomingChunkStorage(CharSequence sender) {
         String dir = this.rootDirectory + "/" + sender;
-        return new ASAPChunkStorageFS(dir);
+        return new ASAPChunkStorageFS(dir, this.format);
     }
 
     public ASAPStorage getExistingIncomingStorage(CharSequence sender) throws IOException, ASAPException {

src/net/sharksystem/asap/ASAPInMemoMessages.java

@@ -18,6 +18,7 @@ class ASAPInMemoMessages implements ASAPMessages {
     private final ASAPChunkStorageFS chunkStorage;
     private final int fromEra;
     private final int toEra;
+    private final String format;
 
     private List<ASAPChunk> chunkList;
 
@@ -30,8 +31,9 @@ class ASAPInMemoMessages implements ASAPMessages {
     private int numberOfMessages = 0;
 
     public ASAPInMemoMessages(ASAPChunkStorageFS chunkStorage,
-                              CharSequence uri, int fromEra, int toEra, int maxCacheLen) {
+                              String format, CharSequence uri, int fromEra, int toEra, int maxCacheLen) {
 
+        this.format = format;
         this.uri = uri;
         this.chunkStorage = chunkStorage;
         this.fromEra = fromEra;
@@ -40,9 +42,9 @@ public ASAPInMemoMessages(ASAPChunkStorageFS chunkStorage,
     }
 
     public ASAPInMemoMessages(ASAPChunkStorageFS chunkStorage,
-                              CharSequence uri, int fromEra, int toEra) {
+                              String format, CharSequence uri, int fromEra, int toEra) {
 
-        this(chunkStorage, uri, fromEra, toEra, DEFAULT_MAX_CACHE_SIZE);
+        this(chunkStorage, format, uri, fromEra, toEra, DEFAULT_MAX_CACHE_SIZE);
     }
 
     private boolean initialized = false;