svn commit: r1074045 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/model/FromDefinition.java test/java/org/apache/camel/processor/intercept/InterceptFromEndpointNotUriTest.java

[da...@apache.org]

Author: davsclaus
Date: Thu Feb 24 05:20:05 2011
New Revision: 1074045

URL: http://svn.apache.org/viewvc?rev=1074045&view=rev
Log:
CAMEL-3709: InterceptFrom now works if using endpoint instances and not just uris

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromEndpointNotUriTest.java
      - copied, changed from r1074036, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromSimpleLogTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java?rev=1074045&r1=1074044&r2=1074045&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java Thu Feb 24 05:20:05 2011
@@ -77,8 +77,15 @@ public class FromDefinition extends Opti
 
     // Properties
     // -----------------------------------------------------------------------
+
     public String getUri() {
-        return uri;
+        if (uri != null) {
+            return uri;
+        } else if (endpoint != null) {
+            return endpoint.getEndpointUri();
+        } else {
+            return null;
+        }
     }
 
     /**

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromEndpointNotUriTest.java (from r1074036, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromSimpleLogTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromEndpointNotUriTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromEndpointNotUriTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromSimpleLogTest.java&r1=1074036&r2=1074045&rev=1074045&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromSimpleLogTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromEndpointNotUriTest.java Thu Feb 24 05:20:05 2011
@@ -17,12 +17,13 @@
 package org.apache.camel.processor.intercept;
 
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
 
 /**
- * Testing http://camel.apache.org/dsl.html
+ * Testing intercept from can intercept when endpoint is an instance
  */
-public class InterceptFromSimpleLogTest extends ContextTestSupport {
+public class InterceptFromEndpointNotUriTest extends ContextTestSupport {
 
     public void testInterceptLog() throws Exception {
         getMockEndpoint("mock:result").expectedMessageCount(1);
@@ -36,15 +37,14 @@ public class InterceptFromSimpleLogTest 
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                // START SNIPPET: e1
-                // intercept all incomming routes and log it
-                interceptFrom().to("log:received");
+                interceptFrom("direct*").to("log:received");
 
-                // and here we have a couple of routes
-                from("direct:start").to("mock:first").to("seda:bar");
+                Endpoint direct = context.getEndpoint("direct:start");
+                Endpoint seda = context.getEndpoint("seda:bar");
+
+                from(direct).to("mock:first").to(seda);
                 
-                from("seda:bar").to("mock:result");
-                // END SNIPPET: e1
+                from(seda).to("mock:result");
             }
         };
     }