Fixed CS. This closes #955
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d5912509 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d5912509 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d5912509 Branch: refs/heads/master Commit: d5912509742afcc8075150a6bdc5710c6de3f73c Parents: c6b14ba Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 22 21:22:48 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 22 21:22:48 2016 +0200 ---------------------------------------------------------------------- .../camel/test/blueprint/CamelBlueprintTestSupport.java | 7 +++---- ...nfigAdminLoadMultiConfigurationFileAndOverrideAltTest.java | 5 +++-- .../ConfigAdminLoadMultiConfigurationFileAndOverrideTest.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d5912509/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java index 3bbfbef..60348f6 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java @@ -32,7 +32,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -99,13 +98,13 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { String[] file = loadConfigAdminConfigurationFile(); String[][] configAdminPidFiles = new String[0][0]; if (file != null) { - if (file.length % 2 !=0) { // This needs to return pairs of filename and pid + if (file.length % 2 != 0) { // This needs to return pairs of filename and pid throw new IllegalArgumentException("The length of the String[] returned from loadConfigAdminConfigurationFile must divisible by 2, was " + file.length); } - configAdminPidFiles = new String[file.length / 2 ][2]; + configAdminPidFiles = new String[file.length / 2][2]; int pair = 0; - for (int i=0; i < file.length; i+=2) { + for (int i = 0; i < file.length; i += 2) { String fileName = file[i]; String pid = file[i + 1]; if (!new File(fileName).exists()) { http://git-wip-us.apache.org/repos/asf/camel/blob/d5912509/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideAltTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideAltTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideAltTest.java index c12220e..099357d 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideAltTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideAltTest.java @@ -16,16 +16,17 @@ */ package org.apache.camel.test.blueprint; -import org.junit.Test; - import java.util.Dictionary; +import org.junit.Test; + /** * This test should be run in tandem with ConfigAdminLoadConfigurationFileAndOverrideTest. These examples will load a * Blueprint .cfg file with multiple property placeholders defined. We need two tests to make sure we * process both of them correctly */ public class ConfigAdminLoadMultiConfigurationFileAndOverrideAltTest extends CamelBlueprintTestSupport { + @Override protected String getBlueprintDescriptor() { // which blueprint XML file to use for this test http://git-wip-us.apache.org/repos/asf/camel/blob/d5912509/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideTest.java index 72943e4..40fdc83 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminLoadMultiConfigurationFileAndOverrideTest.java @@ -16,10 +16,10 @@ */ package org.apache.camel.test.blueprint; -import org.junit.Test; - import java.util.Dictionary; +import org.junit.Test; + /** * This is the first of two tests which will load a Blueprint .cfg file (which will initialize configadmin), containing * multiple property placeholders and also override its property placeholders directly (the change will reload blueprint
