svn commit: r1421764 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java

[ni...@apache.org]

Author: ningjiang
Date: Fri Dec 14 09:29:28 2012
New Revision: 1421764

URL: http://svn.apache.org/viewvc?rev=1421764&view=rev
Log:
CAMEL-5875 Fixed the weaveFirst/weaveLast not working issue before the camel context is started

Added:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java?rev=1421764&r1=1421763&r2=1421764&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java Fri Dec 14 09:29:28 2012
@@ -66,6 +66,10 @@ public final class AdviceWithTasks {
         }
 
         public boolean match(ProcessorDefinition<?> processor) {
+            if (id.equals("*")) {
+                // make sure the processor which id isn't be set is matched.
+                return true;
+            }
             return EndpointHelper.matchPattern(processor.getId(), id);
         }
     }

Added: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java?rev=1421764&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java (added)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java Fri Dec 14 09:29:28 2012
@@ -0,0 +1,98 @@
+/**
+ * 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.itest.issues;
+
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+ 
+/**
+ * Advice with tests
+ */
+public class AdviceWithWeaveFirstLastTest extends CamelTestSupport {
+ 
+    @Override
+    public boolean isUseAdviceWith() {
+        return true;
+    }
+ 
+    @Test
+    public void testWeaveAddFirst() throws Exception {
+        // START SNIPPET: e1
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // insert at first the given piece of route to the existing route
+                weaveAddFirst().to("mock:a").transform(constant("Bye World"));
+            }
+        });
+        // END SNIPPET: e1
+ 
+        context.start();
+ 
+        getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:foo").expectedBodiesReceived("Bye World");
+        getMockEndpoint("mock:bar").expectedBodiesReceived("Bye World");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+ 
+        template.sendBody("direct:start", "Hello World");
+ 
+        assertMockEndpointsSatisfied();
+    }
+ 
+    @Test
+    public void testWeaveAddLast() throws Exception {
+        // START SNIPPET: e2
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // insert at the end of the existing route, the given piece of route
+                weaveAddLast().to("mock:a").transform(constant("Bye World"));
+            }
+        });
+        // END SNIPPET: e2
+ 
+        context.start();
+        
+ 
+        getMockEndpoint("mock:a").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:bar").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
+ 
+        Object out = template.requestBody("direct:start", "Hello World");
+        assertEquals("Bye World", out);
+ 
+        assertMockEndpointsSatisfied();
+    }
+ 
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // START SNIPPET: e5
+                from("direct:start")
+                        .to("mock:foo")
+                        .to("mock:bar").id("bar")
+                        .to("mock:result");
+                // END SNIPPET: e5
+            }
+        };
+    }
+}
\ No newline at end of file