Repository: camel Updated Branches: refs/heads/master 2fe9ed210 -> 5fa4f3eb5
Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5fa4f3eb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5fa4f3eb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5fa4f3eb Branch: refs/heads/master Commit: 5fa4f3eb570c33abfab30e424a01eaddefdf3e85 Parents: 2fe9ed2 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Thu Dec 1 16:47:51 2016 +0100 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Thu Dec 1 16:47:51 2016 +0100 ---------------------------------------------------------------------- .../camel/spring/boot/CamelConfigurationProperties.java | 6 +++--- .../camel/spring/boot/SpringTypeConverterTest.java | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5fa4f3eb/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java index b6bafe0..bded0e2 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java @@ -5,9 +5,9 @@ * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/5fa4f3eb/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java index 3ccc367..4814374 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java @@ -98,17 +98,19 @@ public class SpringTypeConverterTest { @Override public String toString() { - return "Person{" + - "name='" + name + '\'' + - ", age=" + age + - '}'; + return "Person{" + + "name='" + name + '\'' + + ", age=" + age + + '}'; } } @Configuration @EnableAutoConfiguration( exclude = { - CamelAutoConfiguration.class, TypeConversionConfiguration.class, WebMvcAutoConfiguration.class + CamelAutoConfiguration.class, + TypeConversionConfiguration.class, + WebMvcAutoConfiguration.class } ) public static class SpringTypeConversionConfiguration {