Merge pull request #1073 from ngocnhan-tran1996/fix-typos

hazendaz · web-flow · commit 9b58fa48f9a2 · 2025-05-24T15:41:35.000-04:00
Fix typos
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
@@ -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
@@ -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
@@ -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.
  * <h4>Example Usage</h4>
  *
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
@@ -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.
  * <h4>Example Usage</h4>
  *
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
@@ -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.
  * <h4>Example Usage</h4>
  *
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
@@ -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.
  *
  * <h4>Example Usage</h4>
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
@@ -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.
  * <h4>Example Usage</h4>
  *
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
@@ -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.
  * <h4>Example Usage</h4>
  *
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
@@ -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.
  * <h4>Example Usage</h4>
  *
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
@@ -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.
  * <h4>Example Usage</h4>
  *
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
@@ -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.
  * <h4>Example Usage</h4>
  *

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2015-2022 the original author or authors.`
	`2`	`+ * Copyright 2015-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -44,7 +44,7 @@`
`44`	`44`	`import org.junit.platform.commons.support.ReflectionSupport;`
`45`	`45`
`46`	`46`	`/**`
`47`		`- * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and`
	`47`	`+ * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and`
`48`	`48`	`* {@code System.err} with expectations supported via Hamcrest matchers.`
`49`	`49`	`* <h4>Example Usage</h4>`
`50`	`50`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2015-2023 the original author or authors.`
	`2`	`+ * Copyright 2015-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -37,7 +37,7 @@ import static org.hamcrest.MatcherAssert.assertThat`
`37`	`37`	`import static org.hamcrest.Matchers.allOf`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and`
	`40`	`+ * {@code @CaptureSystemOutput} is a JUnit Jupiter extension for capturing output to {@code System.out} and`
`41`	`41`	`* {@code System.err} with expectations supported via Hamcrest matchers.`
`42`	`42`	`*`
`43`	`43`	`* <h4>Example Usage</h4>`