added a sync method which was urgently required from Android apps.

Author: thsc42

.idea/artifacts/aaspJava_jar.xml

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

META-INF/MANIFEST.MF

@@ -54,15 +54,14 @@ CharSequence getMessage(int position, boolean chronologically)
             throws AASPException, IOException;
 
     /**
-     * Add a message. Implementations are free to simply delegate that method to 
-     * the underlying chunk storage. They can also decide to keep the cache in
-     * sync. That could be useful if only one application uses the chunk storage.
-     * It's up to implementation and using application to clarify semantics
-     * of this method.
-     * 
-     * @param message
-     * @throws IOException 
+     * Synchronizes cache. It is up to real implemenations what really
+     * happens. That method is meant to be called whenever the underlying
+     * chunk storage has been changed. After that call, cache and storage are
+     * in sync agin. Implemenations whoch don't have an internal cache don't
+     * have to do anything.
+     *
+     * @throws IOException
      */
-    void add(CharSequence message) throws IOException;
+    void sync() throws IOException;
 
 }

src/net/sharksystem/aasp/AASPChunkCache.java

@@ -39,7 +39,9 @@ class AASPChunkFS implements AASPChunk {
 
     AASPChunkFS(AASPChunkStorageFS storage, String targetUri, int era, String sender) throws IOException {
         this.storage = storage;
-        this.uri = targetUri;
+        if(targetUri != null) {
+            this.uri = targetUri;
+        }
         this.era = era;
         this.sender = sender;
 

src/net/sharksystem/aasp/AASPChunkFS.java

@@ -30,6 +30,8 @@ String url2FileName(String url) {
         see https://en.wikipedia.org/wiki/Percent-encoding
         \ - %5C, / - %2F, : - %3A, ? - %3F," - %22,< - %3C,> - %3E,| - %7C
         */
+
+        if(url == null) return null; // to be safe
 
         String newString = url.replace("\\", "%5C");
         newString = newString.replace("/", "%2F");

src/net/sharksystem/aasp/AASPChunkStorageFS.java

@@ -204,12 +204,18 @@ public CharSequence getMessage(int position, boolean chronologically)
         return this.getMessage(position, true);
     }
 
-    @Override
-    public void add(CharSequence message) throws IOException {
-        // TODO
-        //throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    public void sync() throws IOException {
+        this.initialized = false;
+        this.firstIndexMessageCache = -1;
+        this.lastIndexMessageCache = -1;
+        this.numberOfMessages = 0;
+        this.messageCache = null;
     }
 
+    //////////////////////////////////////////////////////////////////////////////////////////
+    //                          helper: message iterator implementation                     //
+    //////////////////////////////////////////////////////////////////////////////////////////
+
     private class ChunkListMessageIterator implements Iterator<CharSequence> {
 
         private final List<AASPChunk> chunkList;

src/net/sharksystem/aasp/AASPInMemoChunkCache.java

@@ -12,6 +12,7 @@ public class ChunkCacheTests {
     private static final String MESSAGE_TWO = "message two";
     private static final String MESSAGE_THREE = "message three";
     private static final String MESSAGE_FOUR = "message four";
+    private static final String MESSAGE_FIVE = "message five";
 
     @Test
     public void chunkTest1() throws IOException, AASPException {
@@ -30,21 +31,22 @@ public void chunkTest1() throws IOException, AASPException {
         AASPChunk chunk = chunkStorage.getChunk(TEST_URI, era);
 
         chunk.add(MESSAGE_ONE);
-        storage.newEra();
+        storage.newEra(); // finish chunk one
         int newEra = storage.getEra();
 
+        // start chunk two
         Assert.assertEquals(AASPEngine.nextEra(era), newEra);
         chunk = chunkStorage.getChunk(TEST_URI, newEra);
         chunk.add(MESSAGE_TWO);
 
-        Assert.assertEquals(AASPEngine.nextEra(era), newEra);
-        chunk = chunkStorage.getChunk(TEST_URI, newEra);
         chunk.add(MESSAGE_THREE);
-        chunk = chunkStorage.getChunk(TEST_URI, newEra);
+
         chunk.add(MESSAGE_FOUR);
 
         AASPChunkCache aaspChunkCache = chunkStorage.getAASPChunkCache(TEST_URI, era, newEra);
 
+        // add message after getting cache
+
         // position test - chronological order
         CharSequence message = aaspChunkCache.getMessage(0, true);
         Assert.assertTrue(message.toString().equalsIgnoreCase(MESSAGE_ONE));
@@ -59,6 +61,12 @@ public void chunkTest1() throws IOException, AASPException {
         message = aaspChunkCache.getMessage(1, false);
         Assert.assertTrue(message.toString().equalsIgnoreCase(MESSAGE_THREE));
 
+        chunk.add(MESSAGE_FIVE);
+
+        aaspChunkCache.sync();
+        message = aaspChunkCache.getMessage(4, true);
+        Assert.assertTrue(message.toString().equalsIgnoreCase(MESSAGE_FIVE));
+
         Iterator<CharSequence> messages = aaspChunkCache.getMessages();
 
         // Iterator test
@@ -71,6 +79,8 @@ public void chunkTest1() throws IOException, AASPException {
         Assert.assertTrue(message.toString().equalsIgnoreCase(MESSAGE_THREE));
         message = messages.next();
         Assert.assertTrue(message.toString().equalsIgnoreCase(MESSAGE_FOUR));
+        message = messages.next();
+        Assert.assertTrue(message.toString().equalsIgnoreCase(MESSAGE_FIVE));
 
         Assert.assertFalse(messages.hasNext());