camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/3] camel git commit: Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.
Date Wed, 24 Feb 2016 07:25:04 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 0766a0678 -> 459a8b67d
  refs/heads/camel-2.16.x 35c494e51 -> b77804759
  refs/heads/master 4a1679054 -> 8466e1273


Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8466e127
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8466e127
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8466e127

Branch: refs/heads/master
Commit: 8466e1273c8c54f3ea3bcdbb6ebbdc929da1d559
Parents: 4a16790
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Feb 24 08:17:25 2016 +0100

----------------------------------------------------------------------
 .../camel/test/blueprint/CamelBlueprintTestSupport.java      | 2 +-
 .../ConfigAdminNoDefaultValuesBlueprintCreationTest.java     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8466e127/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 35f55f8..928d257 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
@@ -154,7 +154,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport
{
         // to the same state of BP container
         Set<Long> bpEvents = new HashSet<>();
 
-        if(!expectReload){
+        if (!expectReload) {
             CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, symbolicName,
BlueprintEvent.CREATED, null);
         }
         

http://git-wip-us.apache.org/repos/asf/camel/blob/8466e127/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
  */
 package org.apache.camel.test.blueprint;
 
-import org.junit.Test;
 import java.util.Dictionary;
 
+import org.junit.Test;
+
 /**
  *
  */
 public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBlueprintTestSupport
{
 
     @Override
-    protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+    protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
         return true;
     }
 
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBluepr
     }
 
     @Override
-    protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
-            throws Exception {
+    protected String useOverridePropertiesWithConfigAdmin(Dictionary props) throws Exception
{
         props.put("greeting", "Bye");
         props.put("destination", "mock:result");
         return "my-placeholders";


Mime
View raw message