Fixed the CS errors of camel-spring
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6c58bd03 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6c58bd03 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6c58bd03 Branch: refs/heads/master Commit: 6c58bd032f11c31bad3068a8eba5df71ab1fe533 Parents: ce752a0 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Wed Feb 25 14:29:57 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Wed Feb 25 14:29:57 2015 +0800 ---------------------------------------------------------------------- .../spring/SpringModelJAXBContextFactory.java | 20 +++++++++++++++++--- .../spring/handler/CamelNamespaceHandler.java | 3 ++- .../BridgePropertyPlaceholderConfigurer.java | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6c58bd03/components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java index fd2de55..37b04ba 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringModelJAXBContextFactory.java @@ -1,10 +1,24 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.spring; import org.apache.camel.impl.DefaultModelJAXBContextFactory; -/** - * @author - */ + public class SpringModelJAXBContextFactory extends DefaultModelJAXBContextFactory { public static final String ADDITIONAL_JAXB_CONTEXT_PACKAGES = ":" http://git-wip-us.apache.org/repos/asf/camel/blob/6c58bd03/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java index 8d84a17..470b256 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.xml.bind.Binder; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -40,7 +41,6 @@ import org.apache.camel.model.FromDefinition; import org.apache.camel.model.SendDefinition; import org.apache.camel.spi.CamelContextNameStrategy; import org.apache.camel.spi.NamespaceAware; -import org.apache.camel.spring.SpringModelJAXBContextFactory; import org.apache.camel.spring.CamelBeanPostProcessor; import org.apache.camel.spring.CamelConsumerTemplateFactoryBean; import org.apache.camel.spring.CamelContextFactoryBean; @@ -50,6 +50,7 @@ import org.apache.camel.spring.CamelRedeliveryPolicyFactoryBean; import org.apache.camel.spring.CamelRestContextFactoryBean; import org.apache.camel.spring.CamelRouteContextFactoryBean; import org.apache.camel.spring.CamelThreadPoolFactoryBean; +import org.apache.camel.spring.SpringModelJAXBContextFactory; import org.apache.camel.spring.remoting.CamelProxyFactoryBean; import org.apache.camel.spring.remoting.CamelServiceExporter; import org.apache.camel.util.ObjectHelper; http://git-wip-us.apache.org/repos/asf/camel/blob/6c58bd03/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java index eeb260d..67351dc 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BridgePropertyPlaceholderConfigurer.java @@ -228,7 +228,7 @@ public class BridgePropertyPlaceholderConfigurer extends PropertyPlaceholderConf } } - private class BridgePropertiesParser implements PropertiesParser { + private final class BridgePropertiesParser implements PropertiesParser { private final PropertiesParser delegate; private final PropertiesParser parser;
