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:26 UTC

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

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