svn commit: r938828 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java

[da...@apache.org]

Author: davsclaus
Date: Wed Apr 28 09:07:54 2010
New Revision: 938828

URL: http://svn.apache.org/viewvc?rev=938828&view=rev
Log:
CAMEL-2678: idempotent file repo should flush on remove.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java   (with props)
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java?rev=938828&r1=938827&r2=938828&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java Wed Apr 28 09:07:54 2010
@@ -139,13 +139,17 @@ public class FileIdempotentRepository im
     }
 
     public boolean remove(String key) {
+        boolean answer;
         synchronized (cache) {
             // init store if not loaded before
             if (init.compareAndSet(false, true)) {
                 loadStore();
             }
-            return cache.remove(key) != null;
+            answer = cache.remove(key) != null;
+            // trunk store and flush the cache on remove
+            trunkStore();
         }
+        return answer;
     }
 
     public boolean confirm(String key) {

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java?rev=938828&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java Wed Apr 28 09:07:54 2010
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import java.io.File;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.idempotent.FileIdempotentRepository;
+import org.apache.camel.spi.IdempotentRepository;
+
+/**
+ * @version $Revision$
+ */
+public class FileIdempotentRemoveTest extends ContextTestSupport {
+
+    private File store = new File("target/idempotentfilestore.dat");
+    private IdempotentRepository<String> repo;
+
+    @Override
+    protected void setUp() throws Exception {
+        // delete file store before testing
+        if (store.exists()) {
+            store.delete();
+        }
+        repo = FileIdempotentRepository.fileIdempotentRepository(store);
+
+        super.setUp();
+    }
+
+    public void testRemove() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedBodiesReceived("Foo", "Bar");
+
+        template.sendBodyAndHeader("direct:start", "Foo", "messageId", "A");
+        template.sendBodyAndHeader("direct:start", "Camel rocks", "messageId", "A");
+        template.sendBodyAndHeader("direct:start", "Bar", "messageId", "B");
+
+        assertMockEndpointsSatisfied();
+
+        mock.reset();
+        mock.expectedBodiesReceived("Camel rocks");
+
+        repo.remove("A");
+
+        template.sendBodyAndHeader("direct:start", "Camel rocks", "messageId", "A");
+        template.sendBodyAndHeader("direct:start", "Bar again", "messageId", "B");
+
+        assertMockEndpointsSatisfied();
+
+        // remove should flush file so we will only see B in the file
+        repo.remove("A");
+
+        String data = context.getTypeConverter().convertTo(String.class, store);
+        assertEquals("B\n", data);
+    }
+
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                from("direct:start")
+                    .idempotentConsumer(header("messageId"), repo)
+                    .to("mock:result");
+            }
+        };
+    }
+
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileIdempotentRemoveTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date