camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [7/8] camel git commit: CAMEL-10385: fix checkstyle errors
Date Fri, 14 Oct 2016 08:14:07 GMT
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/ca3d735b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca3d735b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca3d735b

Branch: refs/heads/master
Commit: ca3d735b8f02c7fe545483c579b1f696e8054b1f
Parents: b3848d6
Author: dmitriy <xhub4u@gmail.com>
Authored: Thu Oct 13 09:52:29 2016 -0400
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Oct 14 09:33:22 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/ca3d735b/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/ca3d735b/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");
+                }
+            };
+        }
+    }
 }


Mime
View raw message