You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2017/06/02 07:32:15 UTC
[1/2] camel git commit: [Minor] Clean up use of deprecated method
Repository: camel
Updated Branches:
refs/heads/master 6721bb4b4 -> eb69733b4
[Minor] Clean up use of deprecated method
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d818dc3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d818dc3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d818dc3
Branch: refs/heads/master
Commit: 3d818dc34b87cfff517ea2a7b14edfb077126c3d
Parents: 6721bb4
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Fri Jun 2 09:28:36 2017 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Fri Jun 2 09:28:36 2017 +0200
----------------------------------------------------------------------
.../camel/spring/boot/RouteConfigWithCamelContextInjected.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3d818dc3/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
index 8f239b3..042f7a8 100644
--- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
+++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
@@ -32,7 +32,7 @@ public class RouteConfigWithCamelContextInjected {
@Bean
public RoutesBuilder routeCreatedWithInjectedCamelContext() {
- Assert.notNull(camelContext);
+ Assert.notNull(camelContext, "camelContext must not be null");
return new RouteBuilder() {
@Override
public void configure() throws Exception {
[2/2] camel git commit: [Minor] Clean up use of deprecated method
Posted by gz...@apache.org.
[Minor] Clean up use of deprecated method
Signed-off-by: Gregor Zurowski <gr...@zurowski.org>
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eb69733b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eb69733b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eb69733b
Branch: refs/heads/master
Commit: eb69733b4539870195c0bbd139ab97e782a11849
Parents: 3d818dc
Author: Gregor Zurowski <gr...@zurowski.org>
Authored: Fri Jun 2 09:31:49 2017 +0200
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Fri Jun 2 09:31:49 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/spring/boot/FilePropertySource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/eb69733b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
index e2aa295..94de504 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
@@ -20,7 +20,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -39,7 +39,7 @@ public class FilePropertySource extends PropertySource {
public FilePropertySource(String name, ApplicationContext applicationContext, String directory) {
super(name);
- ObjectHelper.notEmpty(directory, "directory");
+ StringHelper.notEmpty(directory, "directory");
Properties loaded = new Properties();
try {