[1/2] camel git commit: CAMEL-8317: XML DSL - Allow to use bean property style to configure endpoint options
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 89cb7e6cc - c1099b450
refs/heads/master 368be192d - 10c4e1bc5
CAMEL-8317: XML DSL - Allow to use bean property style to configure endpoint
options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/10c4e1bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/10c4e1bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/10c4e1bc
Branch: refs/heads/master
Commit: 10c4e1bc56721bf17312753ea38f2d2fb248f641
Parents: 368be19
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 07:13:05 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 07:13:05 2015 +0100
--
.../camel/core/xml/AbstractCamelEndpointFactoryBean.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/10c4e1bc/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
index 7e9fd68..231faa0 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
@@ -49,10 +49,10 @@ public abstract class AbstractCamelEndpointFactoryBean
extends AbstractCamelFact
public Endpoint getObject() throws Exception {
if (endpoint == null || !endpoint.isSingleton()) {
-// resolve placeholders
-this.uri = getCamelContext().resolvePropertyPlaceholders(uri);
-String target = createUri();
-endpoint = getCamelContext().getEndpoint(target);
+// resolve placeholders (but leave the original uri unchanged)
+String resolved =
getCamelContext().resolvePropertyPlaceholders(uri);
+String target = createUri(resolved);
+this.endpoint = getCamelContext().getEndpoint(target);
if (endpoint == null) {
throw new NoSuchEndpointException(target);
}
@@ -112,7 +112,7 @@ public abstract class AbstractCamelEndpointFactoryBean
extends AbstractCamelFact
this.properties = properties;
}
-private String createUri() throws Exception {
+private String createUri(String uri) throws Exception {
if (properties == null || properties.isEmpty()) {
return uri;
} else {
[2/2] camel git commit: CAMEL-8317: XML DSL - Allow to use bean property style to configure endpoint options
CAMEL-8317: XML DSL - Allow to use bean property style to configure endpoint
options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c1099b45
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c1099b45
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c1099b45
Branch: refs/heads/camel-2.15.x
Commit: c1099b450a179e3a07d6cd22d046bc00effaa494
Parents: 89cb7e6
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 07:13:05 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 07:13:24 2015 +0100
--
.../camel/core/xml/AbstractCamelEndpointFactoryBean.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c1099b45/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
index 7e9fd68..231faa0 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
@@ -49,10 +49,10 @@ public abstract class AbstractCamelEndpointFactoryBean
extends AbstractCamelFact
public Endpoint getObject() throws Exception {
if (endpoint == null || !endpoint.isSingleton()) {
-// resolve placeholders
-this.uri = getCamelContext().resolvePropertyPlaceholders(uri);
-String target = createUri();
-endpoint = getCamelContext().getEndpoint(target);
+// resolve placeholders (but leave the original uri unchanged)
+String resolved =
getCamelContext().resolvePropertyPlaceholders(uri);
+String target = createUri(resolved);
+this.endpoint = getCamelContext().getEndpoint(target);
if (endpoint == null) {
throw new NoSuchEndpointException(target);
}
@@ -112,7 +112,7 @@ public abstract class AbstractCamelEndpointFactoryBean
extends AbstractCamelFact
this.properties = properties;
}
-private String createUri() throws Exception {
+private String createUri(String uri) throws Exception {
if (properties == null || properties.isEmpty()) {
return uri;
} else {
[1/2] camel git commit: CAMEL-8521: camel-script - Should try all classloaders before throwing IAE
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x b83bda1c0 - 071be584d
refs/heads/master 35b83b1d3 - 74dc1c2c8
CAMEL-8521: camel-script - Should try all classloaders before throwing IAE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74dc1c2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74dc1c2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74dc1c2c
Branch: refs/heads/master
Commit: 74dc1c2c80f06f45c0810c7d4f43d6c459afac7f
Parents: 35b83b1
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 08:03:59 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 08:03:59 2015 +0100
--
.../camel/builder/script/ScriptBuilder.java | 27 +++-
1 file changed, 15 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/74dc1c2c/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
--
diff --git
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
index deb5fb4..36f459c 100644
---
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
+++
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
@@ -326,9 +326,9 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
}
protected static ScriptEngine createScriptEngine(String language) {
-ScriptEngine engine = createScriptEngine(language,
ScriptBuilder.class.getClassLoader());
+ScriptEngine engine = tryCreateScriptEngine(language,
ScriptBuilder.class.getClassLoader());
if (engine == null) {
-engine = createScriptEngine(language,
Thread.currentThread().getContextClassLoader());
+engine = tryCreateScriptEngine(language,
Thread.currentThread().getContextClassLoader());
}
if (engine == null) {
throw new IllegalArgumentException(No script engine could be
created for: + language);
@@ -336,7 +336,12 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
return engine;
}
-private static ScriptEngine createScriptEngine(String language,
ClassLoader classLoader) {
+/**
+ * Attemps to create the script engine for the given langauge using the
classloader
+ *
+ * @return the engine, or ttnull/tt if not able to create
+ */
+private static ScriptEngine tryCreateScriptEngine(String language,
ClassLoader classLoader) {
ScriptEngineManager manager = new ScriptEngineManager(classLoader);
ScriptEngine engine = null;
@@ -349,17 +354,15 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
break;
}
} catch (NoClassDefFoundError ex) {
-LOG.error(Cannot load the scriptEngine for + name + , the
exception is + ex
- + , please ensure correct JARs is provided on
classpath.);
+LOG.warn(Cannot load ScriptEngine for + name + . Please
ensure correct JARs is provided on classpath (stacktrace in DEBUG logging).);
+// include stacktrace in debug logging
+LOG.debug(Cannot load ScriptEngine for + name + . Please
ensure correct JARs is provided on classpath., ex);
}
}
if (engine == null) {
engine = checkForOSGiEngine(language);
}
-if (engine == null) {
-throw new IllegalArgumentException(No script engine could be
created for: + language);
-}
-if (isPython(language)) {
+if (engine != null isPython(language)) {
ScriptContext context = engine.getContext();
context.setAttribute(com.sun.script.jython.comp.mode, eval,
ScriptContext.ENGINE_SCOPE);
}
@@ -367,19 +370,19 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
}
private static ScriptEngine checkForOSGiEngine(String language) {
-LOG.debug(No script engine found for + language + using standard
javax.script auto-registration. Checking OSGi registry...);
+LOG.debug(No script engine found for {} using standard javax.script
auto-registration. Checking OSGi registry., language);
try {
// Test the OSGi environment with the Activator
Class? c =
Class.forName(org.apache.camel.script.osgi.Activator);
Method mth = c.getDeclaredMethod(getBundleContext);
Object ctx = mth.invoke(null);
-LOG.debug(Found OSGi
[1/2] camel git commit: CAMEL-8520: Upgrade smack to fix not able to use DNS due bug in smack 4.0.6.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x c1099b450 - b83bda1c0
refs/heads/master 10c4e1bc5 - 35b83b1d3
CAMEL-8520: Upgrade smack to fix not able to use DNS due bug in smack 4.0.6.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35b83b1d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35b83b1d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35b83b1d
Branch: refs/heads/master
Commit: 35b83b1d349d589171d50ee647a5b4cbab76ab16
Parents: 10c4e1b
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 07:53:58 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 07:53:58 2015 +0100
--
.../org/apache/camel/component/xmpp/XmppMultiUserChatTest.java | 2 ++
.../apache/camel/component/xmpp/XmppRobustConnectionTest.java | 5 +++--
.../java/org/apache/camel/component/xmpp/XmppRouteTest.java| 6 --
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/bundles.properties | 1 -
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
6 files changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/35b83b1d/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
--
diff --git
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
index 184dbda..1d1fbab 100644
---
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
+++
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.component.xmpp;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
/**
* @version
*/
+@Ignore(Caused by:
sun.security.provider.certpath.SunCertPathBuilderException: unable to find
valid certification path to requested target)
public class XmppMultiUserChatTest extends CamelTestSupport {
protected MockEndpoint consumerEndpoint;
http://git-wip-us.apache.org/repos/asf/camel/blob/35b83b1d/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
--
diff --git
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
index 25d4e07..277e1f4 100644
---
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
+++
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
@@ -36,8 +36,9 @@ public class XmppRobustConnectionTest extends
CamelTestSupport {
MockEndpoint consumerEndpoint = context.getEndpoint(mock:out,
MockEndpoint.class);
MockEndpoint errorEndpoint = context.getEndpoint(mock:error,
MockEndpoint.class);
-
-consumerEndpoint.setExpectedMessageCount(10);
+
+// the sleep may not be sufficient so assume around 9 or so messages
+consumerEndpoint.setMinimumExpectedMessageCount(9);
errorEndpoint.setExpectedMessageCount(5);
for (int i = 0; i 5; i++) {
http://git-wip-us.apache.org/repos/asf/camel/blob/35b83b1d/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
--
diff --git
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
index 93ab726..bb85b53 100644
---
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
+++
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
@@ -29,11 +29,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ProducerCache;
import org.jivesoftware.smack.packet.Message;
+import org.junit.Ignore;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-
+@Ignore(Caused by:
sun.security.provider.certpath.SunCertPathBuilderException: unable to find
valid certification path to requested target)
public class XmppRouteTest extends TestCase {
protected static boolean
[2/2] camel git commit: CAMEL-8520: Upgrade smack to fix not able to use DNS due bug in smack 4.0.6.
CAMEL-8520: Upgrade smack to fix not able to use DNS due bug in smack 4.0.6.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b83bda1c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b83bda1c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b83bda1c
Branch: refs/heads/camel-2.15.x
Commit: b83bda1c08069882e8b7775f92109f854a2666b2
Parents: c1099b4
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 07:53:58 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 07:54:15 2015 +0100
--
.../org/apache/camel/component/xmpp/XmppMultiUserChatTest.java | 2 ++
.../apache/camel/component/xmpp/XmppRobustConnectionTest.java | 5 +++--
.../java/org/apache/camel/component/xmpp/XmppRouteTest.java| 6 --
parent/pom.xml | 2 +-
platforms/karaf/features/src/main/resources/bundles.properties | 1 -
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
6 files changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b83bda1c/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
--
diff --git
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
index 184dbda..1d1fbab 100644
---
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
+++
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.component.xmpp;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
/**
* @version
*/
+@Ignore(Caused by:
sun.security.provider.certpath.SunCertPathBuilderException: unable to find
valid certification path to requested target)
public class XmppMultiUserChatTest extends CamelTestSupport {
protected MockEndpoint consumerEndpoint;
http://git-wip-us.apache.org/repos/asf/camel/blob/b83bda1c/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
--
diff --git
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
index 25d4e07..277e1f4 100644
---
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
+++
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java
@@ -36,8 +36,9 @@ public class XmppRobustConnectionTest extends
CamelTestSupport {
MockEndpoint consumerEndpoint = context.getEndpoint(mock:out,
MockEndpoint.class);
MockEndpoint errorEndpoint = context.getEndpoint(mock:error,
MockEndpoint.class);
-
-consumerEndpoint.setExpectedMessageCount(10);
+
+// the sleep may not be sufficient so assume around 9 or so messages
+consumerEndpoint.setMinimumExpectedMessageCount(9);
errorEndpoint.setExpectedMessageCount(5);
for (int i = 0; i 5; i++) {
http://git-wip-us.apache.org/repos/asf/camel/blob/b83bda1c/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
--
diff --git
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
index 93ab726..bb85b53 100644
---
a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
+++
b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
@@ -29,11 +29,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ProducerCache;
import org.jivesoftware.smack.packet.Message;
+import org.junit.Ignore;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-
+@Ignore(Caused by:
sun.security.provider.certpath.SunCertPathBuilderException: unable to find
valid certification path to requested target)
public class XmppRouteTest extends TestCase {
protected static boolean enabled;
protected static String xmppUrl;
@@ -52,6 +53,7 @@ public class XmppRouteTest extends TestCase {
[2/2] camel git commit: CAMEL-8521: camel-script - Should try all classloaders before throwing IAE
CAMEL-8521: camel-script - Should try all classloaders before throwing IAE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/071be584
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/071be584
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/071be584
Branch: refs/heads/camel-2.15.x
Commit: 071be584d7be8568ac62cf5562fb62fd86715a1b
Parents: b83bda1
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 08:03:59 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 08:04:18 2015 +0100
--
.../camel/builder/script/ScriptBuilder.java | 27 +++-
1 file changed, 15 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/071be584/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
--
diff --git
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
index deb5fb4..36f459c 100644
---
a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
+++
b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
@@ -326,9 +326,9 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
}
protected static ScriptEngine createScriptEngine(String language) {
-ScriptEngine engine = createScriptEngine(language,
ScriptBuilder.class.getClassLoader());
+ScriptEngine engine = tryCreateScriptEngine(language,
ScriptBuilder.class.getClassLoader());
if (engine == null) {
-engine = createScriptEngine(language,
Thread.currentThread().getContextClassLoader());
+engine = tryCreateScriptEngine(language,
Thread.currentThread().getContextClassLoader());
}
if (engine == null) {
throw new IllegalArgumentException(No script engine could be
created for: + language);
@@ -336,7 +336,12 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
return engine;
}
-private static ScriptEngine createScriptEngine(String language,
ClassLoader classLoader) {
+/**
+ * Attemps to create the script engine for the given langauge using the
classloader
+ *
+ * @return the engine, or ttnull/tt if not able to create
+ */
+private static ScriptEngine tryCreateScriptEngine(String language,
ClassLoader classLoader) {
ScriptEngineManager manager = new ScriptEngineManager(classLoader);
ScriptEngine engine = null;
@@ -349,17 +354,15 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
break;
}
} catch (NoClassDefFoundError ex) {
-LOG.error(Cannot load the scriptEngine for + name + , the
exception is + ex
- + , please ensure correct JARs is provided on
classpath.);
+LOG.warn(Cannot load ScriptEngine for + name + . Please
ensure correct JARs is provided on classpath (stacktrace in DEBUG logging).);
+// include stacktrace in debug logging
+LOG.debug(Cannot load ScriptEngine for + name + . Please
ensure correct JARs is provided on classpath., ex);
}
}
if (engine == null) {
engine = checkForOSGiEngine(language);
}
-if (engine == null) {
-throw new IllegalArgumentException(No script engine could be
created for: + language);
-}
-if (isPython(language)) {
+if (engine != null isPython(language)) {
ScriptContext context = engine.getContext();
context.setAttribute(com.sun.script.jython.comp.mode, eval,
ScriptContext.ENGINE_SCOPE);
}
@@ -367,19 +370,19 @@ public class ScriptBuilder implements Expression,
Predicate, Processor {
}
private static ScriptEngine checkForOSGiEngine(String language) {
-LOG.debug(No script engine found for + language + using standard
javax.script auto-registration. Checking OSGi registry...);
+LOG.debug(No script engine found for {} using standard javax.script
auto-registration. Checking OSGi registry., language);
try {
// Test the OSGi environment with the Activator
Class? c =
Class.forName(org.apache.camel.script.osgi.Activator);
Method mth = c.getDeclaredMethod(getBundleContext);
Object ctx = mth.invoke(null);
-LOG.debug(Found OSGi BundleContext + ctx);
+LOG.debug(Found OSGi BundleContext: {}, ctx);
if (ctx != null) {
camel git commit: Remove unused imports
Repository: camel Updated Branches: refs/heads/master cebd92468 - 344d1329b Remove unused imports Signed-off-by: Gregor Zurowski gre...@zurowski.org Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/344d1329 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/344d1329 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/344d1329 Branch: refs/heads/master Commit: 344d1329b35558ac110282bcfab3983a133b97a9 Parents: cebd924 Author: Gregor Zurowski gre...@zurowski.org Authored: Fri Mar 20 19:30:45 2015 -0400 Committer: Gregor Zurowski gre...@zurowski.org Committed: Fri Mar 20 19:30:45 2015 -0400 -- .../apache/camel/component/elasticsearch/ElasticsearchProducer.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/344d1329/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java -- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java index 2c2647a..b930119 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java @@ -17,7 +17,6 @@ package org.apache.camel.component.elasticsearch; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import org.apache.camel.Exchange;
camel git commit: Fix CS errors
Repository: camel
Updated Branches:
refs/heads/master 344d1329b - 32b4fd25d
Fix CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32b4fd25
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32b4fd25
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32b4fd25
Branch: refs/heads/master
Commit: 32b4fd25dee37243762932cbe8c1ca6a683c3f57
Parents: 344d132
Author: Gregor Zurowski gre...@zurowski.org
Authored: Fri Mar 20 20:41:06 2015 -0400
Committer: Gregor Zurowski gre...@zurowski.org
Committed: Fri Mar 20 20:41:06 2015 -0400
--
.../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/32b4fd25/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index bc10145..cd4a11b 100644
---
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -472,7 +472,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// parse the syntax and find the same group in the uri
Matcher matcher = SYNTAX_PATTERN.matcher(syntax);
ListString word = new ArrayListString();
-while (matcher.find() ) {
+while (matcher.find()) {
String s = matcher.group(1);
if (!scheme.equals(s)) {
word.add(s);
@@ -647,7 +647,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// parse the syntax into each options
Matcher matcher = SYNTAX_PATTERN.matcher(originalSyntax);
ListString options = new ArrayListString();
-while (matcher.find() ) {
+while (matcher.find()) {
String s = matcher.group(1);
options.add(s);
}
@@ -655,7 +655,7 @@ public class DefaultCamelCatalog implements CamelCatalog {
// parse the syntax into each options
Matcher matcher2 = SYNTAX_PATTERN.matcher(syntax);
ListString options2 = new ArrayListString();
-while (matcher2.find() ) {
+while (matcher2.find()) {
String s = matcher2.group(1);
options2.add(s);
}
[1/2] camel git commit: CAMEL-7999: Component docs
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 67c4937c3 - 9d55b69a2
refs/heads/master a86087339 - 9b1b92cf8
CAMEL-7999: Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b1b92cf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b1b92cf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b1b92cf
Branch: refs/heads/master
Commit: 9b1b92cf8a38e1bf482d1ab8fafb3c7017545592
Parents: a860873
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 15:43:52 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 15:43:52 2015 +0100
--
.../main/java/org/apache/camel/component/ResourceEndpoint.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9b1b92cf/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
index d5d181f..a8e7169 100644
--- a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
@@ -27,6 +27,7 @@ import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedResourceEndpointMBean;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.ProcessorEndpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.IOHelper;
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
public abstract class ResourceEndpoint extends ProcessorEndpoint implements
ManagedResourceEndpointMBean {
protected final Logger log = LoggerFactory.getLogger(getClass());
private volatile byte[] buffer;
-@UriPath(description = Path to the resource)
+@UriPath(description = Path to the resource) @Metadata(required = true)
private String resourceUri;
@UriParam(defaultValue = false, description = Sets whether to use
resource content cache or not)
private boolean contentCache;
[2/2] camel git commit: CAMEL-7999: Component docs
CAMEL-7999: Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d55b69a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d55b69a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d55b69a
Branch: refs/heads/camel-2.15.x
Commit: 9d55b69a2ccb6e64225a7341b22110731d5d0379
Parents: 67c4937
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 15:43:52 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 15:47:09 2015 +0100
--
.../main/java/org/apache/camel/component/ResourceEndpoint.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9d55b69a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
index d5d181f..a8e7169 100644
--- a/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
@@ -27,6 +27,7 @@ import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedResourceEndpointMBean;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.ProcessorEndpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.IOHelper;
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
public abstract class ResourceEndpoint extends ProcessorEndpoint implements
ManagedResourceEndpointMBean {
protected final Logger log = LoggerFactory.getLogger(getClass());
private volatile byte[] buffer;
-@UriPath(description = Path to the resource)
+@UriPath(description = Path to the resource) @Metadata(required = true)
private String resourceUri;
@UriParam(defaultValue = false, description = Sets whether to use
resource content cache or not)
private boolean contentCache;
camel git commit: [CAMEL-8523] Spring Boot should automagically load XML routes definitions from classpath.
Repository: camel
Updated Branches:
refs/heads/master 9b1b92cf8 - 2b6bf5f8c
[CAMEL-8523] Spring Boot should automagically load XML routes definitions from
classpath.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b6bf5f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b6bf5f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b6bf5f8
Branch: refs/heads/master
Commit: 2b6bf5f8ca0c509b565a36c98e3e63219b77b7f0
Parents: 9b1b92c
Author: Henryk Konsek hekon...@gmail.com
Authored: Fri Mar 20 16:43:11 2015 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Fri Mar 20 16:43:11 2015 +0100
--
.../spring/boot/CamelAutoConfiguration.java | 2 +-
.../camel/spring/boot/RoutesCollector.java | 25
.../spring/boot/CamelAutoConfigurationTest.java | 18 +-
.../src/test/resources/camel/camelContext.xml | 7 ++
4 files changed, 46 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2b6bf5f8/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
--
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index aba9623..5fdac34 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -63,7 +63,7 @@ public class CamelAutoConfiguration {
@ConditionalOnMissingBean(RoutesCollector.class)
RoutesCollector routesCollector(ApplicationContext applicationContext) {
CollectionCamelContextConfiguration configurations =
applicationContext.getBeansOfType(CamelContextConfiguration.class).values();
-return new RoutesCollector(applicationContext, new
ArrayListCamelContextConfiguration(configurations));
+return new RoutesCollector(new
ArrayListCamelContextConfiguration(configurations));
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/2b6bf5f8/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
--
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
index b0c501a..72c4eda 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/RoutesCollector.java
@@ -20,11 +20,13 @@ import java.util.List;
import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
+import org.apache.camel.model.RoutesDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.core.io.Resource;
public class RoutesCollector implements
ApplicationListenerContextRefreshedEvent {
@@ -32,14 +34,11 @@ public class RoutesCollector implements
ApplicationListenerContextRefreshedEven
// Collaborators
-private final ApplicationContext applicationContext;
-
private final ListCamelContextConfiguration camelContextConfigurations;
// Constructors
-public RoutesCollector(ApplicationContext applicationContext,
ListCamelContextConfiguration camelContextConfigurations) {
-this.applicationContext = applicationContext;
+public RoutesCollector(ListCamelContextConfiguration
camelContextConfigurations) {
this.camelContextConfigurations = camelContextConfigurations;
}
@@ -47,6 +46,7 @@ public class RoutesCollector implements
ApplicationListenerContextRefreshedEven
@Override
public void onApplicationEvent(ContextRefreshedEvent
contextRefreshedEvent) {
+ApplicationContext applicationContext =
contextRefreshedEvent.getApplicationContext();
CamelContext camelContext =
contextRefreshedEvent.getApplicationContext().getBean(CamelContext.class);
LOG.debug(Post-processing CamelContext bean: {},
camelContext.getName());
for (RoutesBuilder routesBuilder :
applicationContext.getBeansOfType(RoutesBuilder.class).values()) {
@@ -57,6 +57,9 @@ public class RoutesCollector implements
ApplicationListenerContextRefreshedEven
throw new RuntimeException(e);
[1/2] camel git commit: CAMEL-8509: camel-catalog - Add api to parse endpoint uri and reverse
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 071be584d - 67c4937c3
refs/heads/master 74dc1c2c8 - a86087339
CAMEL-8509: camel-catalog - Add api to parse endpoint uri and reverse
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8608733
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8608733
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8608733
Branch: refs/heads/master
Commit: a86087339074086116ff5d28bbd470f5adbacf05
Parents: 74dc1c2
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 13:13:41 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 13:13:41 2015 +0100
--
.../camel/catalog/DefaultCamelCatalog.java | 22 +++-
.../apache/camel/catalog/CamelCatalogTest.java | 17 +++
2 files changed, 34 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a8608733/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index e35fc37..bc10145 100644
---
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -481,12 +481,24 @@ public class DefaultCamelCatalog implements CamelCatalog {
String uriPath = stripQuery(uri);
-Matcher matcher2 = SYNTAX_PATTERN.matcher(uriPath);
+// if there is only one, then use uriPath as is
ListString word2 = new ArrayListString();
-while (matcher2.find() ) {
-String s = matcher2.group(1);
-if (!scheme.equals(s)) {
-word2.add(s);
+
+if (word.size() == 1) {
+String s = uriPath;
+s = URISupport.stripPrefix(s, scheme);
+// strip any leading : or / after the scheme
+while (s.startsWith(:) || s.startsWith(/)) {
+s = s.substring(1);
+}
+word2.add(s);
+} else {
+Matcher matcher2 = SYNTAX_PATTERN.matcher(uriPath);
+while (matcher2.find()) {
+String s = matcher2.group(1);
+if (!scheme.equals(s)) {
+word2.add(s);
+}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a8608733/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
--
diff --git
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index ad5c34c..6f9f510 100644
---
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -172,4 +172,21 @@ public class CamelCatalogTest extends TestCase {
assertEquals(false, map.get(deliveryPersistent));
}
+@Test
+public void testEndpointPropertiesAtom() throws Exception {
+MapString, String map =
catalog.endpointProperties(atom:file:src/test/data/feed.atom);
+assertNotNull(map);
+assertEquals(1, map.size());
+
+assertEquals(file:src/test/data/feed.atom, map.get(feedUri));
+
+map =
catalog.endpointProperties(atom:file:src/test/data/feed.atom?splitEntries=falsedelay=5000);
+assertNotNull(map);
+assertEquals(3, map.size());
+
+assertEquals(file:src/test/data/feed.atom, map.get(feedUri));
+assertEquals(false, map.get(splitEntries));
+assertEquals(5000, map.get(delay));
+}
+
}
[2/2] camel git commit: CAMEL-8509: camel-catalog - Add api to parse endpoint uri and reverse
CAMEL-8509: camel-catalog - Add api to parse endpoint uri and reverse
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67c4937c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67c4937c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67c4937c
Branch: refs/heads/camel-2.15.x
Commit: 67c4937c37f6a9a237cbdbb610e05beaeaf52e03
Parents: 071be58
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Mar 20 13:13:41 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Mar 20 13:14:02 2015 +0100
--
.../camel/catalog/DefaultCamelCatalog.java | 22 +++-
.../apache/camel/catalog/CamelCatalogTest.java | 17 +++
2 files changed, 34 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/67c4937c/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
--
diff --git
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index e35fc37..bc10145 100644
---
a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -481,12 +481,24 @@ public class DefaultCamelCatalog implements CamelCatalog {
String uriPath = stripQuery(uri);
-Matcher matcher2 = SYNTAX_PATTERN.matcher(uriPath);
+// if there is only one, then use uriPath as is
ListString word2 = new ArrayListString();
-while (matcher2.find() ) {
-String s = matcher2.group(1);
-if (!scheme.equals(s)) {
-word2.add(s);
+
+if (word.size() == 1) {
+String s = uriPath;
+s = URISupport.stripPrefix(s, scheme);
+// strip any leading : or / after the scheme
+while (s.startsWith(:) || s.startsWith(/)) {
+s = s.substring(1);
+}
+word2.add(s);
+} else {
+Matcher matcher2 = SYNTAX_PATTERN.matcher(uriPath);
+while (matcher2.find()) {
+String s = matcher2.group(1);
+if (!scheme.equals(s)) {
+word2.add(s);
+}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/67c4937c/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
--
diff --git
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index ad5c34c..6f9f510 100644
---
a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -172,4 +172,21 @@ public class CamelCatalogTest extends TestCase {
assertEquals(false, map.get(deliveryPersistent));
}
+@Test
+public void testEndpointPropertiesAtom() throws Exception {
+MapString, String map =
catalog.endpointProperties(atom:file:src/test/data/feed.atom);
+assertNotNull(map);
+assertEquals(1, map.size());
+
+assertEquals(file:src/test/data/feed.atom, map.get(feedUri));
+
+map =
catalog.endpointProperties(atom:file:src/test/data/feed.atom?splitEntries=falsedelay=5000);
+assertNotNull(map);
+assertEquals(3, map.size());
+
+assertEquals(file:src/test/data/feed.atom, map.get(feedUri));
+assertEquals(false, map.get(splitEntries));
+assertEquals(5000, map.get(delay));
+}
+
}
[4/9] camel git commit: CAMEL-8269: added support for APEX REST calls, also updated Salesforce API version to 33.0
CAMEL-8269: added support for APEX REST calls, also updated Salesforce API
version to 33.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c89e21f4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c89e21f4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c89e21f4
Branch: refs/heads/camel-2.13.x
Commit: c89e21f4f8830edf7bd0d23d4e078bb0370ce1d7
Parents: e04638a
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 13:38:37 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:42 2015 -0700
--
.../MerchandiseRestResource.apxc| 44 +
.../salesforce/SalesforceComponent.java | 21 ++
.../salesforce/SalesforceEndpointConfig.java| 80 +++-
.../salesforce/api/dto/AbstractSObjectBase.java | 22 +++
.../salesforce/api/dto/ActionOverride.java | 75
.../api/dto/ActionOverrideTypeEnum.java | 57 ++
.../salesforce/api/dto/ChildRelationShip.java | 20 ++
.../salesforce/api/dto/FilteredLookupInfo.java | 48 +
.../component/salesforce/api/dto/InfoUrls.java | 30 +++
.../salesforce/api/dto/NamedLayoutInfo.java | 39
.../salesforce/api/dto/RecordTypeInfo.java | 9 +
.../salesforce/api/dto/RestResources.java | 99 ++
.../component/salesforce/api/dto/SObject.java | 8 +
.../salesforce/api/dto/SObjectDescription.java | 20 ++
.../salesforce/api/dto/SObjectField.java| 63 ++
.../salesforce/api/dto/SObjectUrls.java | 81
.../salesforce/internal/OperationName.java | 1 +
.../internal/client/DefaultRestClient.java | 60 +-
.../salesforce/internal/client/RestClient.java | 13 ++
.../internal/dto/NotifyForFieldsEnum.java | 10 +-
.../internal/dto/NotifyForOperationsEnum.java | 10 +-
.../salesforce/internal/dto/PushTopic.java | 49 -
.../processor/AbstractRestProcessor.java| 190 +++
.../internal/processor/JsonRestProcessor.java | 10 +-
.../internal/processor/XmlRestProcessor.java| 17 +-
.../internal/streaming/PushTopicHelper.java | 74 ++--
.../salesforce/RestApiIntegrationTest.java | 113 +++
.../salesforce/StreamingApiIntegrationTest.java | 4 +-
.../salesforce/dto/generated/Document.java | 26 ++-
.../src/test/resources/log4j.properties | 1 +
30 files changed, 1194 insertions(+), 100 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c89e21f4/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
b/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
new file mode 100644
index 000..91ce5ce
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
@@ -0,0 +1,44 @@
+@RestResource(urlMapping='/Merchandise/*')
+global with sharing class MerchandiseRestResource {
+
+@HttpGet
+global static Merchandise__c doGet() {
+RestRequest req = RestContext.request;
+String merchandiseId = null;
+if (!req.requestURI.endsWith('/')) {
+merchandiseId =
req.requestURI.substring(req.requestURI.lastIndexOf('/')+1);
+} else if (req.params.get('id') != null) {
+merchandiseId = req.params.get('id');
+}
+if (merchandiseId != null) {
+ Merchandise__c merchandise = [SELECT Id, Name, Description__c,
Price__c, Total_Inventory__c FROM Merchandise__c WHERE Id = :merchandiseId];
+return merchandise;
+} else {
+throw new InvalidParamException('Missing merchandise id in URL and
query params');
+}
+}
+
+ @HttpPatch
+ global static Merchandise__c doPatch(Merchandise__c merchandise) {
+// lookup merchandise
+Merchandise__c current = [SELECT Id, Name, Description__c, Price__c,
Total_Inventory__c FROM Merchandise__c WHERE Id = :merchandise.Id];
+if (current == null) {
+throw new InvalidParamException('Missing merchandise for id ' +
merchandise.Id);
+}
+if (merchandise.Description__c != null) {
+current.Description__c = merchandise.Description__c;
+}
+if (merchandise.Price__c != null) {
+current.Price__c = merchandise.Price__c;
+}
+if (merchandise.Total_Inventory__c != null) {
+current.Total_Inventory__c = merchandise.Total_Inventory__c;
+}
+
+update current;
+return current;
+}
+
+ // Invalid Merchandise Id exception
+public class InvalidParamException
[3/9] camel git commit: CAMEL-8269: added support for APEX REST calls, also updated Salesforce API version to 33.0
http://git-wip-us.apache.org/repos/asf/camel/blob/c89e21f4/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index 9f51bbd..52a95f6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -24,7 +24,12 @@ import java.nio.channels.ReadableByteChannel;
import java.util.HashMap;
import java.util.List;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.salesforce.api.SalesforceException;
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
import org.apache.camel.component.salesforce.api.dto.GlobalObjects;
import org.apache.camel.component.salesforce.api.dto.RestResources;
@@ -38,6 +43,7 @@ import
org.apache.camel.component.salesforce.dto.generated.Document;
import org.apache.camel.component.salesforce.dto.generated.Line_Item__c;
import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import
org.apache.camel.component.salesforce.dto.generated.QueryRecordsLine_Item__c;
+import org.eclipse.jetty.http.HttpStatus;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -297,6 +303,94 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
LOG.debug(ExecuteSearch: {}, searchResults);
}
+@Test
+public void testApexCall() throws Exception {
+try {
+doTestApexCall();
+doTestApexCall(Xml);
+} catch (CamelExecutionException e) {
+if (e.getCause() instanceof SalesforceException) {
+SalesforceException cause = (SalesforceException) e.getCause();
+if (cause.getStatusCode() == HttpStatus.NOT_FOUND_404) {
+LOG.error(Make sure test REST resource
MerchandiseRestResource.apxc has been loaded:
++ e.getMessage());
+}
+}
+throw e;
+}
+}
+
+private void doTestApexCall(String suffix) throws Exception {
+
+if (testId == null) {
+// execute getBasicInfo to get test id from recent items
+doTestGetBasicInfo();
+}
+
+// request merchandise with id in URI template
+Merchandise__c merchandise =
template().requestBodyAndHeader(direct:apexCallGet + suffix, null,
+id, testId, Merchandise__c.class);
+assertNotNull(merchandise);
+LOG.debug(ApexCallGet: {}, merchandise);
+
+// request merchandise with id as query param
+merchandise =
template().requestBodyAndHeader(direct:apexCallGetWithId + suffix, null,
+SalesforceEndpointConfig.APEX_QUERY_PARAM_PREFIX + id, testId,
Merchandise__c.class);
+assertNotNull(merchandise);
+LOG.debug(ApexCallGetWithId: {}, merchandise);
+
+// patch merchandise
+// clear fields that won't be modified
+merchandise.clearBaseFields();
+merchandise.setId(testId);
+merchandise.setPrice__c(null);
+merchandise.setTotal_Inventory__c(null);
+
+merchandise = template().requestBody(direct:apexCallPatch + suffix,
+new MerchandiseRequest(merchandise), Merchandise__c.class);
+assertNotNull(merchandise);
+LOG.debug(ApexCallPatch: {}, merchandise);
+}
+
+/**
+ * Request DTO for Salesforce APEX REST calls.
+ * See
https://www.salesforce.com/us/developer/docs/apexcode/Content/apex_rest_methods.htm.
+ */
+@XStreamAlias(request)
+public static class MerchandiseRequest extends AbstractDTOBase {
+private Merchandise__c merchandise;
+
+public MerchandiseRequest(Merchandise__c merchandise) {
+this.merchandise = merchandise;
+}
+
+public Merchandise__c getMerchandise() {
+return merchandise;
+}
+
+public void setMerchandise(Merchandise__c merchandise) {
+this.merchandise = merchandise;
+}
+}
+
+/**
+ * Response DTO for Salesforce APEX REST calls.
+ * See
https://www.salesforce.com/us/developer/docs/apexcode/Content/apex_rest_methods.htm.
+ */
+@XStreamAlias(response)
+public static class
[7/9] camel git commit: CAMEL-8519: Fixed salesforce security listener to replace OAuth header
CAMEL-8519: Fixed salesforce security listener to replace OAuth header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9c1c5512
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c1c5512
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c1c5512
Branch: refs/heads/camel-2.13.x
Commit: 9c1c5512e83e52f45b0e9ac81b88bc29adbdcd8d
Parents: 53893e5
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:54:57 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:44 2015 -0700
--
.../salesforce/internal/client/SalesforceSecurityListener.java | 4 ++--
.../salesforce/internal/streaming/SubscriptionHelper.java| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9c1c5512/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
index 552401c..27d838a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
@@ -103,8 +103,8 @@ public class SalesforceSecurityListener extends
HttpEventListenerWrapper {
client.setInstanceUrl(session.getInstanceUrl());
client.setAccessToken(exchange);
} else {
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
-OAuth + currentToken);
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
+OAuth + currentToken);
}
// TODO handle a change in Salesforce instanceUrl, right now
we retry with the same destination
http://git-wip-us.apache.org/repos/asf/camel/blob/9c1c5512/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 7aaa086..b0ed0d6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -213,7 +213,7 @@ public class SubscriptionHelper extends ServiceSupport {
}
// add current security token obtained from session
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
OAuth + accessToken);
}
};
[2/9] camel git commit: CAMEL-8267: fixed mojo integration test to use system property or default login url
CAMEL-8267: fixed mojo integration test to use system property or default login
url
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2bad2892
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2bad2892
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2bad2892
Branch: refs/heads/camel-2.13.x
Commit: 2bad2892a2312acea2cfce711dc93c40fb39865d
Parents: f548488
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 12:34:41 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:41 2015 -0700
--
.../camel/maven/CamelSalesforceMojoIntegrationTest.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2bad2892/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
index 406ce5f..cf9bcb9 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
@@ -16,10 +16,15 @@
*/
package org.apache.camel.maven;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Properties;
import org.apache.camel.component.salesforce.SalesforceEndpointConfig;
+import org.apache.camel.component.salesforce.SalesforceLoginConfig;
import org.apache.maven.plugin.logging.SystemStreamLog;
import org.junit.Assert;
import org.junit.Test;
@@ -39,6 +44,7 @@ public class CamelSalesforceMojoIntegrationTest {
// set defaults
mojo.version = System.getProperty(apiVersion,
SalesforceEndpointConfig.DEFAULT_VERSION);
+mojo.loginUrl = System.getProperty(loginUrl,
SalesforceLoginConfig.DEFAULT_LOGIN_URL);
mojo.outputDirectory = new
File(target/generated-sources/camel-salesforce);
mojo.packageName = org.apache.camel.salesforce.dto;
[6/9] camel git commit: CAMEL-8269: replaced 2.15 URISupport.appendParametersToURI with 2.14.x URISupport.createRemainingURI
CAMEL-8269: replaced 2.15 URISupport.appendParametersToURI with 2.14.x
URISupport.createRemainingURI
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/53893e5d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/53893e5d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/53893e5d
Branch: refs/heads/camel-2.13.x
Commit: 53893e5d77884073663d224ee4a565b64d799f0f
Parents: c89e21f
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 13:56:52 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:43 2015 -0700
--
.../component/salesforce/internal/client/DefaultRestClient.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/53893e5d/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index 0b06289..9a9f91b 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -19,12 +19,14 @@ package
org.apache.camel.component.salesforce.internal.client;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.util.List;
import java.util.Map;
import com.thoughtworks.xstream.XStream;
+
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.dto.RestError;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
@@ -344,7 +346,7 @@ public class DefaultRestClient extends AbstractClientBase
implements RestClient
throws UnsupportedEncodingException, URISyntaxException {
if (queryParams != null !queryParams.isEmpty()) {
-apexUrl = URISupport.appendParametersToURI(apexUrl, queryParams);
+apexUrl = URISupport.createRemainingURI(new URI(apexUrl),
queryParams).toString();
}
return instanceUrl + SERVICES_APEXREST + apexUrl;
[1/9] camel git commit: CAMEL-8267: Allow to configure Salesforce URL
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x a42d6fa3a - 6a541ef83
CAMEL-8267: Allow to configure Salesforce URL
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5484888
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5484888
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5484888
Branch: refs/heads/camel-2.13.x
Commit: f5484888f7fd32f08c56e07fe504d677a03756ba
Parents: a42d6fa
Author: Cristiano Nicolai cristiano.nico...@gmail.com
Authored: Fri Jan 23 12:43:45 2015 +1000
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:40 2015 -0700
--
.../java/org/apache/camel/maven/CamelSalesforceMojo.java| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f5484888/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index fdb0f8e..dab9c70 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -114,6 +114,12 @@ public class CamelSalesforceMojo extends AbstractMojo {
protected File outputDirectory;
/**
+ * Salesforce URL.
+ */
+@Parameter(property = camelSalesforce.loginUrl, defaultValue =
SalesforceLoginConfig.DEFAULT_LOGIN_URL)
+protected String loginUrl;
+
+/**
* Names of Salesforce SObject for which POJOs must be generated
*/
@Parameter
@@ -178,8 +184,7 @@ public class CamelSalesforceMojo extends AbstractMojo {
}
final SalesforceSession session = new SalesforceSession(httpClient,
-new
SalesforceLoginConfig(SalesforceLoginConfig.DEFAULT_LOGIN_URL,
-clientId, clientSecret, userName, password, false));
+new SalesforceLoginConfig(loginUrl, clientId, clientSecret,
userName, password, false));
getLog().info(Salesforce login...);
try {
[8/9] camel git commit: CAMEL-8517: Updated SalesforceSession to use volatile shared fields
CAMEL-8517: Updated SalesforceSession to use volatile shared fields
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1bf9207
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1bf9207
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1bf9207
Branch: refs/heads/camel-2.13.x
Commit: a1bf92075b4977de80eb8c91f74fb6e565985810
Parents: 9c1c551
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:57:03 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:44 2015 -0700
--
.../component/salesforce/internal/SalesforceSession.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a1bf9207/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 5dcb68b..2364697 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -56,8 +56,8 @@ public class SalesforceSession implements Service {
private final ObjectMapper objectMapper;
private final SetSalesforceSessionListener listeners;
-private String accessToken;
-private String instanceUrl;
+private volatile String accessToken;
+private volatile String instanceUrl;
public SalesforceSession(HttpClient httpClient, SalesforceLoginConfig
config) {
// validate parameters
@@ -198,7 +198,7 @@ public class SalesforceSession implements Service {
return accessToken;
}
-public void logout() throws SalesforceException {
+public synchronized void logout() throws SalesforceException {
if (accessToken == null) {
return;
}
@@ -236,7 +236,7 @@ public class SalesforceSession implements Service {
throw new SalesforceException(Logout request TIMEOUT!, null);
default:
-throw new SalesforceException(Unknow status: + done, null);
+throw new SalesforceException(Unknown status: + done, null);
}
} catch (SalesforceException e) {
throw e;
@@ -247,7 +247,7 @@ public class SalesforceSession implements Service {
// reset session
accessToken = null;
instanceUrl = null;
-// notify all session listeners of the new access token and
instance url
+// notify all session listeners about logout
for (SalesforceSessionListener listener : listeners) {
try {
listener.onLogout();
[9/9] camel git commit: CAMEL-8516: Fixed 300 status code exception handling, minor polish
CAMEL-8516: Fixed 300 status code exception handling, minor polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a541ef8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a541ef8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a541ef8
Branch: refs/heads/camel-2.13.x
Commit: 6a541ef8346b1875459e85a97f8f4bd022ef7d6a
Parents: a1bf920
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 13:36:48 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:45 2015 -0700
--
.../salesforce/SalesforceConsumer.java | 4 +-
.../salesforce/api/SalesforceException.java | 44 ---
.../api/SalesforceMultipleChoicesException.java | 41 ++
.../salesforce/internal/SalesforceSession.java | 21 ++-
.../internal/client/AbstractClientBase.java | 4 +-
.../internal/client/DefaultBulkApiClient.java | 2 +-
.../internal/client/DefaultRestClient.java | 68 +++---
.../salesforce/internal/dto/RestChoices.java| 40 ++
.../salesforce/RestApiIntegrationTest.java | 131 ++-
9 files changed, 296 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/6a541ef8/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index b47f658..ac44d5a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -141,8 +141,8 @@ public class SalesforceConsumer extends DefaultConsumer {
// TODO do we need to add NPE checks for message/data.get***???
MapString, Object data = message.getDataAsMap();
-@SuppressWarnings(unchecked) final
-MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
+@SuppressWarnings(unchecked)
+final MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
final Object eventType = event.get(TYPE_PROPERTY);
Object createdDate = event.get(CREATED_DATE_PROPERTY);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/6a541ef8/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
index 4005ec4..dd25f0a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
@@ -58,13 +58,13 @@ public class SalesforceException extends CamelException {
}
public SalesforceException(ListRestError errors, int statusCode, String
message, Throwable cause) {
-super(toErrorMessage(errors, statusCode), cause);
+super(message == null ? toErrorMessage(errors, statusCode) : message,
cause);
this.errors = errors;
this.statusCode = statusCode;
}
public ListRestError getErrors() {
-return Collections.unmodifiableList(errors);
+return errors != null ? Collections.unmodifiableList(errors) : null;
}
public int getStatusCode() {
@@ -73,30 +73,42 @@ public class SalesforceException extends CamelException {
@Override
public String toString() {
+final StringBuilder builder = new StringBuilder({);
+appendFields(builder);
+builder.append(});
+return builder.toString();
+}
+
+protected void appendFields(StringBuilder builder) {
+// append message
+builder.append(message:');
+builder.append(getMessage());
+builder.append(',);
+
+// check for error
if (errors != null) {
-return toErrorMessage(errors, statusCode);
-} else {
-// make sure we include the custom
[5/9] camel git commit: CAMEL-8395: handles empty Salesforce picklists, also maps urn:address to String
CAMEL-8395: handles empty Salesforce picklists, also maps urn:address to String
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e04638a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e04638a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e04638a9
Branch: refs/heads/camel-2.13.x
Commit: e04638a970dfae06fef7816da0a1553c79322582
Parents: 2bad289
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 12:42:21 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:59:42 2015 -0700
--
.../apache/camel/maven/CamelSalesforceMojo.java | 63 +---
.../src/main/resources/sobject-picklist.vm | 18 +++---
2 files changed, 52 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e04638a9/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index dab9c70..d517f24 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -21,6 +21,9 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -28,6 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
@@ -212,7 +216,7 @@ public class CamelSalesforceMojo extends AbstractMojo {
final ObjectMapper mapper = new ObjectMapper();
// call getGlobalObjects to get all SObjects
-final SetString objectNames = new HashSetString();
+final SetString objectNames = new TreeSetString();
final SyncResponseCallback callback = new SyncResponseCallback();
try {
getLog().info(Getting Salesforce Objects...);
@@ -307,23 +311,23 @@ public class CamelSalesforceMojo extends AbstractMojo {
// for every accepted name, get SObject description
final SetSObjectDescription descriptions = new
HashSetSObjectDescription();
-try {
-getLog().info(Retrieving Object descriptions...);
-for (String name : objectNames) {
-callback.reset();
-restClient.getDescription(name, callback);
-if (!callback.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-throw new MojoExecutionException(Timeout waiting for
getDescription for sObject + name);
-}
-final SalesforceException ex = callback.getException();
-if (ex != null) {
-throw ex;
-}
-descriptions.add(mapper.readValue(callback.getResponse(),
SObjectDescription.class));
+getLog().info(Retrieving Object descriptions...);
+for (String name : objectNames) {
+try {
+callback.reset();
+restClient.getDescription(name, callback);
+if (!callback.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
+throw new MojoExecutionException(Timeout waiting
for getDescription for sObject + name);
+}
+final SalesforceException ex = callback.getException();
+if (ex != null) {
+throw ex;
+}
+
descriptions.add(mapper.readValue(callback.getResponse(),
SObjectDescription.class));
+} catch (Exception e) {
+String msg = Error getting SObject description for ' +
name + ': + e.getMessage();
+throw new MojoExecutionException(msg, e);
}
-} catch (Exception e) {
-String msg = Error getting SObject description +
e.getMessage();
-throw new MojoExecutionException(msg, e);
}
// create package directory
@@ -494,6 +498,7 @@ public class CamelSalesforceMojo
camel git commit: Minor polish
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 6a541ef83 - 8af10cf1f
Minor polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8af10cf1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8af10cf1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8af10cf1
Branch: refs/heads/camel-2.13.x
Commit: 8af10cf1fab7fe30a199cd261cb062384956a08d
Parents: 6a541ef
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 14:08:05 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:08:05 2015 -0700
--
.../org/apache/camel/component/salesforce/api/dto/RestError.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8af10cf1/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
index 980108e..c67cf07 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
@@ -29,7 +29,6 @@ public class RestError extends AbstractDTOBase {
// default ctor for unmarshalling
public RestError() {
-super();
}
public RestError(String errorCode, String message, ListString fields) {
[2/2] camel git commit: CAMEL-8517: Updated SalesforceSession to use volatile shared fields
CAMEL-8517: Updated SalesforceSession to use volatile shared fields
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/781e2c1f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/781e2c1f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/781e2c1f
Branch: refs/heads/master
Commit: 781e2c1f29bd80ba82d963b8d9ea44a5af7f02b9
Parents: 84340b3
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:57:03 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 09:57:03 2015 -0700
--
.../component/salesforce/internal/SalesforceSession.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/781e2c1f/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 5dcb68b..2364697 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -56,8 +56,8 @@ public class SalesforceSession implements Service {
private final ObjectMapper objectMapper;
private final SetSalesforceSessionListener listeners;
-private String accessToken;
-private String instanceUrl;
+private volatile String accessToken;
+private volatile String instanceUrl;
public SalesforceSession(HttpClient httpClient, SalesforceLoginConfig
config) {
// validate parameters
@@ -198,7 +198,7 @@ public class SalesforceSession implements Service {
return accessToken;
}
-public void logout() throws SalesforceException {
+public synchronized void logout() throws SalesforceException {
if (accessToken == null) {
return;
}
@@ -236,7 +236,7 @@ public class SalesforceSession implements Service {
throw new SalesforceException(Logout request TIMEOUT!, null);
default:
-throw new SalesforceException(Unknow status: + done, null);
+throw new SalesforceException(Unknown status: + done, null);
}
} catch (SalesforceException e) {
throw e;
@@ -247,7 +247,7 @@ public class SalesforceSession implements Service {
// reset session
accessToken = null;
instanceUrl = null;
-// notify all session listeners of the new access token and
instance url
+// notify all session listeners about logout
for (SalesforceSessionListener listener : listeners) {
try {
listener.onLogout();
[1/2] camel git commit: CAMEL-8519: Fixed salesforce security listener to replace OAuth header
Repository: camel
Updated Branches:
refs/heads/master 2b6bf5f8c - 781e2c1f2
CAMEL-8519: Fixed salesforce security listener to replace OAuth header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/84340b3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84340b3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84340b3f
Branch: refs/heads/master
Commit: 84340b3f05d39437b725f2f5510f44e862f98b19
Parents: 2b6bf5f
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:54:57 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 09:54:57 2015 -0700
--
.../salesforce/internal/client/SalesforceSecurityListener.java | 4 ++--
.../salesforce/internal/streaming/SubscriptionHelper.java| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/84340b3f/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
index 552401c..27d838a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
@@ -103,8 +103,8 @@ public class SalesforceSecurityListener extends
HttpEventListenerWrapper {
client.setInstanceUrl(session.getInstanceUrl());
client.setAccessToken(exchange);
} else {
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
-OAuth + currentToken);
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
+OAuth + currentToken);
}
// TODO handle a change in Salesforce instanceUrl, right now
we retry with the same destination
http://git-wip-us.apache.org/repos/asf/camel/blob/84340b3f/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 7aaa086..b0ed0d6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -213,7 +213,7 @@ public class SubscriptionHelper extends ServiceSupport {
}
// add current security token obtained from session
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
OAuth + accessToken);
}
};
camel git commit: CAMEL-8516: Fixed 300 status code exception handling, minor polish
Repository: camel
Updated Branches:
refs/heads/master 781e2c1f2 - cebd92468
CAMEL-8516: Fixed 300 status code exception handling, minor polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cebd9246
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cebd9246
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cebd9246
Branch: refs/heads/master
Commit: cebd92468ca086c37810040b9276cc02448698e7
Parents: 781e2c1
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 13:36:48 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:36:48 2015 -0700
--
.../salesforce/SalesforceConsumer.java | 4 +-
.../salesforce/api/SalesforceException.java | 44 ---
.../api/SalesforceMultipleChoicesException.java | 41 ++
.../salesforce/internal/SalesforceSession.java | 21 ++-
.../internal/client/AbstractClientBase.java | 4 +-
.../internal/client/DefaultBulkApiClient.java | 2 +-
.../internal/client/DefaultRestClient.java | 69 +++---
.../salesforce/internal/dto/RestChoices.java| 40 ++
.../salesforce/RestApiIntegrationTest.java | 131 ++-
9 files changed, 297 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cebd9246/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index b47f658..ac44d5a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -141,8 +141,8 @@ public class SalesforceConsumer extends DefaultConsumer {
// TODO do we need to add NPE checks for message/data.get***???
MapString, Object data = message.getDataAsMap();
-@SuppressWarnings(unchecked) final
-MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
+@SuppressWarnings(unchecked)
+final MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
final Object eventType = event.get(TYPE_PROPERTY);
Object createdDate = event.get(CREATED_DATE_PROPERTY);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/cebd9246/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
index 4005ec4..dd25f0a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
@@ -58,13 +58,13 @@ public class SalesforceException extends CamelException {
}
public SalesforceException(ListRestError errors, int statusCode, String
message, Throwable cause) {
-super(toErrorMessage(errors, statusCode), cause);
+super(message == null ? toErrorMessage(errors, statusCode) : message,
cause);
this.errors = errors;
this.statusCode = statusCode;
}
public ListRestError getErrors() {
-return Collections.unmodifiableList(errors);
+return errors != null ? Collections.unmodifiableList(errors) : null;
}
public int getStatusCode() {
@@ -73,30 +73,42 @@ public class SalesforceException extends CamelException {
@Override
public String toString() {
+final StringBuilder builder = new StringBuilder({);
+appendFields(builder);
+builder.append(});
+return builder.toString();
+}
+
+protected void appendFields(StringBuilder builder) {
+// append message
+builder.append(message:');
+builder.append(getMessage());
+builder.append(',);
+
+// check for error
if (errors != null) {
-return toErrorMessage(errors,
[3/3] camel git commit: CAMEL-8516: Fixed 300 status code exception handling, minor polish
CAMEL-8516: Fixed 300 status code exception handling, minor polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74f9ea0b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74f9ea0b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74f9ea0b
Branch: refs/heads/camel-2.15.x
Commit: 74f9ea0be9714d971d82d96ad55825ba6b1dcbd3
Parents: f8004c8
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 13:36:48 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:39:22 2015 -0700
--
.../salesforce/SalesforceConsumer.java | 4 +-
.../salesforce/api/SalesforceException.java | 44 ---
.../api/SalesforceMultipleChoicesException.java | 41 ++
.../salesforce/internal/SalesforceSession.java | 21 ++-
.../internal/client/AbstractClientBase.java | 4 +-
.../internal/client/DefaultBulkApiClient.java | 2 +-
.../internal/client/DefaultRestClient.java | 69 +++---
.../salesforce/internal/dto/RestChoices.java| 40 ++
.../salesforce/RestApiIntegrationTest.java | 131 ++-
9 files changed, 297 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/74f9ea0b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index b47f658..ac44d5a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -141,8 +141,8 @@ public class SalesforceConsumer extends DefaultConsumer {
// TODO do we need to add NPE checks for message/data.get***???
MapString, Object data = message.getDataAsMap();
-@SuppressWarnings(unchecked) final
-MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
+@SuppressWarnings(unchecked)
+final MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
final Object eventType = event.get(TYPE_PROPERTY);
Object createdDate = event.get(CREATED_DATE_PROPERTY);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/74f9ea0b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
index 4005ec4..dd25f0a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
@@ -58,13 +58,13 @@ public class SalesforceException extends CamelException {
}
public SalesforceException(ListRestError errors, int statusCode, String
message, Throwable cause) {
-super(toErrorMessage(errors, statusCode), cause);
+super(message == null ? toErrorMessage(errors, statusCode) : message,
cause);
this.errors = errors;
this.statusCode = statusCode;
}
public ListRestError getErrors() {
-return Collections.unmodifiableList(errors);
+return errors != null ? Collections.unmodifiableList(errors) : null;
}
public int getStatusCode() {
@@ -73,30 +73,42 @@ public class SalesforceException extends CamelException {
@Override
public String toString() {
+final StringBuilder builder = new StringBuilder({);
+appendFields(builder);
+builder.append(});
+return builder.toString();
+}
+
+protected void appendFields(StringBuilder builder) {
+// append message
+builder.append(message:');
+builder.append(getMessage());
+builder.append(',);
+
+// check for error
if (errors != null) {
-return toErrorMessage(errors, statusCode);
-} else {
-// make sure we include the custom
[1/3] camel git commit: CAMEL-8517: Updated SalesforceSession to use volatile shared fields
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 9d55b69a2 - 74f9ea0be
CAMEL-8517: Updated SalesforceSession to use volatile shared fields
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8004c80
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8004c80
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8004c80
Branch: refs/heads/camel-2.15.x
Commit: f8004c8014e621e45dbbcd8c4928f513a109d155
Parents: eeca81a
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:57:03 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:39:21 2015 -0700
--
.../component/salesforce/internal/SalesforceSession.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f8004c80/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 5dcb68b..2364697 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -56,8 +56,8 @@ public class SalesforceSession implements Service {
private final ObjectMapper objectMapper;
private final SetSalesforceSessionListener listeners;
-private String accessToken;
-private String instanceUrl;
+private volatile String accessToken;
+private volatile String instanceUrl;
public SalesforceSession(HttpClient httpClient, SalesforceLoginConfig
config) {
// validate parameters
@@ -198,7 +198,7 @@ public class SalesforceSession implements Service {
return accessToken;
}
-public void logout() throws SalesforceException {
+public synchronized void logout() throws SalesforceException {
if (accessToken == null) {
return;
}
@@ -236,7 +236,7 @@ public class SalesforceSession implements Service {
throw new SalesforceException(Logout request TIMEOUT!, null);
default:
-throw new SalesforceException(Unknow status: + done, null);
+throw new SalesforceException(Unknown status: + done, null);
}
} catch (SalesforceException e) {
throw e;
@@ -247,7 +247,7 @@ public class SalesforceSession implements Service {
// reset session
accessToken = null;
instanceUrl = null;
-// notify all session listeners of the new access token and
instance url
+// notify all session listeners about logout
for (SalesforceSessionListener listener : listeners) {
try {
listener.onLogout();
[2/3] camel git commit: CAMEL-8519: Fixed salesforce security listener to replace OAuth header
CAMEL-8519: Fixed salesforce security listener to replace OAuth header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eeca81a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eeca81a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eeca81a9
Branch: refs/heads/camel-2.15.x
Commit: eeca81a9cfaa27f1634b3c3761595847fe5b668a
Parents: 9d55b69
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:54:57 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:39:21 2015 -0700
--
.../salesforce/internal/client/SalesforceSecurityListener.java | 4 ++--
.../salesforce/internal/streaming/SubscriptionHelper.java| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/eeca81a9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
index 552401c..27d838a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
@@ -103,8 +103,8 @@ public class SalesforceSecurityListener extends
HttpEventListenerWrapper {
client.setInstanceUrl(session.getInstanceUrl());
client.setAccessToken(exchange);
} else {
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
-OAuth + currentToken);
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
+OAuth + currentToken);
}
// TODO handle a change in Salesforce instanceUrl, right now
we retry with the same destination
http://git-wip-us.apache.org/repos/asf/camel/blob/eeca81a9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 7aaa086..b0ed0d6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -213,7 +213,7 @@ public class SubscriptionHelper extends ServiceSupport {
}
// add current security token obtained from session
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
OAuth + accessToken);
}
};
[3/3] camel git commit: CAMEL-8516: Fixed 300 status code exception handling, minor polish
CAMEL-8516: Fixed 300 status code exception handling, minor polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/865b7ffe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/865b7ffe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/865b7ffe
Branch: refs/heads/camel-2.14.x
Commit: 865b7ffea2ed21a5b661ec9fa2c6ee6a9a1d2c37
Parents: 7422cac
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 13:36:48 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:43:50 2015 -0700
--
.../salesforce/SalesforceConsumer.java | 4 +-
.../salesforce/api/SalesforceException.java | 44 ---
.../api/SalesforceMultipleChoicesException.java | 41 ++
.../salesforce/internal/SalesforceSession.java | 21 ++-
.../internal/client/AbstractClientBase.java | 4 +-
.../internal/client/DefaultBulkApiClient.java | 2 +-
.../internal/client/DefaultRestClient.java | 68 +++---
.../salesforce/internal/dto/RestChoices.java| 40 ++
.../salesforce/RestApiIntegrationTest.java | 131 ++-
9 files changed, 296 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/865b7ffe/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index b47f658..ac44d5a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -141,8 +141,8 @@ public class SalesforceConsumer extends DefaultConsumer {
// TODO do we need to add NPE checks for message/data.get***???
MapString, Object data = message.getDataAsMap();
-@SuppressWarnings(unchecked) final
-MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
+@SuppressWarnings(unchecked)
+final MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
final Object eventType = event.get(TYPE_PROPERTY);
Object createdDate = event.get(CREATED_DATE_PROPERTY);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/865b7ffe/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
index 4005ec4..dd25f0a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
@@ -58,13 +58,13 @@ public class SalesforceException extends CamelException {
}
public SalesforceException(ListRestError errors, int statusCode, String
message, Throwable cause) {
-super(toErrorMessage(errors, statusCode), cause);
+super(message == null ? toErrorMessage(errors, statusCode) : message,
cause);
this.errors = errors;
this.statusCode = statusCode;
}
public ListRestError getErrors() {
-return Collections.unmodifiableList(errors);
+return errors != null ? Collections.unmodifiableList(errors) : null;
}
public int getStatusCode() {
@@ -73,30 +73,42 @@ public class SalesforceException extends CamelException {
@Override
public String toString() {
+final StringBuilder builder = new StringBuilder({);
+appendFields(builder);
+builder.append(});
+return builder.toString();
+}
+
+protected void appendFields(StringBuilder builder) {
+// append message
+builder.append(message:');
+builder.append(getMessage());
+builder.append(',);
+
+// check for error
if (errors != null) {
-return toErrorMessage(errors, statusCode);
-} else {
-// make sure we include the custom
[1/3] camel git commit: CAMEL-8519: Fixed salesforce security listener to replace OAuth header
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 1e526e490 - 865b7ffea
CAMEL-8519: Fixed salesforce security listener to replace OAuth header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/388a0928
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/388a0928
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/388a0928
Branch: refs/heads/camel-2.14.x
Commit: 388a09288ba36030dd45300325339559bdd25a1b
Parents: 1e526e4
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:54:57 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:43:48 2015 -0700
--
.../salesforce/internal/client/SalesforceSecurityListener.java | 4 ++--
.../salesforce/internal/streaming/SubscriptionHelper.java| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/388a0928/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
index 552401c..27d838a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
@@ -103,8 +103,8 @@ public class SalesforceSecurityListener extends
HttpEventListenerWrapper {
client.setInstanceUrl(session.getInstanceUrl());
client.setAccessToken(exchange);
} else {
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
-OAuth + currentToken);
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
+OAuth + currentToken);
}
// TODO handle a change in Salesforce instanceUrl, right now
we retry with the same destination
http://git-wip-us.apache.org/repos/asf/camel/blob/388a0928/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 7aaa086..b0ed0d6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -213,7 +213,7 @@ public class SubscriptionHelper extends ServiceSupport {
}
// add current security token obtained from session
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
OAuth + accessToken);
}
};
[2/3] camel git commit: CAMEL-8517: Updated SalesforceSession to use volatile shared fields
CAMEL-8517: Updated SalesforceSession to use volatile shared fields
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7422cac0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7422cac0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7422cac0
Branch: refs/heads/camel-2.14.x
Commit: 7422cac068ced8bd1de7ae67e2c2e9f3aabef429
Parents: 388a092
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:57:03 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 13:43:49 2015 -0700
--
.../component/salesforce/internal/SalesforceSession.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7422cac0/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 5dcb68b..2364697 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -56,8 +56,8 @@ public class SalesforceSession implements Service {
private final ObjectMapper objectMapper;
private final SetSalesforceSessionListener listeners;
-private String accessToken;
-private String instanceUrl;
+private volatile String accessToken;
+private volatile String instanceUrl;
public SalesforceSession(HttpClient httpClient, SalesforceLoginConfig
config) {
// validate parameters
@@ -198,7 +198,7 @@ public class SalesforceSession implements Service {
return accessToken;
}
-public void logout() throws SalesforceException {
+public synchronized void logout() throws SalesforceException {
if (accessToken == null) {
return;
}
@@ -236,7 +236,7 @@ public class SalesforceSession implements Service {
throw new SalesforceException(Logout request TIMEOUT!, null);
default:
-throw new SalesforceException(Unknow status: + done, null);
+throw new SalesforceException(Unknown status: + done, null);
}
} catch (SalesforceException e) {
throw e;
@@ -247,7 +247,7 @@ public class SalesforceSession implements Service {
// reset session
accessToken = null;
instanceUrl = null;
-// notify all session listeners of the new access token and
instance url
+// notify all session listeners about logout
for (SalesforceSessionListener listener : listeners) {
try {
listener.onLogout();
[12/17] camel git commit: CAMEL-8269: added support for APEX REST calls, also updated Salesforce API version to 33.0
CAMEL-8269: added support for APEX REST calls, also updated Salesforce API
version to 33.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/65cd95c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/65cd95c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/65cd95c5
Branch: refs/heads/camel-2.12.x
Commit: 65cd95c5ec6c531a58621dd206d69a35532045c9
Parents: 2dc15fa
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 13:38:37 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:45 2015 -0700
--
.../MerchandiseRestResource.apxc| 44 +
.../salesforce/SalesforceComponent.java | 21 ++
.../salesforce/SalesforceEndpointConfig.java| 80 +++-
.../salesforce/api/dto/AbstractSObjectBase.java | 22 +++
.../salesforce/api/dto/ActionOverride.java | 75
.../api/dto/ActionOverrideTypeEnum.java | 57 ++
.../salesforce/api/dto/ChildRelationShip.java | 20 ++
.../salesforce/api/dto/FilteredLookupInfo.java | 48 +
.../component/salesforce/api/dto/InfoUrls.java | 30 +++
.../salesforce/api/dto/NamedLayoutInfo.java | 39
.../salesforce/api/dto/RecordTypeInfo.java | 9 +
.../salesforce/api/dto/RestResources.java | 99 ++
.../component/salesforce/api/dto/SObject.java | 8 +
.../salesforce/api/dto/SObjectDescription.java | 20 ++
.../salesforce/api/dto/SObjectField.java| 63 ++
.../salesforce/api/dto/SObjectUrls.java | 81
.../salesforce/internal/OperationName.java | 1 +
.../internal/client/DefaultRestClient.java | 60 +-
.../salesforce/internal/client/RestClient.java | 13 ++
.../internal/dto/NotifyForFieldsEnum.java | 10 +-
.../internal/dto/NotifyForOperationsEnum.java | 10 +-
.../salesforce/internal/dto/PushTopic.java | 49 -
.../processor/AbstractRestProcessor.java| 190 +++
.../internal/processor/JsonRestProcessor.java | 10 +-
.../internal/processor/XmlRestProcessor.java| 17 +-
.../internal/streaming/PushTopicHelper.java | 74 ++--
.../salesforce/RestApiIntegrationTest.java | 113 +++
.../salesforce/StreamingApiIntegrationTest.java | 4 +-
.../salesforce/dto/generated/Document.java | 26 ++-
.../src/test/resources/log4j.properties | 1 +
30 files changed, 1194 insertions(+), 100 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/65cd95c5/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
b/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
new file mode 100644
index 000..91ce5ce
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/MerchandiseRestResource.apxc
@@ -0,0 +1,44 @@
+@RestResource(urlMapping='/Merchandise/*')
+global with sharing class MerchandiseRestResource {
+
+@HttpGet
+global static Merchandise__c doGet() {
+RestRequest req = RestContext.request;
+String merchandiseId = null;
+if (!req.requestURI.endsWith('/')) {
+merchandiseId =
req.requestURI.substring(req.requestURI.lastIndexOf('/')+1);
+} else if (req.params.get('id') != null) {
+merchandiseId = req.params.get('id');
+}
+if (merchandiseId != null) {
+ Merchandise__c merchandise = [SELECT Id, Name, Description__c,
Price__c, Total_Inventory__c FROM Merchandise__c WHERE Id = :merchandiseId];
+return merchandise;
+} else {
+throw new InvalidParamException('Missing merchandise id in URL and
query params');
+}
+}
+
+ @HttpPatch
+ global static Merchandise__c doPatch(Merchandise__c merchandise) {
+// lookup merchandise
+Merchandise__c current = [SELECT Id, Name, Description__c, Price__c,
Total_Inventory__c FROM Merchandise__c WHERE Id = :merchandise.Id];
+if (current == null) {
+throw new InvalidParamException('Missing merchandise for id ' +
merchandise.Id);
+}
+if (merchandise.Description__c != null) {
+current.Description__c = merchandise.Description__c;
+}
+if (merchandise.Price__c != null) {
+current.Price__c = merchandise.Price__c;
+}
+if (merchandise.Total_Inventory__c != null) {
+current.Total_Inventory__c = merchandise.Total_Inventory__c;
+}
+
+update current;
+return current;
+}
+
+ // Invalid Merchandise Id exception
+public class InvalidParamException
[11/17] camel git commit: CAMEL-8269: added support for APEX REST calls, also updated Salesforce API version to 33.0
http://git-wip-us.apache.org/repos/asf/camel/blob/65cd95c5/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index 9f51bbd..52a95f6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -24,7 +24,12 @@ import java.nio.channels.ReadableByteChannel;
import java.util.HashMap;
import java.util.List;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.salesforce.api.SalesforceException;
+import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
import org.apache.camel.component.salesforce.api.dto.GlobalObjects;
import org.apache.camel.component.salesforce.api.dto.RestResources;
@@ -38,6 +43,7 @@ import
org.apache.camel.component.salesforce.dto.generated.Document;
import org.apache.camel.component.salesforce.dto.generated.Line_Item__c;
import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import
org.apache.camel.component.salesforce.dto.generated.QueryRecordsLine_Item__c;
+import org.eclipse.jetty.http.HttpStatus;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -297,6 +303,94 @@ public class RestApiIntegrationTest extends
AbstractSalesforceTestBase {
LOG.debug(ExecuteSearch: {}, searchResults);
}
+@Test
+public void testApexCall() throws Exception {
+try {
+doTestApexCall();
+doTestApexCall(Xml);
+} catch (CamelExecutionException e) {
+if (e.getCause() instanceof SalesforceException) {
+SalesforceException cause = (SalesforceException) e.getCause();
+if (cause.getStatusCode() == HttpStatus.NOT_FOUND_404) {
+LOG.error(Make sure test REST resource
MerchandiseRestResource.apxc has been loaded:
++ e.getMessage());
+}
+}
+throw e;
+}
+}
+
+private void doTestApexCall(String suffix) throws Exception {
+
+if (testId == null) {
+// execute getBasicInfo to get test id from recent items
+doTestGetBasicInfo();
+}
+
+// request merchandise with id in URI template
+Merchandise__c merchandise =
template().requestBodyAndHeader(direct:apexCallGet + suffix, null,
+id, testId, Merchandise__c.class);
+assertNotNull(merchandise);
+LOG.debug(ApexCallGet: {}, merchandise);
+
+// request merchandise with id as query param
+merchandise =
template().requestBodyAndHeader(direct:apexCallGetWithId + suffix, null,
+SalesforceEndpointConfig.APEX_QUERY_PARAM_PREFIX + id, testId,
Merchandise__c.class);
+assertNotNull(merchandise);
+LOG.debug(ApexCallGetWithId: {}, merchandise);
+
+// patch merchandise
+// clear fields that won't be modified
+merchandise.clearBaseFields();
+merchandise.setId(testId);
+merchandise.setPrice__c(null);
+merchandise.setTotal_Inventory__c(null);
+
+merchandise = template().requestBody(direct:apexCallPatch + suffix,
+new MerchandiseRequest(merchandise), Merchandise__c.class);
+assertNotNull(merchandise);
+LOG.debug(ApexCallPatch: {}, merchandise);
+}
+
+/**
+ * Request DTO for Salesforce APEX REST calls.
+ * See
https://www.salesforce.com/us/developer/docs/apexcode/Content/apex_rest_methods.htm.
+ */
+@XStreamAlias(request)
+public static class MerchandiseRequest extends AbstractDTOBase {
+private Merchandise__c merchandise;
+
+public MerchandiseRequest(Merchandise__c merchandise) {
+this.merchandise = merchandise;
+}
+
+public Merchandise__c getMerchandise() {
+return merchandise;
+}
+
+public void setMerchandise(Merchandise__c merchandise) {
+this.merchandise = merchandise;
+}
+}
+
+/**
+ * Response DTO for Salesforce APEX REST calls.
+ * See
https://www.salesforce.com/us/developer/docs/apexcode/Content/apex_rest_methods.htm.
+ */
+@XStreamAlias(response)
+public static class
[04/17] camel git commit: CAMEL-7956: Updated Camel-salesforce to support SSLContextParameters to configure HttpClient
CAMEL-7956: Updated Camel-salesforce to support SSLContextParameters to
configure HttpClient
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1cbd81b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1cbd81b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1cbd81b2
Branch: refs/heads/camel-2.12.x
Commit: 1cbd81b22c7950a8206a90517be8ec16e429ccd7
Parents: 10c8063
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Oct 24 13:21:07 2014 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:42 2015 -0700
--
.../component/salesforce/SalesforceComponent.java | 18 +-
.../internal/SessionIntegrationTest.java | 6 +-
2 files changed, 22 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1cbd81b2/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 52dafa5..8a38bec 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -41,8 +41,10 @@ import org.apache.camel.spi.EndpointCompleter;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ReflectionHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.jsse.SSLContextParameters;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.RedirectListener;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,6 +62,8 @@ public class SalesforceComponent extends UriEndpointComponent
implements Endpoin
private SalesforceLoginConfig loginConfig;
private SalesforceEndpointConfig config;
+
+private SSLContextParameters sslContextParameters;
private String[] packages;
// component state
@@ -136,7 +140,11 @@ public class SalesforceComponent extends
UriEndpointComponent implements Endpoin
if (config != null config.getHttpClient() != null) {
httpClient = config.getHttpClient();
} else {
-httpClient = new HttpClient();
+final SslContextFactory sslContextFactory = new
SslContextFactory();
+final SSLContextParameters contextParameters =
+sslContextParameters != null ? sslContextParameters : new
SSLContextParameters();
+
sslContextFactory.setSslContext(contextParameters.createSSLContext());
+httpClient = new HttpClient(sslContextFactory);
httpClient.setConnectorType(HttpClient.CONNECTOR_SELECT_CHANNEL);
httpClient.setMaxConnectionsPerAddress(MAX_CONNECTIONS_PER_ADDRESS);
httpClient.setConnectTimeout(CONNECTION_TIMEOUT);
@@ -303,6 +311,14 @@ public class SalesforceComponent extends
UriEndpointComponent implements Endpoin
this.config = config;
}
+public SSLContextParameters getSslContextParameters() {
+return sslContextParameters;
+}
+
+public void setSslContextParameters(SSLContextParameters
sslContextParameters) {
+this.sslContextParameters = sslContextParameters;
+}
+
public String[] getPackages() {
return packages;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1cbd81b2/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
index ce55033..a25ad52 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
@@ -17,8 +17,10 @@
package org.apache.camel.component.salesforce.internal;
[03/17] camel git commit: Fixed the Rat check errors
Fixed the Rat check errors Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/583ee40b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/583ee40b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/583ee40b Branch: refs/heads/camel-2.12.x Commit: 583ee40b020cbba14b9ec864c87df4ee458bcf84 Parents: 6665261 Author: Ubuntu willem.ji...@gmail.com Authored: Wed May 7 03:26:04 2014 + Committer: Dhiraj Bokde dhira...@yahoo.com Committed: Fri Mar 20 14:24:41 2015 -0700 -- .../src/it/simple-it/pom.xml | 16 .../src/it/simple-it/verify.groovy| 16 .../src/main/resources/sobject-picklist.vm| 18 +- .../src/main/resources/sobject-pojo.vm| 18 +- .../src/main/resources/sobject-query-records.vm | 16 .../src/main/resources/create-derby.sql | 18 +- .../archetype-resources/src/main/resources/ok.xml | 18 +- .../META-INF/m2e/lifecycle-mapping-metadata.xml | 16 8 files changed, 132 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/583ee40b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml -- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml index 08142dd..0f24037 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/pom.xml @@ -1,4 +1,20 @@ ?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; modelVersion4.0.0/modelVersion http://git-wip-us.apache.org/repos/asf/camel/blob/583ee40b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy -- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy index 7153082..1436d6b 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/it/simple-it/verify.groovy @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the License); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ // assert that the generated files directory exists File sourceDir = new File( basedir, target/generated-sources/camel-salesforce ); http://git-wip-us.apache.org/repos/asf/camel/blob/583ee40b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm -- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
[13/17] camel git commit: CAMEL-8519: Fixed salesforce security listener to replace OAuth header
CAMEL-8519: Fixed salesforce security listener to replace OAuth header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93cd6451
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93cd6451
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93cd6451
Branch: refs/heads/camel-2.12.x
Commit: 93cd64512d9c0763653b4f4e5045b8d83f77daea
Parents: 9bb3a9e
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:54:57 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:46 2015 -0700
--
.../salesforce/internal/client/SalesforceSecurityListener.java | 4 ++--
.../salesforce/internal/streaming/SubscriptionHelper.java| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/93cd6451/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
index 552401c..27d838a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityListener.java
@@ -103,8 +103,8 @@ public class SalesforceSecurityListener extends
HttpEventListenerWrapper {
client.setInstanceUrl(session.getInstanceUrl());
client.setAccessToken(exchange);
} else {
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
-OAuth + currentToken);
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
+OAuth + currentToken);
}
// TODO handle a change in Salesforce instanceUrl, right now
we retry with the same destination
http://git-wip-us.apache.org/repos/asf/camel/blob/93cd6451/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 7aaa086..b0ed0d6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -213,7 +213,7 @@ public class SubscriptionHelper extends ServiceSupport {
}
// add current security token obtained from session
-exchange.addRequestHeader(HttpHeaders.AUTHORIZATION,
+exchange.setRequestHeader(HttpHeaders.AUTHORIZATION,
OAuth + accessToken);
}
};
[17/17] camel git commit: Minor polish
Minor polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32812e51
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32812e51
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32812e51
Branch: refs/heads/camel-2.12.x
Commit: 32812e518883086fe159aeee4c35d2ae7434a289
Parents: 08f20d5
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 14:08:05 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:48 2015 -0700
--
.../org/apache/camel/component/salesforce/api/dto/RestError.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/32812e51/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
index 980108e..c67cf07 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestError.java
@@ -29,7 +29,6 @@ public class RestError extends AbstractDTOBase {
// default ctor for unmarshalling
public RestError() {
-super();
}
public RestError(String errorCode, String message, ListString fields) {
[07/17] camel git commit: CAMEL-7927: Added support for Salesforce multiselect picklists
CAMEL-7927: Added support for Salesforce multiselect picklists
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36a1747c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36a1747c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36a1747c
Branch: refs/heads/camel-2.12.x
Commit: 36a1747c6873acadc465d71acf3d23b6be2b91c5
Parents: 1cbd81b
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Sat Dec 13 09:30:02 2014 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:43 2015 -0700
--
.../salesforce/api/JodaTimeConverter.java | 6 +-
.../api/MultiSelectPicklistConverter.java | 101 +++
.../api/MultiSelectPicklistDeserializer.java| 94 +
.../api/MultiSelectPicklistSerializer.java | 64
.../salesforce/api/PicklistEnumConverter.java | 12 +--
.../salesforce/internal/SalesforceSession.java | 2 +-
.../api/MultiSelectPicklistJsonTest.java| 59 +++
.../api/MultiSelectPicklistXmlTest.java | 70 +
.../salesforce/dto/generated/MSPTest.java | 87
.../camel-salesforce-maven-plugin/pom.xml | 1 -
.../apache/camel/maven/CamelSalesforceMojo.java | 23 -
.../src/main/resources/sobject-pojo.vm | 25 -
components/camel-salesforce/pom.xml | 27 +
13 files changed, 557 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/36a1747c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
index 009f697..c2609b8 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/JodaTimeConverter.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.salesforce.api;
import java.lang.reflect.Constructor;
+import com.thoughtworks.xstream.converters.ConversionException;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -29,6 +30,9 @@ import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
+/**
+ * XStream converter for handling JodaTime fields.
+ */
public class JodaTimeConverter implements Converter {
private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
@@ -48,7 +52,7 @@ public class JodaTimeConverter implements Converter {
// normalize date time to UTC
return constructor.newInstance(dateTimeStr, DateTimeZone.UTC);
} catch (Exception e) {
-throw new IllegalArgumentException(
+throw new ConversionException(
String.format(Error reading Joda DateTime from value %s:
%s,
dateTimeStr, e.getMessage()),
e);
http://git-wip-us.apache.org/repos/asf/camel/blob/36a1747c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistConverter.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistConverter.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistConverter.java
new file mode 100644
index 000..201a482
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/MultiSelectPicklistConverter.java
@@ -0,0 +1,101 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless
[02/17] camel git commit: CAMEL-7399: camel-salesforce - Fixed alias caching for updated XStream
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/66652611
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/66652611
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/66652611
Branch: refs/heads/camel-2.12.x
Commit: 66652611c161ff2349c2198f6c7d12b1803e5a8f
Parents: 215a8af
Author: Dhiraj Bokde dbo...@redhat.com
Authored: Mon Apr 28 15:19:38 2014 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:41 2015 -0700
--
.../component/salesforce/internal/processor/XmlRestProcessor.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/66652611/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);
}
[08/17] camel git commit: CAMEL-8267: fixed mojo integration test to use system property or default login url
CAMEL-8267: fixed mojo integration test to use system property or default login
url
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/12916954
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/12916954
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/12916954
Branch: refs/heads/camel-2.12.x
Commit: 12916954f3af92c5cabac1746303470451760d29
Parents: 33b20d5
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 12:34:41 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:44 2015 -0700
--
.../camel/maven/CamelSalesforceMojoIntegrationTest.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/12916954/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
index 406ce5f..cf9bcb9 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java
@@ -16,10 +16,15 @@
*/
package org.apache.camel.maven;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Properties;
import org.apache.camel.component.salesforce.SalesforceEndpointConfig;
+import org.apache.camel.component.salesforce.SalesforceLoginConfig;
import org.apache.maven.plugin.logging.SystemStreamLog;
import org.junit.Assert;
import org.junit.Test;
@@ -39,6 +44,7 @@ public class CamelSalesforceMojoIntegrationTest {
// set defaults
mojo.version = System.getProperty(apiVersion,
SalesforceEndpointConfig.DEFAULT_VERSION);
+mojo.loginUrl = System.getProperty(loginUrl,
SalesforceLoginConfig.DEFAULT_LOGIN_URL);
mojo.outputDirectory = new
File(target/generated-sources/camel-salesforce);
mojo.packageName = org.apache.camel.salesforce.dto;
[09/17] camel git commit: CAMEL-8267: Allow to configure Salesforce URL
CAMEL-8267: Allow to configure Salesforce URL
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33b20d59
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33b20d59
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33b20d59
Branch: refs/heads/camel-2.12.x
Commit: 33b20d59c504ab1ead9c7e69678abb3870037288
Parents: cbbc8f0
Author: Cristiano Nicolai cristiano.nico...@gmail.com
Authored: Fri Jan 23 12:43:45 2015 +1000
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:44 2015 -0700
--
.../java/org/apache/camel/maven/CamelSalesforceMojo.java| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/33b20d59/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index fdb0f8e..dab9c70 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -114,6 +114,12 @@ public class CamelSalesforceMojo extends AbstractMojo {
protected File outputDirectory;
/**
+ * Salesforce URL.
+ */
+@Parameter(property = camelSalesforce.loginUrl, defaultValue =
SalesforceLoginConfig.DEFAULT_LOGIN_URL)
+protected String loginUrl;
+
+/**
* Names of Salesforce SObject for which POJOs must be generated
*/
@Parameter
@@ -178,8 +184,7 @@ public class CamelSalesforceMojo extends AbstractMojo {
}
final SalesforceSession session = new SalesforceSession(httpClient,
-new
SalesforceLoginConfig(SalesforceLoginConfig.DEFAULT_LOGIN_URL,
-clientId, clientSecret, userName, password, false));
+new SalesforceLoginConfig(loginUrl, clientId, clientSecret,
userName, password, false));
getLog().info(Salesforce login...);
try {
[01/17] camel git commit: CAMEL-7398: camel-salesforce - Fixed missing token_type field in Salesforce login call
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 10dd6c0a8 - 32812e518
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/215a8af5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/215a8af5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/215a8af5
Branch: refs/heads/camel-2.12.x
Commit: 215a8af56e4c6b608201d879dd176c1a6f6d5407
Parents: 10dd6c0
Author: Dhiraj Bokde dbo...@redhat.com
Authored: Mon Apr 28 15:18:18 2014 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:40 2015 -0700
--
.../component/salesforce/internal/dto/LoginToken.java | 13 +
1 file changed, 13 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/215a8af5/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;
+}
+
}
[16/17] camel git commit: CAMEL-8516: Fixed 300 status code exception handling, minor polish
CAMEL-8516: Fixed 300 status code exception handling, minor polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08f20d56
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08f20d56
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08f20d56
Branch: refs/heads/camel-2.12.x
Commit: 08f20d564a774fe2c49707df1b695b9eaaae084d
Parents: 40ff886
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 13:36:48 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:48 2015 -0700
--
.../salesforce/SalesforceConsumer.java | 4 +-
.../salesforce/api/SalesforceException.java | 44 ---
.../api/SalesforceMultipleChoicesException.java | 41 ++
.../salesforce/internal/SalesforceSession.java | 21 ++-
.../internal/client/AbstractClientBase.java | 4 +-
.../internal/client/DefaultBulkApiClient.java | 2 +-
.../internal/client/DefaultRestClient.java | 68 +++---
.../salesforce/internal/dto/RestChoices.java| 40 ++
.../salesforce/RestApiIntegrationTest.java | 131 ++-
9 files changed, 296 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/08f20d56/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index b47f658..ac44d5a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -141,8 +141,8 @@ public class SalesforceConsumer extends DefaultConsumer {
// TODO do we need to add NPE checks for message/data.get***???
MapString, Object data = message.getDataAsMap();
-@SuppressWarnings(unchecked) final
-MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
+@SuppressWarnings(unchecked)
+final MapString, Object event = (MapString, Object)
data.get(EVENT_PROPERTY);
final Object eventType = event.get(TYPE_PROPERTY);
Object createdDate = event.get(CREATED_DATE_PROPERTY);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/08f20d56/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
index 4005ec4..dd25f0a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/SalesforceException.java
@@ -58,13 +58,13 @@ public class SalesforceException extends CamelException {
}
public SalesforceException(ListRestError errors, int statusCode, String
message, Throwable cause) {
-super(toErrorMessage(errors, statusCode), cause);
+super(message == null ? toErrorMessage(errors, statusCode) : message,
cause);
this.errors = errors;
this.statusCode = statusCode;
}
public ListRestError getErrors() {
-return Collections.unmodifiableList(errors);
+return errors != null ? Collections.unmodifiableList(errors) : null;
}
public int getStatusCode() {
@@ -73,30 +73,42 @@ public class SalesforceException extends CamelException {
@Override
public String toString() {
+final StringBuilder builder = new StringBuilder({);
+appendFields(builder);
+builder.append(});
+return builder.toString();
+}
+
+protected void appendFields(StringBuilder builder) {
+// append message
+builder.append(message:');
+builder.append(getMessage());
+builder.append(',);
+
+// check for error
if (errors != null) {
-return toErrorMessage(errors, statusCode);
-} else {
-// make sure we include the custom
[10/17] camel git commit: CAMEL-8395: handles empty Salesforce picklists, also maps urn:address to String
CAMEL-8395: handles empty Salesforce picklists, also maps urn:address to String
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2dc15fa0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2dc15fa0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2dc15fa0
Branch: refs/heads/camel-2.12.x
Commit: 2dc15fa04c4f2ca84a8cdebd69f9f2a2403f62d5
Parents: 1291695
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 12:42:21 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:45 2015 -0700
--
.../apache/camel/maven/CamelSalesforceMojo.java | 63 +---
.../src/main/resources/sobject-picklist.vm | 18 +++---
2 files changed, 52 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2dc15fa0/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index dab9c70..d517f24 100644
---
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -21,6 +21,9 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -28,6 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
@@ -212,7 +216,7 @@ public class CamelSalesforceMojo extends AbstractMojo {
final ObjectMapper mapper = new ObjectMapper();
// call getGlobalObjects to get all SObjects
-final SetString objectNames = new HashSetString();
+final SetString objectNames = new TreeSetString();
final SyncResponseCallback callback = new SyncResponseCallback();
try {
getLog().info(Getting Salesforce Objects...);
@@ -307,23 +311,23 @@ public class CamelSalesforceMojo extends AbstractMojo {
// for every accepted name, get SObject description
final SetSObjectDescription descriptions = new
HashSetSObjectDescription();
-try {
-getLog().info(Retrieving Object descriptions...);
-for (String name : objectNames) {
-callback.reset();
-restClient.getDescription(name, callback);
-if (!callback.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
-throw new MojoExecutionException(Timeout waiting for
getDescription for sObject + name);
-}
-final SalesforceException ex = callback.getException();
-if (ex != null) {
-throw ex;
-}
-descriptions.add(mapper.readValue(callback.getResponse(),
SObjectDescription.class));
+getLog().info(Retrieving Object descriptions...);
+for (String name : objectNames) {
+try {
+callback.reset();
+restClient.getDescription(name, callback);
+if (!callback.await(TIMEOUT, TimeUnit.MILLISECONDS)) {
+throw new MojoExecutionException(Timeout waiting
for getDescription for sObject + name);
+}
+final SalesforceException ex = callback.getException();
+if (ex != null) {
+throw ex;
+}
+
descriptions.add(mapper.readValue(callback.getResponse(),
SObjectDescription.class));
+} catch (Exception e) {
+String msg = Error getting SObject description for ' +
name + ': + e.getMessage();
+throw new MojoExecutionException(msg, e);
}
-} catch (Exception e) {
-String msg = Error getting SObject description +
e.getMessage();
-throw new MojoExecutionException(msg, e);
}
// create package directory
@@ -494,6 +498,7 @@ public class CamelSalesforceMojo
[15/17] camel git commit: CAMEL-8517: Updated SalesforceSession to use volatile shared fields
CAMEL-8517: Updated SalesforceSession to use volatile shared fields
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40ff886d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40ff886d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40ff886d
Branch: refs/heads/camel-2.12.x
Commit: 40ff886df7f83ee46b71a9c46f1044badec03721
Parents: 93cd645
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Fri Mar 20 09:57:03 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:47 2015 -0700
--
.../component/salesforce/internal/SalesforceSession.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/40ff886d/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index 5dcb68b..2364697 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -56,8 +56,8 @@ public class SalesforceSession implements Service {
private final ObjectMapper objectMapper;
private final SetSalesforceSessionListener listeners;
-private String accessToken;
-private String instanceUrl;
+private volatile String accessToken;
+private volatile String instanceUrl;
public SalesforceSession(HttpClient httpClient, SalesforceLoginConfig
config) {
// validate parameters
@@ -198,7 +198,7 @@ public class SalesforceSession implements Service {
return accessToken;
}
-public void logout() throws SalesforceException {
+public synchronized void logout() throws SalesforceException {
if (accessToken == null) {
return;
}
@@ -236,7 +236,7 @@ public class SalesforceSession implements Service {
throw new SalesforceException(Logout request TIMEOUT!, null);
default:
-throw new SalesforceException(Unknow status: + done, null);
+throw new SalesforceException(Unknown status: + done, null);
}
} catch (SalesforceException e) {
throw e;
@@ -247,7 +247,7 @@ public class SalesforceSession implements Service {
// reset session
accessToken = null;
instanceUrl = null;
-// notify all session listeners of the new access token and
instance url
+// notify all session listeners about logout
for (SalesforceSessionListener listener : listeners) {
try {
listener.onLogout();
[14/17] camel git commit: CAMEL-8269: replaced 2.15 URISupport.appendParametersToURI with 2.14.x URISupport.createRemainingURI
CAMEL-8269: replaced 2.15 URISupport.appendParametersToURI with 2.14.x
URISupport.createRemainingURI
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bb3a9e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bb3a9e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bb3a9e9
Branch: refs/heads/camel-2.12.x
Commit: 9bb3a9e982855bc01366fa149e0837839cb20aeb
Parents: 65cd95c
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Mon Feb 23 13:56:52 2015 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:46 2015 -0700
--
.../component/salesforce/internal/client/DefaultRestClient.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9bb3a9e9/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index 0b06289..9a9f91b 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -19,12 +19,14 @@ package
org.apache.camel.component.salesforce.internal.client;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.util.List;
import java.util.Map;
import com.thoughtworks.xstream.XStream;
+
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.dto.RestError;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
@@ -344,7 +346,7 @@ public class DefaultRestClient extends AbstractClientBase
implements RestClient
throws UnsupportedEncodingException, URISyntaxException {
if (queryParams != null !queryParams.isEmpty()) {
-apexUrl = URISupport.appendParametersToURI(apexUrl, queryParams);
+apexUrl = URISupport.createRemainingURI(new URI(apexUrl),
queryParams).toString();
}
return instanceUrl + SERVICES_APEXREST + apexUrl;
[05/17] camel git commit: Update README.md - Add Prefix camelSalesforce
Update README.md - Add Prefix camelSalesforce The suffix camelSalesforce needs to be added as prefix to the properties. The command should be corrected as: mvn camel-salesforce:generate -DcamelSalesforce.clientId=clientid -DcamelSalesforce.clientSecret=clientsecret -DcamelSalesforce.userName=username -DcamelSalesforce.password=password Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/10c80635 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/10c80635 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/10c80635 Branch: refs/heads/camel-2.12.x Commit: 10c80635eb75f43646a44192727548391172dc03 Parents: 583ee40 Author: yelamanchili-murali yelamanchili.mu...@gmail.com Authored: Fri Oct 3 15:48:34 2014 +1000 Committer: Dhiraj Bokde dhira...@yahoo.com Committed: Fri Mar 20 14:24:42 2015 -0700 -- .../camel-salesforce/camel-salesforce-maven-plugin/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/10c80635/components/camel-salesforce/camel-salesforce-maven-plugin/README.md -- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/README.md b/components/camel-salesforce/camel-salesforce-maven-plugin/README.md index 5bfd808..0424771 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/README.md +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/README.md @@ -21,6 +21,6 @@ The plugin configuration has the following properties. Fro obvious security reasons it is recommended that the clientId, clientSecret, userName and password fields be not set in the pom.xml. The plugin should be configured for the rest of the properties, and can be executed using the following command: - mvn camel-salesforce:generate -DclientId=clientid -DclientSecret=clientsecret -DuserName=username -Dpassword=password + mvn camel-salesforce:generate -DcamelSalesforce.clientId=clientid -DcamelSalesforce.clientSecret=clientsecret -DcamelSalesforce.userName=username -DcamelSalesforce.password=password The generated DTOs use Jackson and XStream annotations. All Salesforce field types are supported. Date and time fields are mapped to Joda DateTime, and picklist fields are mapped to generated Java Enumerations.
[06/17] camel git commit: CAMEL-8152: Added enum value EXTENDED
CAMEL-8152: Added enum value EXTENDED
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cbbc8f07
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cbbc8f07
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cbbc8f07
Branch: refs/heads/camel-2.12.x
Commit: cbbc8f07e21b7eaffe936f9b3a8ae8882c8f7972
Parents: 36a1747
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Sat Dec 13 10:18:31 2014 -0800
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Fri Mar 20 14:24:43 2015 -0700
--
.../salesforce/internal/dto/NotifyForOperationsEnum.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/cbbc8f07/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/NotifyForOperationsEnum.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/NotifyForOperationsEnum.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/NotifyForOperationsEnum.java
index 807fef5..f75839c 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/NotifyForOperationsEnum.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/NotifyForOperationsEnum.java
@@ -26,7 +26,8 @@ public enum NotifyForOperationsEnum {
CREATE(Create),
UPDATE(Update),
-ALL(All);
+ALL(All),
+EXTENDED(Extended);
final String value;
