camel git commit: fixed CS error

2017-03-26 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/master fce2a5ab5 -> d0dafc6f9


fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0dafc6f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0dafc6f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0dafc6f

Branch: refs/heads/master
Commit: d0dafc6f973a77077bab69d0474c5216574ce647
Parents: fce2a5a
Author: Christian Mueller 
Authored: Sun Mar 26 16:40:17 2017 +0200
Committer: Christian Mueller 
Committed: Sun Mar 26 16:40:17 2017 +0200

--
 .../KinesisComponentIntegrationTest.java| 60 ++--
 1 file changed, 29 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d0dafc6f/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
--
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
index 5764c59..3970fcf 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -16,6 +16,11 @@
  */
 package org.apache.camel.component.aws.kinesis.integration;
 
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.kinesis.AmazonKinesis;
+import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
+import com.amazonaws.services.kinesis.model.Record;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -29,44 +34,39 @@ import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.kinesis.AmazonKinesis;
-import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
-import com.amazonaws.services.kinesis.model.Record;
-
 @Ignore("Must be manually tested.")
 public class KinesisComponentIntegrationTest extends CamelTestSupport {
-
+
 @EndpointInject(uri = "direct:start")
 private ProducerTemplate template;
-
+
 @EndpointInject(uri = "mock:result")
 private MockEndpoint result;
-
+
 @Test
 public void send() throws Exception {
 result.expectedMessageCount(2);
-
+
 template.send("direct:start", ExchangePattern.InOnly, new Processor() {
 public void process(Exchange exchange) throws Exception {
 exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
 exchange.getIn().setBody("Kinesis Event 1.");
 }
 });
-
+
 template.send("direct:start", ExchangePattern.InOut, new Processor() {
 public void process(Exchange exchange) throws Exception {
 exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
 exchange.getIn().setBody("Kinesis Event 2.");
 }
 });
-
+
 assertMockEndpointsSatisfied();
-
+
 assertResultExchange(result.getExchanges().get(0), "Kinesis Event 1.", 
"partition-1");
 assertResultExchange(result.getExchanges().get(1), "Kinesis Event 2.", 
"partition-1");
 }
-
+
 private void assertResultExchange(Exchange resultExchange, String data, 
String partition) {
 assertIsInstanceOf(Record.class, resultExchange.getIn().getBody());
 Record record = resultExchange.getIn().getBody(Record.class);
@@ -75,29 +75,27 @@ public class KinesisComponentIntegrationTest extends 
CamelTestSupport {
 
assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME));
 
assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER));
 }
-
+
 @Override
-   protected JndiRegistry createRegistry() throws Exception {
-JndiRegistry registry = super.createRegistry();
-
-AmazonKinesis client = 
AmazonKinesisClientBuilder.standard().withRegion(Regions.EU_CENTRAL_1).build();
-registry.bind("amazonKinesisClient", client);
-
-return registry;
-   }
-
-   protected RouteBuilder createRouteBuilder() throws Exception {
+protected JndiRegistry createRegistry() throws Exception {
+JndiRegistry registry = super.createRegistry();
+
+

camel git commit: added integration test for Amazon Kinesis Streams integration

2017-03-26 Thread cmueller 
Repository: camel
Updated Branches:
  refs/heads/master 833a1a301 -> fce2a5ab5


added integration test for Amazon Kinesis Streams integration


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fce2a5ab
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fce2a5ab
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fce2a5ab

Branch: refs/heads/master
Commit: fce2a5ab51ec7371fa77a354856ae19b3f5862fb
Parents: 833a1a3
Author: cmueller 
Authored: Sun Mar 26 12:50:16 2017 +0200
Committer: cmueller 
Committed: Sun Mar 26 12:50:16 2017 +0200

--
 .../KinesisComponentIntegrationTest.java| 103 +++
 1 file changed, 103 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fce2a5ab/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
--
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
new file mode 100644
index 000..5764c59
--- /dev/null
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -0,0 +1,103 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.aws.kinesis.integration;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws.kinesis.KinesisConstants;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.kinesis.AmazonKinesis;
+import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
+import com.amazonaws.services.kinesis.model.Record;
+
+@Ignore("Must be manually tested.")
+public class KinesisComponentIntegrationTest extends CamelTestSupport {
+
+@EndpointInject(uri = "direct:start")
+private ProducerTemplate template;
+
+@EndpointInject(uri = "mock:result")
+private MockEndpoint result;
+
+@Test
+public void send() throws Exception {
+result.expectedMessageCount(2);
+
+template.send("direct:start", ExchangePattern.InOnly, new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
+exchange.getIn().setBody("Kinesis Event 1.");
+}
+});
+
+template.send("direct:start", ExchangePattern.InOut, new Processor() {
+public void process(Exchange exchange) throws Exception {
+exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, 
"partition-1");
+exchange.getIn().setBody("Kinesis Event 2.");
+}
+});
+
+assertMockEndpointsSatisfied();
+
+assertResultExchange(result.getExchanges().get(0), "Kinesis Event 1.", 
"partition-1");
+assertResultExchange(result.getExchanges().get(1), "Kinesis Event 2.", 
"partition-1");
+}
+
+private void assertResultExchange(Exchange resultExchange, String data, 
String partition) {
+assertIsInstanceOf(Record.class, resultExchange.getIn().getBody());
+Record record = resultExchange.getIn().getBody(Record.class);
+assertEquals(data, new String(record.getData().array()));
+assertEquals(partition,

[3/4] camel git commit: CAMEL-11028: Avoid duplicating content-type headers for camel-spark-rest

2017-03-26 Thread davsclaus 
CAMEL-11028: Avoid duplicating content-type headers for camel-spark-rest


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38e2c1f9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38e2c1f9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38e2c1f9

Branch: refs/heads/camel-2.18.x
Commit: 38e2c1f983cb9203dcfa0c002e31a39e8d137363
Parents: 1a59b2c
Author: Charlie McNeill, Karthikeyan Gurunathan and Jonathan Bridger 

Authored: Thu Mar 23 14:35:35 2017 +
Committer: Claus Ibsen 
Committed: Sun Mar 26 10:07:23 2017 +0200

--
 components/camel-spark-rest/pom.xml |   7 +-
 .../sparkrest/DefaultSparkBinding.java  |  14 +--
 .../sparkrest/SparkHeaderFilterStrategy.java|   2 +
 .../sparkrest/DefaultSparkBindingTest.java  | 125 +++
 4 files changed, 140 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/38e2c1f9/components/camel-spark-rest/pom.xml
--
diff --git a/components/camel-spark-rest/pom.xml 
b/components/camel-spark-rest/pom.xml
index 3b8dd56..879bbd8 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -100,7 +100,6 @@
   camel-swagger-java
   test
 
-
 
 
   org.apache.camel
@@ -112,6 +111,12 @@
   camel-jaxb
   test
 
+
+org.mockito
+mockito-all
+1.9.5
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/38e2c1f9/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
index e721baa..202fb17 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
@@ -66,13 +66,6 @@ public class DefaultSparkBinding implements SparkBinding {
 
 @Override
 public void populateCamelHeaders(Request request, Map 
headers, Exchange exchange, SparkConfiguration configuration) throws Exception {
-// store the method and query and other info in headers as String types
-headers.put(Exchange.HTTP_METHOD, request.raw().getMethod());
-headers.put(Exchange.HTTP_QUERY, request.raw().getQueryString());
-headers.put(Exchange.HTTP_URL, 
request.raw().getRequestURL().toString());
-headers.put(Exchange.HTTP_URI, request.raw().getRequestURI());
-headers.put(Exchange.CONTENT_TYPE, request.raw().getContentType());
-
 String path = request.raw().getPathInfo();
 SparkEndpoint endpoint = (SparkEndpoint) exchange.getFromEndpoint();
 if (endpoint.getPath() != null) {
@@ -127,6 +120,13 @@ public class DefaultSparkBinding implements SparkBinding {
 && !headerFilterStrategy.applyFilterToExternalHeaders(key, 
splat, exchange)) {
 SparkHelper.appendHeader(headers, key, splat);
 }
+
+// store the method and query and other info in headers as String types
+headers.putIfAbsent(Exchange.HTTP_METHOD, request.raw().getMethod());
+headers.putIfAbsent(Exchange.HTTP_QUERY, 
request.raw().getQueryString());
+headers.putIfAbsent(Exchange.HTTP_URL, 
request.raw().getRequestURL().toString());
+headers.putIfAbsent(Exchange.HTTP_URI, request.raw().getRequestURI());
+headers.putIfAbsent(Exchange.CONTENT_TYPE, 
request.raw().getContentType());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/38e2c1f9/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
index 8776612..d95c868 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
@@ -28,6 +28,8 @@ public class SparkHeaderFilterStrategy extends 
DefaultHeaderFilterStrategy {
 }
 
 protected void initialize() {
+

[1/4] camel git commit: CAMEL-11028: Avoid duplicating content-type headers for camel-spark-rest

2017-03-26 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 1a59b2cc7 -> bf2991301
  refs/heads/master 233e6a87f -> 833a1a301


CAMEL-11028: Avoid duplicating content-type headers for camel-spark-rest


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc82efea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc82efea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc82efea

Branch: refs/heads/master
Commit: dc82efea09d04e4289895aea5dba24595eaccfbb
Parents: 233e6a8
Author: Charlie McNeill, Karthikeyan Gurunathan and Jonathan Bridger 

Authored: Thu Mar 23 14:35:35 2017 +
Committer: Claus Ibsen 
Committed: Sun Mar 26 09:59:45 2017 +0200

--
 components/camel-spark-rest/pom.xml |   7 +-
 .../sparkrest/DefaultSparkBinding.java  |  14 +--
 .../sparkrest/SparkHeaderFilterStrategy.java|   2 +
 .../sparkrest/DefaultSparkBindingTest.java  | 125 +++
 4 files changed, 140 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dc82efea/components/camel-spark-rest/pom.xml
--
diff --git a/components/camel-spark-rest/pom.xml 
b/components/camel-spark-rest/pom.xml
index 7d05ea1..d914147 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -100,7 +100,6 @@
   camel-swagger-java
   test
 
-
 
 
   org.apache.camel
@@ -112,6 +111,12 @@
   camel-jaxb
   test
 
+
+org.mockito
+mockito-all
+1.9.5
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/dc82efea/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
index c062eb2..b04a4f1 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
@@ -65,13 +65,6 @@ public class DefaultSparkBinding implements SparkBinding {
 
 @Override
 public void populateCamelHeaders(Request request, Map 
headers, Exchange exchange, SparkConfiguration configuration) throws Exception {
-// store the method and query and other info in headers as String types
-headers.put(Exchange.HTTP_METHOD, request.raw().getMethod());
-headers.put(Exchange.HTTP_QUERY, request.raw().getQueryString());
-headers.put(Exchange.HTTP_URL, 
request.raw().getRequestURL().toString());
-headers.put(Exchange.HTTP_URI, request.raw().getRequestURI());
-headers.put(Exchange.CONTENT_TYPE, request.raw().getContentType());
-
 String path = request.raw().getPathInfo();
 SparkEndpoint endpoint = (SparkEndpoint) exchange.getFromEndpoint();
 if (endpoint.getPath() != null) {
@@ -126,6 +119,13 @@ public class DefaultSparkBinding implements SparkBinding {
 && !headerFilterStrategy.applyFilterToExternalHeaders(key, 
splat, exchange)) {
 SparkHelper.appendHeader(headers, key, splat);
 }
+
+// store the method and query and other info in headers as String types
+headers.putIfAbsent(Exchange.HTTP_METHOD, request.raw().getMethod());
+headers.putIfAbsent(Exchange.HTTP_QUERY, 
request.raw().getQueryString());
+headers.putIfAbsent(Exchange.HTTP_URL, 
request.raw().getRequestURL().toString());
+headers.putIfAbsent(Exchange.HTTP_URI, request.raw().getRequestURI());
+headers.putIfAbsent(Exchange.CONTENT_TYPE, 
request.raw().getContentType());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/dc82efea/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
--
diff --git 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
index 8776612..d95c868 100644
--- 
a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
+++ 
b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkHeaderFilterStrategy.java
@@ -28,6 +28,8 @@

[2/4] camel git commit: Fixed CS. This closes #1568

2017-03-26 Thread davsclaus 
Fixed CS. This closes #1568


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/833a1a30
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/833a1a30
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/833a1a30

Branch: refs/heads/master
Commit: 833a1a3015df33bf5f227d021296845b1c4cbd08
Parents: dc82efe
Author: Claus Ibsen 
Authored: Sun Mar 26 10:06:35 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Mar 26 10:06:35 2017 +0200

--
 components/camel-spark-rest/pom.xml | 13 
 .../sparkrest/DefaultSparkBindingTest.java  | 33 ++--
 2 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/833a1a30/components/camel-spark-rest/pom.xml
--
diff --git a/components/camel-spark-rest/pom.xml 
b/components/camel-spark-rest/pom.xml
index d914147..4237762 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -100,6 +100,13 @@
   camel-swagger-java
   test
 
+
+  org.mockito
+  mockito-all
+  ${mockito-version}
+  test
+
+
 
 
   org.apache.camel
@@ -111,12 +118,6 @@
   camel-jaxb
   test
 
-
-org.mockito
-mockito-all
-1.9.5
-test
-
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/833a1a30/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
--
diff --git 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
index 717e280..e9074aa 100644
--- 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
+++ 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
@@ -16,26 +16,19 @@
  */
 package org.apache.camel.component.sparkrest;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyMap;
-import static org.apache.camel.Exchange.CONTENT_TYPE;
-import static org.apache.camel.Exchange.HTTP_METHOD;
-import static org.apache.camel.Exchange.HTTP_QUERY;
-import static org.apache.camel.Exchange.HTTP_URI;
-import static org.apache.camel.Exchange.HTTP_URL;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.junit.Assert.assertEquals;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyMap;
+
 import javax.servlet.http.HttpServletRequest;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.camel.Exchange;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoints;
@@ -43,11 +36,17 @@ import org.junit.experimental.theories.FromDataPoints;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
+import spark.Request;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import static org.apache.camel.Exchange.CONTENT_TYPE;
+import static org.apache.camel.Exchange.HTTP_METHOD;
+import static org.apache.camel.Exchange.HTTP_QUERY;
+import static org.apache.camel.Exchange.HTTP_URI;
+import static org.apache.camel.Exchange.HTTP_URL;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import spark.Request;
 
 @RunWith(Theories.class)
 public class DefaultSparkBindingTest {
@@ -94,7 +93,7 @@ public class DefaultSparkBindingTest {
 
 @Theory
 @Test
-public void 
shouldOnlyAddStandardExchangeHeader_givenHeaderNotPresentInInput(
+public void 
shouldOnlyAddStandardExchangeHeaderGivenHeaderNotPresentInInput(
 @FromDataPoints("exchangeHeaderScenarios") ExchangeHeaderScenario 
scenario) throws Exception {
 //given
 Map headers = scenario.headers;
@@ -112,7 +111,7 @@ public class DefaultSparkBindingTest {
 String expectedHeaderName;
 String expectedHeaderValue;
 
-public ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {
+ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {

[4/4] camel git commit: Fixed CS. This closes #1568

2017-03-26 Thread davsclaus 
Fixed CS. This closes #1568


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf299130
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf299130
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf299130

Branch: refs/heads/camel-2.18.x
Commit: bf2991301ce9f48355237b17243117202a02781d
Parents: 38e2c1f
Author: Claus Ibsen 
Authored: Sun Mar 26 10:06:35 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Mar 26 10:07:31 2017 +0200

--
 components/camel-spark-rest/pom.xml | 13 
 .../sparkrest/DefaultSparkBindingTest.java  | 33 ++--
 2 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bf299130/components/camel-spark-rest/pom.xml
--
diff --git a/components/camel-spark-rest/pom.xml 
b/components/camel-spark-rest/pom.xml
index 879bbd8..29fc0be 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -100,6 +100,13 @@
   camel-swagger-java
   test
 
+
+  org.mockito
+  mockito-all
+  ${mockito-version}
+  test
+
+
 
 
   org.apache.camel
@@ -111,12 +118,6 @@
   camel-jaxb
   test
 
-
-org.mockito
-mockito-all
-1.9.5
-test
-
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/bf299130/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
--
diff --git 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
index 717e280..e9074aa 100644
--- 
a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
+++ 
b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
@@ -16,26 +16,19 @@
  */
 package org.apache.camel.component.sparkrest;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyMap;
-import static org.apache.camel.Exchange.CONTENT_TYPE;
-import static org.apache.camel.Exchange.HTTP_METHOD;
-import static org.apache.camel.Exchange.HTTP_QUERY;
-import static org.apache.camel.Exchange.HTTP_URI;
-import static org.apache.camel.Exchange.HTTP_URL;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.junit.Assert.assertEquals;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyMap;
+
 import javax.servlet.http.HttpServletRequest;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import org.apache.camel.Exchange;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoints;
@@ -43,11 +36,17 @@ import org.junit.experimental.theories.FromDataPoints;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
+import spark.Request;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import static org.apache.camel.Exchange.CONTENT_TYPE;
+import static org.apache.camel.Exchange.HTTP_METHOD;
+import static org.apache.camel.Exchange.HTTP_QUERY;
+import static org.apache.camel.Exchange.HTTP_URI;
+import static org.apache.camel.Exchange.HTTP_URL;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import spark.Request;
 
 @RunWith(Theories.class)
 public class DefaultSparkBindingTest {
@@ -94,7 +93,7 @@ public class DefaultSparkBindingTest {
 
 @Theory
 @Test
-public void 
shouldOnlyAddStandardExchangeHeader_givenHeaderNotPresentInInput(
+public void 
shouldOnlyAddStandardExchangeHeaderGivenHeaderNotPresentInInput(
 @FromDataPoints("exchangeHeaderScenarios") ExchangeHeaderScenario 
scenario) throws Exception {
 //given
 Map headers = scenario.headers;
@@ -112,7 +111,7 @@ public class DefaultSparkBindingTest {
 String expectedHeaderName;
 String expectedHeaderValue;
 
-public ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {
+ExchangeHeaderScenario(Map headers, String 
expectedHeaderName, String expectedHeaderValue) {

[1/3] camel git commit: CAMEL-11064: Add activemq-amqp to parent POM

2017-03-26 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x ac5f22e7b -> 1a59b2cc7
  refs/heads/master afca0b700 -> 233e6a87f


CAMEL-11064: Add activemq-amqp to parent POM


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/078a707d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/078a707d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/078a707d

Branch: refs/heads/master
Commit: 078a707d41eeac60300367bef2fe7cc157672906
Parents: afca0b7
Author: James Netherton 
Authored: Fri Mar 24 13:34:08 2017 +
Committer: Claus Ibsen 
Committed: Sun Mar 26 09:07:19 2017 +0200

--
 components/camel-amqp/pom.xml | 1 -
 parent/pom.xml| 5 +
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/078a707d/components/camel-amqp/pom.xml
--
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 3077fc3..323b62e 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -97,7 +97,6 @@
 
   org.apache.activemq
   activemq-amqp
-  ${activemq-version}
   test
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/078a707d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6c27006..97b35e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3688,6 +3688,11 @@
   
   
 org.apache.activemq
+activemq-amqp
+${activemq-version}
+  
+  
+org.apache.activemq
 activemq-openwire-legacy
 ${activemq-version}

[3/3] camel git commit: CAMEL-11064: Add activemq-amqp to parent POM

2017-03-26 Thread davsclaus 
CAMEL-11064: Add activemq-amqp to parent POM


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a59b2cc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a59b2cc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a59b2cc

Branch: refs/heads/camel-2.18.x
Commit: 1a59b2cc72a6d2f909a96deb5adff6c0ca0c96f4
Parents: ac5f22e
Author: James Netherton 
Authored: Fri Mar 24 13:34:08 2017 +
Committer: Claus Ibsen 
Committed: Sun Mar 26 09:58:08 2017 +0200

--
 components/camel-amqp/pom.xml | 1 -
 parent/pom.xml| 5 +
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1a59b2cc/components/camel-amqp/pom.xml
--
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 9b2143a..f7c97de 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -67,7 +67,6 @@
 
   org.apache.activemq
   activemq-amqp
-  ${activemq-version}
   test
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1a59b2cc/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index de28ed2..c3c52d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3456,6 +3456,11 @@
   
   
 org.apache.activemq
+activemq-amqp
+${activemq-version}
+  
+  
+org.apache.activemq
 activemq-openwire-legacy
 ${activemq-version}

[2/3] camel git commit: Upgrade RX

2017-03-26 Thread davsclaus 
Upgrade RX


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/233e6a87
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/233e6a87
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/233e6a87

Branch: refs/heads/master
Commit: 233e6a87fcbdd1a960e84b14f5c502493a124b4e
Parents: 078a707
Author: Claus Ibsen 
Authored: Sun Mar 26 09:57:35 2017 +0200
Committer: Claus Ibsen 
Committed: Sun Mar 26 09:57:35 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/233e6a87/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 97b35e4..2343e09 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -539,7 +539,7 @@
 2.20.0.Final
 1.0_3
 1.0
-1.2.7
+1.2.9
 2.0.7
 1.3.2_2
 9.7.0-15_1