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 2013/06/04 17:28:31 UTC
[1/2] git commit: camel-sap-netweaver component.
Updated Branches:
refs/heads/master 7ef115ec1 -> 1f2e0d628
camel-sap-netweaver component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a324df93
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a324df93
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a324df93
Branch: refs/heads/master
Commit: a324df93835bab4e2b48b81c839133bf4c0b51c9
Parents: 7ef115e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 17:21:34 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 17:21:34 2013 +0200
----------------------------------------------------------------------
.../component/sap/netweaver/NetWeaverEndpoint.java | 7 +++++++
.../component/sap/netweaver/NetWeaverProducer.java | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a324df93/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
index 0112e53..3358a4d 100644
--- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
@@ -21,14 +21,21 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.UriParam;
public class NetWeaverEndpoint extends DefaultEndpoint {
+ @UriParam
private boolean json = true;
+ @UriParam
private boolean jsonAsMap = true;
+ @UriParam
private boolean flatternMap = true;
+ @UriParam
private String url;
+ @UriParam
private String username;
+ @UriParam
private String password;
public NetWeaverEndpoint(String endpointUri, Component component) {
http://git-wip-us.apache.org/repos/asf/camel/blob/a324df93/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
index faa0f54..7484d26 100644
--- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
@@ -23,8 +23,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.ExchangeHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.URISupport;
import org.codehaus.jackson.map.ObjectMapper;
public class NetWeaverProducer extends DefaultProducer {
@@ -75,7 +75,9 @@ public class NetWeaverProducer extends DefaultProducer {
@Override
protected void doStart() throws Exception {
String url = getEndpoint().getUrl() + "?authUsername=" + getEndpoint().getUsername() + "&authPassword=" + getEndpoint().getPassword() + "&authMethod=Basic";
- log.info("Creating NetWeaverProducer using url: {}", url);
+ if (log.isInfoEnabled()) {
+ log.info("Creating NetWeaverProducer using url: {}", URISupport.sanitizeUri(url));
+ }
http = getEndpoint().getCamelContext().getEndpoint(url).createProducer();
ServiceHelper.startService(http);
[2/2] git commit: CAMEL-6304: Added @UriParam to camel-twitter.
Posted by da...@apache.org.
CAMEL-6304: Added @UriParam to camel-twitter.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1f2e0d62
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1f2e0d62
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1f2e0d62
Branch: refs/heads/master
Commit: 1f2e0d62878ad65bf798708a952bfbb9a92a3eb5
Parents: a324df9
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 17:26:48 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 17:26:48 2013 +0200
----------------------------------------------------------------------
.../component/twitter/TwitterConfiguration.java | 32 +++++++++++---
1 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1f2e0d62/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
index fc26ab7..f2df043 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/TwitterConfiguration.java
@@ -20,6 +20,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import org.apache.camel.spi.UriParam;
import twitter4j.Twitter;
import twitter4j.TwitterFactory;
import twitter4j.TwitterStream;
@@ -32,68 +33,89 @@ public class TwitterConfiguration {
/**
* OAuth
*/
+ @UriParam
private String consumerKey;
+ @UriParam
private String consumerSecret;
+ @UriParam
private String accessToken;
+ @UriParam
private String accessTokenSecret;
/**
* Defines the Twitter API endpoint.
*/
+ @UriParam
private String type;
/**
* Polling delay.
*/
+ @UriParam
private int delay = 60;
/**
* Username -- used for searching, etc.
*/
+ @UriParam
private String user;
/**
* Keywords used for search and filters.
*/
+ @UriParam
private String keywords;
/**
* Lon/Lat bounding boxes used for filtering.
*/
+ @UriParam
private String locations;
/**
* List of userIds used for searching, etc.
*/
+ @UriParam
private String userIds;
/**
* Filter out old tweets that have been previously polled.
*/
+ @UriParam
private boolean filterOld = true;
/**
* Used for time-based endpoints (trends, etc.)
*/
+ @UriParam
private String date;
/**
* Used to set the sinceId from pulling
*/
+ @UriParam
private long sinceId = 1;
/**
* Used ot set the preferred language on which to search
*/
+ @UriParam
private String lang;
/**
* Used to set the maximum tweets per page (max = 100)
*/
+ @UriParam
private Integer count;
-
+
+ @UriParam
private Date parsedDate;
- private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+ /**
+ * Number of page to iterate before stop (default is 1)
+ */
+ @UriParam
+ private Integer numberOfPages = new Integer(1);
/**
* Singleton, on demand instances of Twitter4J's Twitter & TwitterStream.
@@ -106,11 +128,6 @@ public class TwitterConfiguration {
private TwitterStream twitterStream;
/**
- * Number of page to iterate before stop (default is 1)
- */
- private Integer numberOfPages = new Integer(1);
-
- /**
* Ensures required fields are available.
*/
public void checkComplete() {
@@ -252,6 +269,7 @@ public class TwitterConfiguration {
public void setDate(String date) {
this.date = date;
try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
parsedDate = sdf.parse(date);
} catch (ParseException e) {
throw new IllegalArgumentException("date must be in yyyy-mm-dd format!");