diff --git a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java index 76892d40..da6c4115 100644 --- a/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java +++ b/mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2024 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -288,7 +288,7 @@ public static class CoreConfiguration { /** * MyBatis, by default, returns null when all the columns of a returned row are NULL. When this setting is enabled, - * MyBatis returns an empty instance instead. Note that it is also applied to nested results (i.e. collectioin and + * MyBatis returns an empty instance instead. Note that it is also applied to nested results (i.e. collection and * association). Default is false. */ private Boolean returnInstanceForEmptyRow; diff --git a/mybatis-spring-boot-autoconfigure/src/site/zh_CN/markdown/index.md b/mybatis-spring-boot-autoconfigure/src/site/zh_CN/markdown/index.md index 191d10c5..531c7331 100644 --- a/mybatis-spring-boot-autoconfigure/src/site/zh_CN/markdown/index.md +++ b/mybatis-spring-boot-autoconfigure/src/site/zh_CN/markdown/index.md @@ -351,7 +351,7 @@ public class MyBatisConfig { |:-------------- |:----------------------------------------------------------------------------------------------------------------------------------- |:--------------------------------------------------------------------- | | 核心组件 | [样例1](https://github.com/mybatis/spring-boot-starter/tree/master/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation) | 展示了最简单的场景,只有一个 mapper 和一个注入 mapper 的组件。这就是我们在“快速入门”部分看到的例子。 | | | [样例2](https://github.com/mybatis/spring-boot-starter/tree/master/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml) | 展示了如何在 XML 文件中使用一个带有语句的 Mapper,并且也有使用 `SqlSessionTemplate` 的 DAO 的示例。 | -| LangaugeDriver | [样例3](https://github.com/mybatis/spring-boot-starter/tree/master/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf) | 展示了如何在 mybatis-thymeleaf 的帮助下,使用 Thymeleaf。 | +| LanguageDriver | [样例3](https://github.com/mybatis/spring-boot-starter/tree/master/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf) | 展示了如何在 mybatis-thymeleaf 的帮助下,使用 Thymeleaf。 | | | [样例4](https://github.com/mybatis/spring-boot-starter/tree/master/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker) | 展示了如何在 mybatis-freemarker 的帮助下,使用 Freemarker。 | | | [样例5](https://github.com/mybatis/spring-boot-starter/tree/master/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity) | 展示了如何在 mybatis-velocity 的帮助下,使用 Velocity。 | | JVM 语言 | [样例6](https://github.com/mybatis/spring-boot-starter/tree/master/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin) | 展示了如何和 kotlin 一同使用。 | diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java index ff297f45..ae486363 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

* diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/freemarker/legacy/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/freemarker/legacy/CaptureSystemOutput.java index 72da5975..e5bbb6cb 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/freemarker/legacy/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/freemarker/legacy/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

* diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/freemarker/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/freemarker/CaptureSystemOutput.java index 058a23b3..f3d82940 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/freemarker/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/freemarker/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

* diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy index 30b72f73..961b8f98 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2015-2023 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import static org.hamcrest.MatcherAssert.assertThat import static org.hamcrest.Matchers.allOf /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. * *

Example Usage

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/kotlin/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/kotlin/CaptureSystemOutput.java index 20aa0d1e..bacba207 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/kotlin/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/kotlin/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

* diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/thymeleaf/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/thymeleaf/CaptureSystemOutput.java index 00d4b915..b4c0961a 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/thymeleaf/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/thymeleaf/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

* diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/velocity/legacy/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/velocity/legacy/CaptureSystemOutput.java index f2e79e86..bab929c5 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/velocity/legacy/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/velocity/legacy/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

* diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/velocity/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/velocity/CaptureSystemOutput.java index 83e31481..58ea010d 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/velocity/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/velocity/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

* diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/xml/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/xml/CaptureSystemOutput.java index 7d31bfd5..0123984b 100644 --- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/xml/CaptureSystemOutput.java +++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/xml/CaptureSystemOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.junit.platform.commons.support.ReflectionSupport; /** - * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and + * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and * {@code System.err} with expectations supported via Hamcrest matchers. *

Example Usage

*