You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/06 08:26:41 UTC
[1/2] camel git commit: Should not be deprecated
Repository: camel
Updated Branches:
refs/heads/master e4751c9a0 -> 4a0fd930d
Should not be deprecated
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ac41b76
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ac41b76
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ac41b76
Branch: refs/heads/master
Commit: 8ac41b76e8e708af2cabb490e85b2e4c0a339b49
Parents: e4751c9
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 6 10:23:49 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 6 10:23:49 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/processor/binding/BindingException.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8ac41b76/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java b/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
index 5ddbaad..9493c59 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/binding/BindingException.java
@@ -22,7 +22,6 @@ import org.apache.camel.Exchange;
/**
* An exception if a binding is not possible, such as binding to json or xml cannot be done.
*/
-@Deprecated
public class BindingException extends CamelExchangeException {
private static final long serialVersionUID = -3495429794010365522L;
[2/2] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a0fd930
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a0fd930
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a0fd930
Branch: refs/heads/master
Commit: 4a0fd930dd982ef75b24ac7360146f69b418e96e
Parents: 8ac41b7
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 6 10:26:33 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 6 10:26:33 2017 +0200
----------------------------------------------------------------------
.../component/rest/RestProducerBindingProcessor.java | 2 ++
.../org/apache/camel/processor/RestBindingAdvice.java | 11 ++++-------
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a0fd930/camel-core/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java
index db838a1..d6d0d14 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java
@@ -39,6 +39,8 @@ import org.apache.camel.util.ServiceHelper;
* <p/>
* The binding uses {@link org.apache.camel.spi.DataFormat} for the actual work to transform
* from xml/json to Java Objects and reverse again.
+ * <p/>
+ * The rest-dsl consumer side is implemented in {@link org.apache.camel.processor.RestBindingAdvice}
*/
public class RestProducerBindingProcessor extends DelegateAsyncProcessor {
http://git-wip-us.apache.org/repos/asf/camel/blob/4a0fd930/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
index 84c63bc..ee41ee4 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
@@ -26,18 +26,13 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.processor.binding.BindingException;
-import org.apache.camel.spi.Contract;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataType;
import org.apache.camel.spi.DataTypeAware;
import org.apache.camel.spi.RestConfiguration;
-import org.apache.camel.spi.Transformer;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.MessageHelper;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ServiceHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A {@link org.apache.camel.processor.CamelInternalProcessorAdvice} that binds the REST DSL incoming
@@ -45,8 +40,10 @@ import org.slf4j.LoggerFactory;
* <p/>
* The binding uses {@link org.apache.camel.spi.DataFormat} for the actual work to transform
* from xml/json to Java Objects and reverse again.
- *
- * @see CamelInternalProcessor, CamelInternalProcessorAdvice
+ * <p/>
+ * The rest producer side is implemented in {@link org.apache.camel.component.rest.RestProducerBindingProcessor}
+ *
+ * @see CamelInternalProcessor
*/
public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<String, Object>> {
private static final String STATE_KEY_DO_MARSHAL = "doMarshal";