chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yazid Lee
2024-06-26 15:53:24 +08:00
committed by GitHub
parent 9493ff733d
commit 9373429015
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/YamlUtils.java
View File

@@ -25,7 +25,7 @@ import org.springframework.util.PropertyPlaceholderHelper;
public class YamlUtils { public class YamlUtils {
public static <T> T resourceYmlToObj(String resource, String prefix, Class<T> clazz) { 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; resource = "classpath:" + resource;
} }
ClassPathResource classPathResource = new ClassPathResource(resource); ClassPathResource classPathResource = new ClassPathResource(resource);

1
common/pom.xml
View File

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

4
instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/PlainCanalInstanceGenerator.java
View File

@@ -18,7 +18,7 @@ import com.alibaba.otter.canal.parse.CanalEventParser;
/** /**
* 基于manager生成对应的{@linkplain CanalInstance} * 基于manager生成对应的{@linkplain CanalInstance}
* *
* @author jianghang 2012-7-12 下午05:37:09 * @author jianghang 2012-7-12 下午05:37:09
* @version 1.0.0 * @version 1.0.0
*/ */
@@ -70,7 +70,7 @@ public class PlainCanalInstanceGenerator implements CanalInstanceGenerator {
// ================ setter / getter ================ // ================ setter / getter ================
private BeanFactory getBeanFactory(String springXml) { private BeanFactory getBeanFactory(String springXml) {
if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) { if (!StringUtils.startsWithIgnoreCase(springXml, "classpath:")) {
springXml = "classpath:" + springXml; springXml = "classpath:" + springXml;
} }
ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml); ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml);

2
instance/spring/src/main/java/com/alibaba/otter/canal/instance/spring/SpringCanalInstanceGenerator.java
View File

@@ -45,7 +45,7 @@ public class SpringCanalInstanceGenerator implements CanalInstanceGenerator {
} }
private BeanFactory getBeanFactory(String springXml) { private BeanFactory getBeanFactory(String springXml) {
if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) { if (!StringUtils.startsWithIgnoreCase(springXml, "classpath:")) {
springXml = "classpath:" + springXml; springXml = "classpath:" + springXml;
} }
ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml); ApplicationContext applicationContext = new ClassPathXmlApplicationContext(springXml);

2
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDBBuilder.java
View File

@@ -30,7 +30,7 @@ public class TableMetaTSDBBuilder {
if (applicationContext == null) { if (applicationContext == null) {
synchronized (contexts) { synchronized (contexts) {
if (applicationContext == null) { if (applicationContext == null) {
if (!StringUtils.startsWithIgnoreCase("classpath:", springXml)) { if (!StringUtils.startsWithIgnoreCase(springXml, "classpath:")) {
springXml = "classpath:" + springXml; springXml = "classpath:" + springXml;
} }
applicationContext = new ClassPathXmlApplicationContext(springXml); applicationContext = new ClassPathXmlApplicationContext(springXml);