Skip to content

Commit

Permalink
Fixed CS. This closes #1568
Browse files Browse the repository at this point in the history
  • Loading branch information
davsclaus committed Mar 26, 2017
1 parent dc82efe commit 833a1a3
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
13 changes: 7 additions & 6 deletions components/camel-spark-rest/pom.xml
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Expand Up @@ -16,38 +16,37 @@
*/
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;
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 {
Expand Down Expand Up @@ -94,7 +93,7 @@ public static List<ExchangeHeaderScenario> exchangeHeaderScenarios() {

@Theory
@Test
public void shouldOnlyAddStandardExchangeHeader_givenHeaderNotPresentInInput(
public void shouldOnlyAddStandardExchangeHeaderGivenHeaderNotPresentInInput(
@FromDataPoints("exchangeHeaderScenarios") ExchangeHeaderScenario scenario) throws Exception {
//given
Map<String, Object> headers = scenario.headers;
Expand All @@ -112,7 +111,7 @@ private static class ExchangeHeaderScenario {
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;
Expand Down

0 comments on commit 833a1a3

Please sign in to comment.