Repository: camel Updated Branches: refs/heads/master 12ddb0fc8 -> 323279362
Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/32327936 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32327936 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32327936 Branch: refs/heads/master Commit: 3232793629e8336610c50d32cc49998b565962e9 Parents: 12ddb0f Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Mar 15 22:46:17 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Mar 15 22:46:17 2017 +0100 ---------------------------------------------------------------------- .../maven/connector/SpringBootAutoConfigurationMojo.java | 8 ++++---- .../apache/camel/maven/connector/model/ComponentModel.java | 6 +++--- .../camel/maven/connector/model/ComponentOptionModel.java | 6 +++--- .../camel/component/connector/DefaultConnectorComponent.java | 3 +-- 4 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/32327936/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java index 1529696..8aad172 100644 --- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.java +++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/SpringBootAutoConfigurationMojo.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. @@ -185,7 +185,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { String type = option.getJavaType(); PropertySource<JavaClassSource> prop = javaClass.addProperty(type, option.getName()); - // TODO: only include the global options so we can configure them + // TODO: only include the component options so we can configure them if ("true".equals(option.getDeprecated())) { prop.getField().addAnnotation(Deprecated.class); http://git-wip-us.apache.org/repos/asf/camel/blob/32327936/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java ---------------------------------------------------------------------- diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java index fad13aa..d5cd4d2 100644 --- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.java +++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentModel.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/32327936/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java ---------------------------------------------------------------------- diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java index 2a717ab..96b5598 100644 --- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.java +++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/model/ComponentOptionModel.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/32327936/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java ---------------------------------------------------------------------- diff --git a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java index 18f6c52..182d120 100644 --- a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java +++ b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java @@ -22,7 +22,6 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Set; import org.apache.camel.Component; import org.apache.camel.ComponentVerifier; @@ -81,7 +80,7 @@ public abstract class DefaultConnectorComponent extends DefaultComponent impleme IntrospectionSupport.setProperties(getCamelContext(), getCamelContext().getTypeConverter(), base, copy); if (base instanceof Component) { - Component old = getCamelContext().removeComponent(scheme); + getCamelContext().removeComponent(scheme); // ensure component is started and stopped when Camel shutdown getCamelContext().addService(base, true, true); getCamelContext().addComponent(scheme, (Component) base);
