This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 8996859 Fixed CS 8996859 is described below commit 899685951dd29920a0f2348f4b168f040dbc0c06 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Aug 15 07:38:52 2019 +0200 Fixed CS --- .../config/CamelMicroProfilePropertiesSourceTest.java | 2 +- .../apache/camel/component/properties/PropertiesComponent.java | 4 ++-- .../java/org/apache/camel/spi/PropertyPlaceholderConfigurer.java | 8 ++++---- .../properties/PropertiesComponentPropertiesSourceTest.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java b/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java index d557ade..c4f65d3 100644 --- a/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java +++ b/components/camel-microprofile-config/src/test/java/org/apache/camel/component/microprofile/config/CamelMicroProfilePropertiesSourceTest.java @@ -82,7 +82,7 @@ public class CamelMicroProfilePropertiesSourceTest extends CamelTestSupport { @Test public void testLoadFiltered() throws Exception { PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class); - Properties properties = pc.loadProperties(k -> k.length()> 2); + Properties properties = pc.loadProperties(k -> k.length() > 2); Assertions.assertThat(properties).hasSize(2); Assertions.assertThat(properties.get("start")).isEqualTo("direct:start"); diff --git a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java index 22366f9..13f57de 100644 --- a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java +++ b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java @@ -194,7 +194,7 @@ public class PropertiesComponent extends DefaultComponent implements org.apache. // sources are ordered according to {@link org.apache.camel.support.OrderComparator} so // it is needed to iterate them in reverse order otherwise lower priority sources may // override properties from higher priority ones - for (int i = sources.size(); i-- > 0; ) { + for (int i = sources.size(); i-- > 0;) { PropertiesSource ps = sources.get(i); if (ps instanceof LoadablePropertiesSource) { LoadablePropertiesSource lps = (LoadablePropertiesSource) ps; @@ -233,7 +233,7 @@ public class PropertiesComponent extends DefaultComponent implements org.apache. // sources are ordered according to {@link org.apache.camel.support.OrderComparator} so // it is needed to iterate them in reverse order otherwise lower priority sources may // override properties from higher priority ones - for (int i = sources.size(); i-- > 0; ) { + for (int i = sources.size(); i-- > 0;) { PropertiesSource ps = sources.get(i); if (ps instanceof LoadablePropertiesSource) { LoadablePropertiesSource lps = (LoadablePropertiesSource) ps; diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertyPlaceholderConfigurer.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertyPlaceholderConfigurer.java index 34b7693..e502ed7 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertyPlaceholderConfigurer.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertyPlaceholderConfigurer.java @@ -1,13 +1,13 @@ -/** +/* * 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 - * <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. diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java index 2807827..b2e3cad 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentPropertiesSourceTest.java @@ -43,7 +43,7 @@ public class PropertiesComponentPropertiesSourceTest { public void testOrderedPropertiesSources() { CamelContext context = new DefaultCamelContext(); context.getRegistry().bind("my-ps-1", new PropertiesPropertiesSource(Ordered.HIGHEST, "ps1", "shared", "v1", "my-key-1", "my-val-1")); - context.getRegistry().bind("my-ps-2", new PropertiesPropertiesSource(Ordered.LOWEST,"ps2", "shared", "v2", "my-key-2", "my-val-2")); + context.getRegistry().bind("my-ps-2", new PropertiesPropertiesSource(Ordered.LOWEST, "ps2", "shared", "v2", "my-key-2", "my-val-2")); PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class); Properties properties = pc.loadProperties();