1
0
Эх сурвалжийг харах

fix: resource loading failure caused by incorrect parameter order in StringUtils.startsWithIgnoreCase (#5173)

Yazid Lee 10 сар өмнө
parent
commit
9373429015

+ 1 - 1
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> T resourceYmlToObj(String resource, String prefix, Class<T> clazz) {
-        if (!StringUtils.startsWithIgnoreCase("classpath:", resource)) {
+        if (!StringUtils.startsWithIgnoreCase(resource, "classpath:")) {
             resource = "classpath:" + resource;
         }
         ClassPathResource classPathResource = new ClassPathResource(resource);

+ 0 - 1
common/pom.xml

@@ -90,7 +90,6 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
-			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

+ 2 - 2
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);

+ 1 - 1
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);

+ 1 - 1
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);