You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/07 13:05:25 UTC

[1/3] camel git commit: CAMEL-10797: Create endpoint from uri without context-path

Repository: camel
Updated Branches:
  refs/heads/master 01204f818 -> 4bb7dcb61
  refs/heads/mention 412723d88 -> bf18127b6


CAMEL-10797: Create endpoint from uri without context-path


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a02aadb1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a02aadb1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a02aadb1

Branch: refs/heads/mention
Commit: a02aadb14d7906c29f44e005ec799712079978ed
Parents: 412723d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 7 13:27:05 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 7 13:27:05 2017 +0100

----------------------------------------------------------------------
 .../apache/camel/impl/DefaultCamelContext.java  | 27 ++++++++++++++++++++
 .../org/apache/camel/impl/DefaultComponent.java |  9 ++++++-
 .../camel/impl/DefaultCamelContextTest.java     | 11 ++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a02aadb1/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 67f77ea..707366d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -628,6 +628,33 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
                     log.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer);
                 }
 
+                if (answer == null && splitURI[1] == null) {
+                    // the uri has no context-path which is rare and it was not referring to an endpoint in the registry
+                    // so try to see if it can be created by a component
+
+                    int pos = uri.indexOf('?');
+                    String componentName = pos > 0 ? uri.substring(0, pos) : uri;
+
+                    Component component = getComponent(componentName);
+
+                    // Ask the component to resolve the endpoint.
+                    if (component != null) {
+                        log.trace("Creating endpoint from uri: {} using component: {}", uri, component);
+
+                        // Have the component create the endpoint if it can.
+                        if (component.useRawUri()) {
+                            answer = component.createEndpoint(rawUri);
+                        } else {
+                            answer = component.createEndpoint(uri);
+                        }
+
+                        if (answer != null && log.isDebugEnabled()) {
+                            log.debug("{} converted to endpoint: {} by component: {}", new Object[]{URISupport.sanitizeUri(uri), answer, component});
+                        }
+                    }
+
+                }
+
                 if (answer != null) {
                     addService(answer);
                     answer = addEndpointToRegistry(uri, answer);

http://git-wip-us.apache.org/repos/asf/camel/blob/a02aadb1/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
index a2c18b9..7b5b31e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
@@ -65,7 +65,14 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
         // check URI string to the unsafe URI characters
         String encodedUri = preProcessUri(uri);
         URI u = new URI(encodedUri);
-        String path = URISupport.extractRemainderPath(u, useRawUri());
+        String path;
+        if (u.getScheme() != null) {
+            // if there is a scheme then there is also a path
+            path = URISupport.extractRemainderPath(u, useRawUri());
+        } else {
+            // this uri has no context-path as the leading text is the component name (scheme)
+            path = null;
+        }
 
         Map<String, Object> parameters;
         if (useRawUri()) {

http://git-wip-us.apache.org/repos/asf/camel/blob/a02aadb1/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
index b0fc1c4..4a8e84b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
@@ -111,6 +111,13 @@ public class DefaultCamelContextTest extends TestSupport {
         }
     }
     
+    public void testGetEndpointNoScheme() throws Exception {
+        DefaultCamelContext ctx = new DefaultCamelContext();
+        ctx.disableJMX();
+        Endpoint endpoint = ctx.getEndpoint("log");
+        assertNotNull(endpoint);
+    }
+
     public void testGetEndPointByTypeUnknown() {
         DefaultCamelContext camelContext = new DefaultCamelContext();
         try {
@@ -159,11 +166,11 @@ public class DefaultCamelContextTest extends TestSupport {
         }
     }
 
-    public void testGetEndpointNoScheme() throws Exception {
+    public void testGetEndpointUnknownComponentNoScheme() throws Exception {
         DefaultCamelContext ctx = new DefaultCamelContext();
         ctx.disableJMX();
         try {
-            CamelContextHelper.getMandatoryEndpoint(ctx, "log.foo");
+            CamelContextHelper.getMandatoryEndpoint(ctx, "unknownname");
             fail("Should have thrown a NoSuchEndpointException");
         } catch (NoSuchEndpointException e) {
             // expected


[2/3] camel git commit: Camel twitter salesforce example and fixed bugs in camel-connector

Posted by da...@apache.org.
Camel twitter salesforce example and fixed bugs in camel-connector


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf18127b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf18127b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf18127b

Branch: refs/heads/mention
Commit: bf18127b6629c0faf0dccb6c7a05c6c4185c7582
Parents: a02aadb
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 7 13:27:29 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 7 13:27:29 2017 +0100

----------------------------------------------------------------------
 .../connector/DefaultConnectorComponent.java      |  4 ++--
 .../src/main/resources/camel-connector.json       |  3 +--
 .../examples/twitter-salesforce-example/pom.xml   | 18 ++++--------------
 .../java/org/foo/MentionAddContractRoute.java     |  7 ++-----
 .../src/main/resources/application.properties     | 12 ++++++++++--
 5 files changed, 19 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bf18127b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
----------------------------------------------------------------------
diff --git a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
index d0ef3c9..e980b2e 100644
--- a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
+++ b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
@@ -179,7 +179,7 @@ public abstract class DefaultConnectorComponent extends DefaultComponent {
         boolean found = false;
         for (String line : lines) {
             line = line.trim();
-            if (line.startsWith("\"componentValues\":")) {
+            if (line.startsWith("\"componentValues\"")) {
                 found = true;
             } else if (line.startsWith("}")) {
                 found = false;
@@ -206,7 +206,7 @@ public abstract class DefaultConnectorComponent extends DefaultComponent {
         boolean found = false;
         for (String line : lines) {
             line = line.trim();
-            if (line.startsWith("\"endpointValues\":")) {
+            if (line.startsWith("\"endpointValues\"")) {
                 found = true;
             } else if (line.startsWith("}")) {
                 found = false;

http://git-wip-us.apache.org/repos/asf/camel/blob/bf18127b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json
----------------------------------------------------------------------
diff --git a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json
index 3d53ff5..a38fc73 100644
--- a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json
@@ -14,7 +14,6 @@
   "pattern": "From",
   "componentOptions" : [ "accessToken", "accessTokenSecret", "consumerKey", "consumerSecret" ],
   "endpointValues" : {
-    "kind" : "timeline/mentions",
-    "delay" : "15000"
+    "kind" : "timeline/mentions"
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/bf18127b/connectors/examples/twitter-salesforce-example/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/twitter-salesforce-example/pom.xml b/connectors/examples/twitter-salesforce-example/pom.xml
index d2437b5..bec26ba 100644
--- a/connectors/examples/twitter-salesforce-example/pom.xml
+++ b/connectors/examples/twitter-salesforce-example/pom.xml
@@ -65,6 +65,10 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-undertow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
 
@@ -80,20 +84,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <!-- logging -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-    </dependency>
-
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/bf18127b/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java
----------------------------------------------------------------------
diff --git a/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java b/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java
index 64047aa..0876aab 100644
--- a/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java
+++ b/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java
@@ -24,10 +24,7 @@ public class MentionAddContractRoute extends RouteBuilder {
 
     @Override
     public void configure() throws Exception {
-        from("foo:blah?period=2000")
-            .log("Foo triggered");
-
-//        from("twitter-mention?count=10")
-//            .log("I was mentioned by ${body}");
+        from("twitter-mention")
+            .log("I was mentioned by ${body}");
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/bf18127b/connectors/examples/twitter-salesforce-example/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/connectors/examples/twitter-salesforce-example/src/main/resources/application.properties b/connectors/examples/twitter-salesforce-example/src/main/resources/application.properties
index 67510f1..36baa9b 100644
--- a/connectors/examples/twitter-salesforce-example/src/main/resources/application.properties
+++ b/connectors/examples/twitter-salesforce-example/src/main/resources/application.properties
@@ -1,3 +1,11 @@
-## add those options here
+## name of CamelContext
+camel.springboot.name=mention
+
+## This uses the Twitter 'cameltweet' account for testing purposes.
+## do NOT use this twitter account in your applications!
+
+camel.component.twitter.consumer-key=NMqaca1bzXsOcZhP2XlwA
+camel.component.twitter.consumer-secret=VxNQiRLwwKVD0K9mmfxlTTbVdgRpriORypnUbHhxeQw
+camel.component.twitter.access-token=26693234-W0YjxL9cMJrC0VZZ4xdgFMymxIQ10LeL1K8YlbBY
+camel.component.twitter.access-token-secret=BZD51BgzbOdFstWZYsqB5p5dbuuDV12vrOdatzhY4E
 
-camel.component.twitter.access-token=
\ No newline at end of file


[3/3] camel git commit: CAMEL-10797: Create endpoint from uri without context-path

Posted by da...@apache.org.
CAMEL-10797: Create endpoint from uri without context-path


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bb7dcb6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bb7dcb6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bb7dcb6

Branch: refs/heads/master
Commit: 4bb7dcb615c5e3eaf252012eab6df85b0861d57e
Parents: 01204f8
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 7 13:27:05 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 7 13:58:58 2017 +0100

----------------------------------------------------------------------
 .../apache/camel/impl/DefaultCamelContext.java  | 27 ++++++++++++++++++++
 .../org/apache/camel/impl/DefaultComponent.java |  9 ++++++-
 .../camel/impl/DefaultCamelContextTest.java     | 11 ++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4bb7dcb6/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 67f77ea..707366d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -628,6 +628,33 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
                     log.trace("No component to create endpoint from uri: {} fallback lookup in registry -> {}", uri, answer);
                 }
 
+                if (answer == null && splitURI[1] == null) {
+                    // the uri has no context-path which is rare and it was not referring to an endpoint in the registry
+                    // so try to see if it can be created by a component
+
+                    int pos = uri.indexOf('?');
+                    String componentName = pos > 0 ? uri.substring(0, pos) : uri;
+
+                    Component component = getComponent(componentName);
+
+                    // Ask the component to resolve the endpoint.
+                    if (component != null) {
+                        log.trace("Creating endpoint from uri: {} using component: {}", uri, component);
+
+                        // Have the component create the endpoint if it can.
+                        if (component.useRawUri()) {
+                            answer = component.createEndpoint(rawUri);
+                        } else {
+                            answer = component.createEndpoint(uri);
+                        }
+
+                        if (answer != null && log.isDebugEnabled()) {
+                            log.debug("{} converted to endpoint: {} by component: {}", new Object[]{URISupport.sanitizeUri(uri), answer, component});
+                        }
+                    }
+
+                }
+
                 if (answer != null) {
                     addService(answer);
                     answer = addEndpointToRegistry(uri, answer);

http://git-wip-us.apache.org/repos/asf/camel/blob/4bb7dcb6/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
index a2c18b9..7b5b31e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
@@ -65,7 +65,14 @@ public abstract class DefaultComponent extends ServiceSupport implements Compone
         // check URI string to the unsafe URI characters
         String encodedUri = preProcessUri(uri);
         URI u = new URI(encodedUri);
-        String path = URISupport.extractRemainderPath(u, useRawUri());
+        String path;
+        if (u.getScheme() != null) {
+            // if there is a scheme then there is also a path
+            path = URISupport.extractRemainderPath(u, useRawUri());
+        } else {
+            // this uri has no context-path as the leading text is the component name (scheme)
+            path = null;
+        }
 
         Map<String, Object> parameters;
         if (useRawUri()) {

http://git-wip-us.apache.org/repos/asf/camel/blob/4bb7dcb6/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
index b0fc1c4..4a8e84b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
@@ -111,6 +111,13 @@ public class DefaultCamelContextTest extends TestSupport {
         }
     }
     
+    public void testGetEndpointNoScheme() throws Exception {
+        DefaultCamelContext ctx = new DefaultCamelContext();
+        ctx.disableJMX();
+        Endpoint endpoint = ctx.getEndpoint("log");
+        assertNotNull(endpoint);
+    }
+
     public void testGetEndPointByTypeUnknown() {
         DefaultCamelContext camelContext = new DefaultCamelContext();
         try {
@@ -159,11 +166,11 @@ public class DefaultCamelContextTest extends TestSupport {
         }
     }
 
-    public void testGetEndpointNoScheme() throws Exception {
+    public void testGetEndpointUnknownComponentNoScheme() throws Exception {
         DefaultCamelContext ctx = new DefaultCamelContext();
         ctx.disableJMX();
         try {
-            CamelContextHelper.getMandatoryEndpoint(ctx, "log.foo");
+            CamelContextHelper.getMandatoryEndpoint(ctx, "unknownname");
             fail("Should have thrown a NoSuchEndpointException");
         } catch (NoSuchEndpointException e) {
             // expected