Skip to content

Commit 01a3822

Browse files
🐛 fix AutoConfigureCache/AutoConfigureTestDatabase package, fix PropertyMapper method
1 parent 92f0032 commit 01a3822

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ public void setDatabaseId(String databaseId) {
673673
}
674674

675675
public void applyTo(Configuration target) {
676-
PropertyMapper mapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
676+
PropertyMapper mapper = PropertyMapper.get();
677677
mapper.from(getSafeRowBoundsEnabled()).to(target::setSafeRowBoundsEnabled);
678678
mapper.from(getSafeResultHandlerEnabled()).to(target::setSafeResultHandlerEnabled);
679679
mapper.from(getMapUnderscoreToCamelCase()).to(target::setMapUnderscoreToCamelCase);

mybatis-spring-boot-test-autoconfigure/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@
3737
<groupId>org.springframework.boot</groupId>
3838
<artifactId>spring-boot-test-autoconfigure</artifactId>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.springframework.boot</groupId>
42+
<artifactId>spring-boot-jdbc-test</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.springframework.boot</groupId>
46+
<artifactId>spring-boot-cache-test</artifactId>
47+
</dependency>
4048
<dependency>
4149
<groupId>org.springframework.boot</groupId>
4250
<artifactId>spring-boot-test</artifactId>

mybatis-spring-boot-test-autoconfigure/src/main/java/org/mybatis/spring/boot/test/autoconfigure/MybatisTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2022 the original author or authors.
2+
* Copyright 2015-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@
2525
import org.junit.jupiter.api.extension.ExtendWith;
2626
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2727
import org.springframework.boot.autoconfigure.SpringBootApplication;
28+
import org.springframework.boot.cache.test.autoconfigure.AutoConfigureCache;
29+
import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
2830
import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
29-
import org.springframework.boot.test.autoconfigure.core.AutoConfigureCache;
3031
import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters;
31-
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
3232
import org.springframework.boot.test.context.SpringBootTest;
3333
import org.springframework.context.annotation.ComponentScan.Filter;
3434
import org.springframework.core.annotation.AliasFor;

0 commit comments

Comments
 (0)