Repository: camel Updated Branches: refs/heads/master 642128b92 -> 93616de1d
CAMEL-10164: Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93616de1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93616de1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93616de1 Branch: refs/heads/master Commit: 93616de1dd310b0ec835cca3a92a4da32b70e4aa Parents: 29cd3cd Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Sep 5 16:25:23 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Sep 5 16:26:13 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/rest/RestProducer.java | 4 +--- .../camel/component/rest/RestProducerBindingProcessor.java | 6 +++--- .../org/apache/camel/model/rest/RestBindingDefinition.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/93616de1/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java index 9ada4e4..ff44d97 100644 --- a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java @@ -66,8 +66,6 @@ public class RestProducer extends DefaultAsyncProducer { @Override public boolean process(Exchange exchange, AsyncCallback callback) { - // TODO: binding get type/outType from api-doc if possible - try { prepareExchange(exchange); if (binding != null) { @@ -215,7 +213,7 @@ public class RestProducer extends DefaultAsyncProducer { protected void doStart() throws Exception { super.doStart(); - // create binding processor + // create binding processor (returns null if binding is not in use) binding = createBindingProcessor(); ServiceHelper.startServices(binding, producer); http://git-wip-us.apache.org/repos/asf/camel/blob/93616de1/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 7c254e3..b1d879e 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 @@ -5,9 +5,9 @@ * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/93616de1/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java index 8aeef30..a376442 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java @@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.Processor; -import org.apache.camel.model.NoOutputDefinition; import org.apache.camel.component.rest.RestConsumerBindingProcessor; +import org.apache.camel.model.NoOutputDefinition; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RestConfiguration;
