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/03/26 08:08:30 UTC
[4/4] camel git commit: Fixed CS. This closes #1568
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 <da...@apache.org>
Authored: Sun Mar 26 10:06:35 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
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 @@
<artifactId>camel-swagger-java</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- for testing rest-dsl -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -111,12 +118,6 @@
<artifactId>camel-jaxb</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
<!-- logging -->
<dependency>
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<String, Object> headers = scenario.headers;
@@ -112,7 +111,7 @@ public class DefaultSparkBindingTest {
String expectedHeaderName;
String expectedHeaderValue;
- public ExchangeHeaderScenario(Map<String, Object> headers, String expectedHeaderName, String expectedHeaderValue) {
+ ExchangeHeaderScenario(Map<String, Object> headers, String expectedHeaderName, String expectedHeaderValue) {
super();
this.expectedHeaderName = expectedHeaderName;
this.expectedHeaderValue = expectedHeaderValue;