CAMEL-10385: fix checkstyle errors Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/22816c5e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/22816c5e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/22816c5e
Branch: refs/heads/camel-2.18.x Commit: 22816c5e7f0f5c4a4a0ecc21378730524bd121e2 Parents: 9ae7ebe Author: dmitriy <xhu...@gmail.com> Authored: Thu Oct 13 09:52:29 2016 -0400 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Oct 14 09:32:47 2016 +0200 ---------------------------------------------------------------------- .../camel/spring/boot/SpringTypeConverter.java | 2 +- .../spring/boot/issues/SimpleOgnlTest.java | 48 ++++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/22816c5e/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java index c4aff73..3818148 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java @@ -44,7 +44,7 @@ public class SpringTypeConverter extends TypeConverterSupport { // do not attempt to convert List -> Map. Ognl expression may use this converter as a fallback expecting null if (type.isAssignableFrom(Map.class) && (value.getClass().isArray() || value instanceof List)) { - return null; + return null; } for (ConversionService conversionService : conversionServices) { http://git-wip-us.apache.org/repos/asf/camel/blob/22816c5e/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java index 969ad50..72024e2 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java @@ -36,34 +36,34 @@ import org.springframework.test.context.junit4.SpringRunner; @EnableAutoConfiguration @SpringBootTest(classes = { SimpleOgnlTest.class }) public class SimpleOgnlTest { - @EndpointInject(uri = "mock:result") - protected MockEndpoint resultEndpoint; + @EndpointInject(uri = "mock:result") + protected MockEndpoint resultEndpoint; - @Produce(uri = "direct:start") - protected ProducerTemplate template; + @Produce(uri = "direct:start") + protected ProducerTemplate template; - @Test - public void testSimpleOgnlListExpression() throws Exception { - List<String> list = new ArrayList<String>(); - list.add("one"); - list.add("two"); + @Test + public void testSimpleOgnlListExpression() throws Exception { + List<String> list = new ArrayList<String>(); + list.add("one"); + list.add("two"); - resultEndpoint.expectedBodiesReceived(list.get(0)); + resultEndpoint.expectedBodiesReceived(list.get(0)); - template.sendBody(list); + template.sendBody(list); - resultEndpoint.assertIsSatisfied(); - } + resultEndpoint.assertIsSatisfied(); + } - @Configuration - public static class ContextConfig { - @Bean - public RouteBuilder route() { - return new RouteBuilder() { - public void configure() { - from("direct:start").setBody(simple("${body[0]}")).to("mock:result"); - } - }; - } - } + @Configuration + public static class ContextConfig { + @Bean + public RouteBuilder route() { + return new RouteBuilder() { + public void configure() { + from("direct:start").setBody(simple("${body[0]}")).to("mock:result"); + } + }; + } + } }
