diff --git a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/YamlUtils.java b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/YamlUtils.java index 61a3c2bd..4c0ee527 100644 --- a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/YamlUtils.java +++ b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/YamlUtils.java @@ -25,7 +25,7 @@ import org.springframework.util.PropertyPlaceholderHelper; public class YamlUtils { public static T resourceYmlToObj(String resource, String prefix, Class clazz) { - if (!StringUtils.startsWithIgnoreCase("classpath:", resource)) { + if (!StringUtils.startsWithIgnoreCase(resource, "classpath:")) { resource = "classpath:" + resource; } ClassPathResource classPathResource = new ClassPathResource(resource); diff --git a/common/pom.xml b/common/pom.xml index 899977d0..d94cdb96 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -90,7 +90,6 @@ com.alibaba druid - true org.springframework diff --git a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/PlainCanalInstanceGenerator.java b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/PlainCanalInstanceGenerator.java index c14fc93c..c5a4954c 100644 --- a/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/PlainCanalInstanceGenerator.java +++ b/instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/PlainCanalInstanceGenerator.java @@ -18,7 +18,7 @@ import com.alibaba.otter.canal.parse.CanalEventParser; /** * 基于manager生成对应的{@linkplain CanalInstance} - * + * * @author jianghang 2012-7-12 下午05:37:09 * @version 1.0.0 */ @@ -70,7 +70,7 @@ public class PlainCanalInstanceGenerator implements CanalInstanceGenerator { // ================ setter / getter ================ private BeanFactory getBeanFactory(String springXml) { - if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) { + if (!StringUtils.startsWithIgnoreCase(springXml, "classpath:")) { springXml = "classpath:" + springXml; } ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml); diff --git a/instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/SpringCanalInstanceGenerator.java b/instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/SpringCanalInstanceGenerator.java index a8542b6b..4431fe6f 100644 --- a/instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/SpringCanalInstanceGenerator.java +++ b/instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/SpringCanalInstanceGenerator.java @@ -45,7 +45,7 @@ public class SpringCanalInstanceGenerator implements CanalInstanceGenerator { } private BeanFactory getBeanFactory(String springXml) { - if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) { + if (!StringUtils.startsWithIgnoreCase(springXml, "classpath:")) { springXml = "classpath:" + springXml; } ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml); diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java index e709cf46..f6fc2fee 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java @@ -30,7 +30,7 @@ public class TableMetaTSDBBuilder { if (applicationContext == null) { synchronized (contexts) { if (applicationContext == null) { - if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) { + if (!StringUtils.startsWithIgnoreCase(springXml, "classpath:")) { springXml = "classpath:" + springXml; } applicationContext = new ClassPathXmlApplicationContext(springXml);