Skip to content

Fix typos #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 一同使用。 |
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
*
Expand Down