You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2014/04/29 16:39:21 UTC
[1/2] git commit: CAMEL-7399: camel-salesforce - Fixed alias caching
for updated XStream
Repository: camel
Updated Branches:
refs/heads/master f8b27d919 -> 913c48d92
CAMEL-7399: camel-salesforce - Fixed alias caching for updated XStream
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/913c48d9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/913c48d9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/913c48d9
Branch: refs/heads/master
Commit: 913c48d9288d520a3c67aa30946752b7ba0e25cf
Parents: d7a8334
Author: Dhiraj Bokde <db...@redhat.com>
Authored: Mon Apr 28 15:19:38 2014 -0700
Committer: Dhiraj Bokde <db...@redhat.com>
Committed: Tue Apr 29 07:36:04 2014 -0700
----------------------------------------------------------------------
.../component/salesforce/internal/processor/XmlRestProcessor.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/913c48d9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
index 80bb488..a10de93 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
@@ -205,6 +205,8 @@ public class XmlRestProcessor extends AbstractRestProcessor {
mapper.flushCache();
}
} catch (CannotResolveClassException ignore) {
+ // recent XStream versions add a ClassNotFoundException to cache
+ mapper.flushCache();
}
localXStream.alias(responseAlias, responseClass);
}
[2/2] git commit: CAMEL-7398: camel-salesforce - Fixed missing
token_type field in Salesforce login call
Posted by dh...@apache.org.
CAMEL-7398: camel-salesforce - Fixed missing token_type field in Salesforce login call
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d7a83342
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d7a83342
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d7a83342
Branch: refs/heads/master
Commit: d7a833424ab05a310b2724394ffb259c39a87a9f
Parents: f8b27d9
Author: Dhiraj Bokde <db...@redhat.com>
Authored: Mon Apr 28 15:18:18 2014 -0700
Committer: Dhiraj Bokde <db...@redhat.com>
Committed: Tue Apr 29 07:36:04 2014 -0700
----------------------------------------------------------------------
.../component/salesforce/internal/dto/LoginToken.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d7a83342/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
index c23338e..136eda3 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
@@ -33,6 +33,8 @@ public class LoginToken {
private String issuedAt;
+ private String tokenType;
+
@JsonProperty("access_token")
public String getAccessToken() {
return accessToken;
@@ -78,4 +80,15 @@ public class LoginToken {
public void setIssuedAt(String issuedAt) {
this.issuedAt = issuedAt;
}
+
+ @JsonProperty("token_type")
+ public String getTokenType() {
+ return tokenType;
+ }
+
+ @JsonProperty("token_type")
+ public void setTokenType(String tokenType) {
+ this.tokenType = tokenType;
+ }
+
}